From f3311b301df278ea0ed0e2aae28c32ee1d8b8c6b Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Mon, 6 Apr 2009 15:59:50 +0200 Subject: [PATCH] Relicensed signalfunc and containerfunc as GPL version 2 + linking exception. Moved this submodule to a separate utils directory/RPM package. --- COPYING.GPL | 339 +++++++++++++++++++++++++++++++++++ LICENSE | 22 +++ Makefile.am | 6 +- configure.in | 4 +- doc/Doxyfile.in | 2 +- doc/Makefile.am | 3 +- libi2ncommon.pc.in | 4 +- libi2ncommon.spec | 17 ++- libi2ncommon_utils.pc.in | 10 + src/Makefile.am | 8 +- src/containerfunc.cpp | 8 - src/containerfunc.hpp | 420 ------------------------------------------- src/signalfunc.cpp | 425 -------------------------------------------- src/signalfunc.hpp | 245 ------------------------- test/Makefile.am | 4 +- utils/Makefile.am | 15 ++ utils/containerfunc.cpp | 27 +++ utils/containerfunc.hpp | 431 ++++++++++++++++++++++++++++++++++++++++++++ utils/signalfunc.cpp | 443 ++++++++++++++++++++++++++++++++++++++++++++++ utils/signalfunc.hpp | 263 +++++++++++++++++++++++++++ 20 files changed, 1581 insertions(+), 1115 deletions(-) create mode 100644 COPYING.GPL create mode 100644 libi2ncommon_utils.pc.in delete mode 100644 src/containerfunc.cpp delete mode 100644 src/containerfunc.hpp delete mode 100644 src/signalfunc.cpp delete mode 100644 src/signalfunc.hpp create mode 100644 utils/Makefile.am create mode 100644 utils/containerfunc.cpp create mode 100644 utils/containerfunc.hpp create mode 100644 utils/signalfunc.cpp create mode 100644 utils/signalfunc.hpp diff --git a/COPYING.GPL b/COPYING.GPL new file mode 100644 index 0000000..d511905 --- /dev/null +++ b/COPYING.GPL @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/LICENSE b/LICENSE index 354dc3e..591792d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,25 @@ +Falls nicht anders angegeben steht diese Bibliothek unter dem +unten stehenden Intranator Software Lizenzvertrag. + +Die Bibliothek "libi2ncommon-utils" im "utils" Verzeichnis +steht unter GPL version 2 + linking exception. Siehe COPYING.GPL +sowie diesen Text: + +*************** Linking exception begin *************** +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*************** Linking exception end *************** + +------------------------------------------------------------------------ WICHTIG - BITTE SORGFÄLTIG LESEN BEVOR SIE DIE SOFTWARE INSTALLIEREN Intranator Software Lizenzvertrag diff --git a/Makefile.am b/Makefile.am index 2746243..498e4b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,11 +2,11 @@ # have all needed files, that a GNU package needs AUTOMAKE_OPTIONS = foreign 1.4 -SUBDIRS = src configlib xmllib doc test +SUBDIRS = src configlib xmllib utils doc test # Install the pkg-config file: pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libi2ncommon.pc libi2ncommon_config.pc libi2ncommon_xml.pc +pkgconfig_DATA = libi2ncommon.pc libi2ncommon_config.pc libi2ncommon_xml.pc libi2ncommon_utils.pc if AUTOCHECK all: config.h @@ -14,4 +14,4 @@ all: config.h $(MAKE) $(AM_MAKEFLAGS) check endif -EXTRA_DIST = LICENSE +EXTRA_DIST = LICENSE COPYING.GPL diff --git a/configure.in b/configure.in index 3417002..bdc6452 100644 --- a/configure.in +++ b/configure.in @@ -45,5 +45,5 @@ AM_CONDITIONAL(HAVE_DOXYGEN, test -n $DOXYGEN) AM_PATH_CPPUNIT(1.8.0) -AC_OUTPUT(Doxyfile Makefile doc/Makefile doc/Doxyfile configlib/Makefile xmllib/Makefile libi2ncommon.pc src/Makefile \ - test/Makefile libi2ncommon_config.pc libi2ncommon_xml.pc) +AC_OUTPUT(Doxyfile Makefile doc/Makefile doc/Doxyfile configlib/Makefile xmllib/Makefile utils/Makefile src/Makefile \ + test/Makefile libi2ncommon.pc libi2ncommon_config.pc libi2ncommon_xml.pc libi2ncommon_utils.pc) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index e1e62b5..a95b01e 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -564,7 +564,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = @top_srcdir@/src @top_srcdir@/configlib @top_srcdir@/xmllib +INPUT = @top_srcdir@/src @top_srcdir@/configlib @top_srcdir@/xmllib @top_srcdir@/utils # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/doc/Makefile.am b/doc/Makefile.am index 67a20ab..30aaeeb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -11,7 +11,8 @@ all: $(MANUALS) # todo: separate build dir still doesn't work html/index.html: Doxyfile $(top_srcdir)/src/*.cpp $(top_srcdir)/src/*.hxx $(top_srcdir)/src/*.hpp \ $(top_srcdir)/configlib/*.cpp $(top_srcdir)/configlib/*.hpp \ - $(top_srcdir)/xmllib/*.cpp $(top_srcdir)/xmllib/*.hpp + $(top_srcdir)/xmllib/*.cpp $(top_srcdir)/xmllib/*.hpp \ + $(top_srcdir)/utils/*.cpp $(top_srcdir)/utils/*.hpp $(DOXYGEN) EXTRA_DIST = Doxyfile.in diff --git a/libi2ncommon.pc.in b/libi2ncommon.pc.in index de715b6..76dc3f8 100644 --- a/libi2ncommon.pc.in +++ b/libi2ncommon.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: libi2ncommon Description: library with functions common in Intra2net programs -Requires: libgettext +Requires: libgettext libi2ncommon_utils Version: @VERSION@ -Libs: -L${libdir} -li2ncommon +Libs: -L${libdir} -li2ncommon -li2ncommon_utils Cflags: -I${includedir} diff --git a/libi2ncommon.spec b/libi2ncommon.spec index 4fcde73..608e320 100644 --- a/libi2ncommon.spec +++ b/libi2ncommon.spec @@ -8,7 +8,7 @@ Vendor: Intra2net AG Source: %{name}-%{version}.tar.gz Buildroot: /tmp/%{name}-%{version}-root Prefix: /usr/intranator -Requires: libgettext +Requires: libgettext libi2ncommon-utils = %{version} BuildPrereq: libtool BuildRequires: boost-devel >= 1.32.0 @@ -45,6 +45,14 @@ Requires: libi2ncommon = %{version} %description xml The xml module provides common xml functions. +%package utils +Summary: library with open source utility modules +Group: Intranator +License: GPL version 2 + linking exception + +%description utils +Library with open source utility modules. + %prep %setup -q @@ -68,7 +76,7 @@ rm -fr $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc LICENSE +%doc LICENSE COPYING.GPL %{prefix}/lib/libi2ncommon.so* %files devel @@ -86,3 +94,8 @@ rm -fr $RPM_BUILD_ROOT %defattr(-,root,root) %doc LICENSE %{prefix}/lib/libi2ncommon_xml.so* + +%files utils +%defattr(-,root,root) +%doc LICENSE COPYING.GPL +%{prefix}/lib/libi2ncommon_utils.so* diff --git a/libi2ncommon_utils.pc.in b/libi2ncommon_utils.pc.in new file mode 100644 index 0000000..771c287 --- /dev/null +++ b/libi2ncommon_utils.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libi2ncommon_utils +Description: library with utility modules common in some Intra2net programs +Version: @VERSION@ +Libs: -L${libdir} -li2ncommon_utils +Cflags: -I${includedir} diff --git a/src/Makefile.am b/src/Makefile.am index 1ecac9d..f37a12a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,15 +4,15 @@ INCLUDES = -I$(top_srcdir)/src @LIBGETTEXT_CFLAGS@ @LIBICONV_CFLAGS@ @BOOST_CPPF # the library search path. lib_LTLIBRARIES = libi2ncommon.la -include_HEADERS = week.hpp containerfunc.hpp cron.hpp daemonfunc.hpp filefunc.hxx \ +include_HEADERS = week.hpp cron.hpp daemonfunc.hpp filefunc.hxx \ i2n_configdata.hpp i2n_configfile.hpp insocketstream.hxx ip_type.hxx ipfunc.hxx \ log_macros.hpp logfunc.hpp logread.hxx oftmpstream.hxx pidfile.hpp pipestream.hxx \ - pointer_func.hpp signalfunc.hpp source_track_basics.hpp stringfunc.hxx timefunc.hxx \ + pointer_func.hpp source_track_basics.hpp stringfunc.hxx timefunc.hxx \ tracefunc.hpp userfunc.hpp -libi2ncommon_la_SOURCES = week.cpp containerfunc.cpp cron.cpp daemonfunc.cpp \ +libi2ncommon_la_SOURCES = week.cpp cron.cpp daemonfunc.cpp \ filefunc.cpp i2n_configfile.cpp ipfunc.cpp logfunc.cpp logread.cpp oftmpstream.cpp \ - pidfile.cpp pointer_func.cpp signalfunc.cpp source_track_basics.cpp stringfunc.cpp \ + pidfile.cpp pointer_func.cpp source_track_basics.cpp stringfunc.cpp \ timefunc.cpp tracefunc.cpp userfunc.cpp # Note: If you specify a:b:c as the version in the next line, diff --git a/src/containerfunc.cpp b/src/containerfunc.cpp deleted file mode 100644 index 4e09116..0000000 --- a/src/containerfunc.cpp +++ /dev/null @@ -1,8 +0,0 @@ -/** @file - * - * (c) Copyright 2007-2008 by Intra2net AG - * - * info@intra2net.com - */ - -#include "containerfunc.hpp" diff --git a/src/containerfunc.hpp b/src/containerfunc.hpp deleted file mode 100644 index 341505d..0000000 --- a/src/containerfunc.hpp +++ /dev/null @@ -1,420 +0,0 @@ -/** @file - * @brief some helper for handling (STL) data structures. - * - * @author Reinhard Pfau \ - * - * (c) Copyright 2007-2008 by Intra2net AG - * - * info@intra2net.com - */ - -#ifndef _I2N_CONTAINERFUNC_HPP_ -#define _I2N_CONTAINERFUNC_HPP_ - -#include -#include -#include -#include -#include - - -namespace I2n { - - -/** - * convenience class to insert key-value pairs into a map. - */ -template -class MapFiller -{ - std::map & MapRef; - - public: - MapFiller( std::map & map_ref) - : MapRef(map_ref) - { - } - - MapFiller& operator () (const K& key, const V& value) - { - MapRef[key]= value; - return *this; - } - -}; // eo class MapFiller - - -/** - * convenience class to fill values into a container (using push_back). - */ -template< - typename T, - template< typename, typename> class C= std::list, - typename Alloc = std::allocator< T > -> -class PushBackFiller -{ - C< T, Alloc > &CRef; - public: - PushBackFiller( C & c ) - : CRef(c) - {} - - PushBackFiller& operator () (const T& value) - { - CRef.push_back(value); - return *this; - } // eo operator () - -}; // eo class PushBackFiller - - -template< - typename T, - template< typename, typename > class C, - typename Alloc -> -PushBackFiller< T, C, Alloc > get_push_back_filler( C< T, Alloc >& c) -{ - return PushBackFiller< T, C, Alloc >(c); -} // eo get_push_back_filler(C< T, Alloc >&) - - -/** - * convenience class for transient construction of a container including values. - */ -template< - typename T, - template< typename, typename> class C= std::list, - typename Alloc = std::allocator< T > -> -class TransientPushBackFiller -{ - C< T, Alloc > MyC; - public: - typedef C< T, Alloc > CType; - - TransientPushBackFiller() - {} - - TransientPushBackFiller& operator () (const T& value) - { - MyC.push_back(value); - return *this; - } // eo operator () - - operator CType () const { return MyC; } -}; // eo class TransientPushBackFiller - - -/** - * convenience class for transient construction of a map including values. - */ -template -class TransientMapFiller -{ - std::map Map; - - public: - typedef std::map< K, V > CType; - - - TransientMapFiller( ) - { - } - - TransientMapFiller& operator () (const K& key, const V& value) - { - Map[key]= value; - return *this; - } - - operator CType () const { return Map; } -}; // eo class MapFiller - - - - -/** - * returns the keys of a map as a list. - * @param the_map the map. - * @param the_keys the list where the keys are added to. - * @return @a true. - */ -template< typename K, typename V > -bool get_key_list( const std::map< K, V >& the_map, std::list< K >& the_keys ) -{ - for(typename std::map< K, V >::const_iterator it= the_map.begin(); - it != the_map.end(); - ++it ) - { - the_keys.push_back( it->first ); - } - return true; -} // eo get_key_list(const std::map< K,V >, std::list< K >&) - - -/** - * returns the keys of a map as a list. - * @param the_map the map. - * @return the list of keys. - */ -template< typename K, typename V > -std::list< K > get_key_list( const std::map< K, V>& the_map) -{ - std::list< K > result; - get_key_list(the_map, result); - return result; -} // eo get_key_list(const std::map< K,V >) - - -/** - * returns the keys of a map as a set. - * @param the_map the map. - * @param the_keys the set where the keys are added to. - * @return @a true. - */ -template< typename K, typename V > -bool get_key_set( const std::map< K, V >& the_map, std::set< K >& the_keys ) -{ - for(typename std::map< K, V >::const_iterator it= the_map.begin(); - it != the_map.end(); - ++it ) - { - the_keys.insert( it->first ); - } - return true; -} // eo get_key_set(const std::map< K,V >, std::set< K >&) - - -/** - * returns the keys of a map as a set. - * @param the_map the map. - * @return the set of keys. - */ -template< typename K, typename V > -std::list< K > get_key_set( const std::map< K, V>& the_map) -{ - std::set< K > result; - get_key_set(the_map, result); - return result; -} // eo get_key_set(const std::map< K,V >) - - -/** - * functor version of new(). - * can be used for deferred instantiation of objects. - */ -template< - typename T -> -struct New -{ - typedef T* result_type; - - result_type operator() () - { - return new T; - } - - template - result_type operator() (Arg1 arg1) - { - return new T(arg1); - } - - template - result_type operator() (Arg1 arg1,Arg2 arg2) - { - return new T(arg1,arg2); - } - - template - result_type operator() (Arg1 arg1,Arg2 arg2,Arg3 arg3) - { - return new T(arg1,arg2,arg3); - } - - template - result_type operator() (Arg1 arg1,Arg2 arg2,Arg3 arg3,Arg4 arg4) - { - return new T(arg1,arg2,arg3,arg4); - } - - template - result_type operator() (Arg1 arg1,Arg2 arg2,Arg3 arg3,Arg4 arg4,Arg5 arg5) - { - return new T(arg1,arg2,arg3,arg4,arg5); - } - -}; // eo struct New - - - - -/** - * functor version of boost::shared_ptr = new(). - * can be used for deferred instantiation of objects. - */ -template< - typename T -> -struct SharedPtrNew -{ - typedef boost::shared_ptr result_type; - - result_type operator() () - { - return result_type(new T); - } - - template - result_type operator() (Arg1 arg1) - { - return result_type(new T(arg1)); - } - - template - result_type operator() (Arg1 arg1,Arg2 arg2) - { - return result_type(new T(arg1,arg2)); - } - - template - result_type operator() (Arg1 arg1,Arg2 arg2,Arg3 arg3) - { - return result_type(new T(arg1,arg2,arg3)); - } - - template - result_type operator() (Arg1 arg1,Arg2 arg2,Arg3 arg3,Arg4 arg4) - { - return result_type(new T(arg1,arg2,arg3,arg4)); - } - - template - result_type operator() (Arg1 arg1,Arg2 arg2,Arg3 arg3,Arg4 arg4,Arg5 arg5) - { - return result_type(new T(arg1,arg2,arg3,arg4,arg5)); - } - -}; // eo struct SharedPtrNew - - - -/* -** classes holding a shared or weak pointer. -** designed to be used as policy classes... -** (but may be used for other purposes, too) -*/ - -template< - class X -> -class SharedOwnership -{ - public: - - SharedOwnership( boost::shared_ptr< X > ptr) - : StoredPtr(ptr) - {} - - - boost::shared_ptr< X > get_ptr() const { return StoredPtr; } - - public: - - boost::shared_ptr< X > StoredPtr; -}; // eo class SharedOwnership - - - -template< - class X -> -class WeakOwnership -{ - public: - - WeakOwnership( boost::shared_ptr< X > ptr) - : StoredPtr(ptr) - {} - - - boost::shared_ptr< X > get_ptr() const { return StoredPtr.lock(); } - - public: - - boost::weak_ptr< X > StoredPtr; -}; // eo class WeakOwnership - - - -/* -** NoOperation -** =========== -*/ - - -/** - * @brief the ultimate class for doing nothing :-) - * - * Even it sounds odd to have a functor class which is doing nothing it makes - * sense to use this class in some situations. - * - * One example is the usage as Deleter for shared pointers which "own" a pointer to - * a static object (i.e. it is not allowed to be really deleted...). Using this class - * as Deleter in these pointers enables us to use interfaces which expect a shared pointer - * even if we want(/must) to pass pointers to static objects. - */ -struct NoOperation -{ - NoOperation() {}; - - template< - typename Arg1 - > - NoOperation(Arg1) {} - - - template< - typename Arg1, typename Arg2 - > - NoOperation(Arg1, Arg2) {} - - - template< - typename Arg1, typename Arg2, typename Arg3 - > - NoOperation(Arg1, Arg2, Arg3) {} - - - void operator() () const {} - - - template< - typename Arg1 - > - void operator() (Arg1) const {} - - - template< - typename Arg1, typename Arg2 - > - void operator() (Arg1, Arg2) const {} - - - template< - typename Arg1, typename Arg2, typename Arg3 - > - void operator() (Arg1, Arg2, Arg3) const {} - - - -}; // eo struct NoOperation - - - -} // eo namespace I2n - -#endif diff --git a/src/signalfunc.cpp b/src/signalfunc.cpp deleted file mode 100644 index ed0f544..0000000 --- a/src/signalfunc.cpp +++ /dev/null @@ -1,425 +0,0 @@ -/** @file - * @brief implementation of wrapper and tools for signal related stuff. - * - * @copyright © Copyright 2007-2008 by Intra2net AG - * @license commercial - * - * info@intra2net.com - */ - -#include "signalfunc.hpp" - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - - -namespace I2n -{ -namespace SystemTools -{ - - -namespace -{ - -/** - * helper for using sigaddset() as unary function within (STL) algorithms. - */ -struct SigAddSet -{ - sigset_t *m_set; - SigAddSet(sigset_t *set) : m_set(set) {} - int operator() (int sig) { return sigaddset(m_set,sig); } -}; // eo struct SigAddSet - - - -/** - * blocks the given signals while existing. - * - * This class is the real (internal) implementation of the @a SignalBlocker . - * - * @internal This internal implementation is used to avoid including signal.h within the header file. - * This way, we can keep the header clean; and hide all the internals in the implementation. - */ -class _ScopedSignalBlocker : public SystemTools::Detail::SObject -{ - public: - _ScopedSignalBlocker(const std::vector& sigs); - ~_ScopedSignalBlocker(); - - bool successful() const {return m_set; } - - protected: - sigset_t m_sigset[1]; - sigset_t m_oldsigset[1]; - bool m_set; -}; // eo _ScopedSignalBlocker - - -/** - * Blocks the given signals. - * - * Constructs a sigset from the passed signals; and calls sigprocmask to block them. - * In case of interruption with EINTR during the call, the call is repeated some times - * to get the desired signals blocked. - * - * @param sigs the vector with the siganls which should be blocked. - */ -_ScopedSignalBlocker::_ScopedSignalBlocker(const std::vector& sigs) -{ - sigemptyset(m_sigset); - - // fill in signals - std::for_each(sigs.begin(), sigs.end(), SigAddSet(m_sigset) ); - - int res; - for(int cnt=1000; cnt-->0;) - { - res= sigprocmask(SIG_BLOCK,m_sigset, m_oldsigset); - if (!res || errno!=EINTR) break; - } - m_set= (res==0); -} // eo _ScopedSignalBlocker::_ScopedSignalBlocker() - - -/** - * Unblocks the signals by restoring the original block mask. - */ -_ScopedSignalBlocker::~_ScopedSignalBlocker() -{ - int res; - if (!m_set) return; - for(int cnt=1000; cnt-->0;) - { - res= sigprocmask(SIG_SETMASK, m_oldsigset, NULL); - if (!res || errno!=EINTR) break; - } -} // eo _ScopedSignalBlocker::~_ScopedSignalBlocker() - - - -} // eo namespace - - -/*************************************************************************\ -\*************************************************************************/ - - - -/* - * Signal - */ -/// @cond - -const int Signal::VOID= 0; - -// helper macro to import the signal nums: -#define IMPORT(sig) const int Signal::sig = SIG ## sig - -IMPORT(HUP); -IMPORT(INT); -IMPORT(QUIT); -IMPORT(ILL); -IMPORT(TRAP); -IMPORT(ABRT); -IMPORT(IOT); -IMPORT(BUS); -IMPORT(FPE); -IMPORT(KILL); -IMPORT(USR1); -IMPORT(SEGV); -IMPORT(USR2); -IMPORT(PIPE); -IMPORT(ALRM); -IMPORT(TERM); -IMPORT(STKFLT); -IMPORT(CLD); -IMPORT(CHLD); -IMPORT(CONT); -IMPORT(STOP); -IMPORT(TSTP); -IMPORT(TTIN); -IMPORT(TTOU); -IMPORT(URG); -IMPORT(XCPU); -IMPORT(XFSZ); -IMPORT(VTALRM); -IMPORT(PROF); -IMPORT(WINCH); -IMPORT(POLL); -IMPORT(IO); -IMPORT(PWR); -IMPORT(SYS); - -// remove helper macro -#undef IMPORT - -/// @endcond - -int Signal::RT(int num) -{ - return SIGRTMIN + num; -} // eo Signal::RT - - -/* - * SignalCode - */ - - -/// @cond - -// basically: define apropriate CODE macro and copy the CODE() parts from hpp: - -#undef CODE -#define CODE(name) const int SignalCode::name = SI_ ## name - CODE(USER); CODE(QUEUE); CODE(TIMER); CODE(MESGQ); - CODE(ASYNCIO); -#undef SIGIO - CODE(SIGIO); -#undef CODE -#define CODE(name) const int SignalCode::ILL::name = ILL_ ## name - CODE(ILLOPC); CODE(ILLOPN); CODE(ILLADR); CODE(ILLTRP); - CODE(PRVOPC); CODE(PRVREG); CODE(COPROC); CODE(BADSTK); -#undef CODE -#define CODE(name) const int SignalCode::FPE::name = FPE_ ## name - CODE(INTDIV); CODE(INTOVF); CODE(FLTDIV); CODE(FLTOVF); - CODE(FLTUND); CODE(FLTRES); CODE(FLTINV); CODE(FLTSUB); -#undef CODE -#define CODE(name) const int SignalCode::SEGV::name = SEGV_ ## name - CODE(MAPERR); CODE(ACCERR); -#undef CODE -#define CODE(name) const int SignalCode::BUS::name = BUS_ ## name - CODE(ADRALN); CODE(ADRERR); CODE(OBJERR); -#undef CODE -#define CODE(name) const int SignalCode::TRAP::name = TRAP_ ## name - CODE(BRKPT); CODE(TRACE); -#undef CODE -#define CODE(name) const int SignalCode::CHLD::name = CLD_ ## name - CODE(EXITED); CODE(KILLED); CODE(DUMPED); CODE(TRAPPED); - CODE(STOPPED); CODE(CONTINUED); -#undef CODE -#define CODE(name) const int SignalCode::POLL::name = POLL_ ## name - CODE(IN); CODE(OUT); CODE(MSG); CODE(ERR); CODE(PRI); CODE(HUP); -#undef CODE -/// @endcond - -/* - * ScopedSignalBlocker - */ - - -/** - * Blocks the given signal. - * @param sig the signal which should be blocked. - */ -ScopedSignalBlocker::ScopedSignalBlocker(Signal sig) -{ - Implementation = new _ScopedSignalBlocker( TransientPushBackFiller< Signal, std::vector >()(sig) ); -} // eo ScopedSignalBlocker::ScopedSignalBlocker - - -ScopedSignalBlocker::ScopedSignalBlocker(Signal sig1, Signal sig2) -{ - Implementation = new _ScopedSignalBlocker( TransientPushBackFiller< Signal, std::vector >()(sig1)(sig2) ); -} // eo ScopedSignalBlocker::ScopedSignalBlocker - - -ScopedSignalBlocker::ScopedSignalBlocker(Signal sig1, Signal sig2, Signal sig3) -{ - Implementation = new _ScopedSignalBlocker( TransientPushBackFiller< Signal, std::vector >()(sig1)(sig2)(sig3) ); -} // eo ScopedSignalBlocker::ScopedSignalBlocker - - -/** - * Blocks the given signals. - * @param sigs vector with the signals which should be blocked. - */ -ScopedSignalBlocker::ScopedSignalBlocker(const std::vector& sigs) -{ - Implementation = new _ScopedSignalBlocker( sigs ); -} // eo ScopedSignalBlocker::ScopedSignalBlocker - - -/** - * Unblocks the signals by restoring the previous blocking list. - */ -ScopedSignalBlocker::~ScopedSignalBlocker() -{ - if (Implementation) - { - delete Implementation; - Implementation= NULL; - } -} // eo ScopedSignalBlocker::ScopedSignalBlocker - - - -/* -** signal handling -*/ - -typedef std::map< int, struct sigaction > SignalActionMap; - -namespace { - -SignalActionMap original_signal_action; - -} // eo namespace - - -/** - * @brief installs a new signal action. - * @param sig the signal - * @param new_action the new signal action. - * @return @a true iff the new signal action was succesfully installed. - * - * Remembers the original value of the signal handler for later restoring. - */ -bool install_signal_handler( - Signal sig, - struct sigaction& new_action -) -{ - struct sigaction old_action[1]; - int signum= sig; - int res= ::sigaction(signum, &new_action, old_action); - if (0 == res) - { - SignalActionMap::iterator it= original_signal_action.find(signum); - if (it == original_signal_action.end()) - { - original_signal_action[signum] = *old_action; - } - } - else if (res > 0) - { - // some glibc's seem to return the errno instead of storing - // it in the appropriate var... *sigh* - errno = res; - } - return (0 == res); -} // eo install_signal_handler(int,sigaction&) - - -/** - * @brief installs a simple signal handler. - * @param sig the signal. - * @param handler pointer to the signal handler. - * @return @a true iff the handler was successfully installed. - * - * Remembers the original value of the signal handler for later restoring. - */ -bool install_signal_handler( - Signal sig, - void(*handler)(int) -) -{ - struct sigaction new_action; - new_action.sa_handler= handler; - sigemptyset( &new_action.sa_mask ); - new_action.sa_flags= 0; - new_action.sa_restorer= NULL; - return install_signal_handler(sig, new_action); -} // eo install_signal_handler(signum,void(*)(int)) - - - -/** - * @brief installs a signal action handler. - * @param sig the signal - * @param handler pointer to the signal action handler. - * @return @a true iff the action handler was successfully installed. - * - * Remembers the original value of the signal handler for later restoring. - */ -bool install_signal_handler( - Signal sig, - void(*handler)(int,struct siginfo*,void*) -) -{ - struct sigaction new_action; - new_action.sa_sigaction= handler; - sigemptyset( &new_action.sa_mask ); - new_action.sa_flags= SA_SIGINFO; - new_action.sa_restorer= NULL; - return install_signal_handler(sig, new_action); -} // eo install_signal_handler(signum,void(*)(int,siginfo_t*,void*)) - - -/** - * @brief ignores a signal. - * @param sig the signal - * @return @a true iff the ignore handler was successfully installed. - * - * Remembers the original value of the signal handler for later restoring. - */ -bool ignore_signal(Signal sig) -{ - return install_signal_handler(sig, SIG_IGN ); -} // eo ignore_signal(Signal) - - -/** - * @brief enables the default signal handler. - * @param sig the signal - * @return @a true iff the default handler was successfully installed. - * - * Remembers the original value of the signal handler for later restoring. - */ -bool install_default_signal_handler(Signal sig) -{ - return install_signal_handler(sig, SIG_DFL ); -} // eo install_default_signal_handler(Signal) - - -/** - * @brief restores a signal handle to its original value. - * @param sig the signal. - * @return @a true iff the handler was sucessfully restored. - */ -bool restore_signal_handler(Signal sig) -{ - int signum= sig; - SignalActionMap::iterator it= original_signal_action.find(signum); - int res= -1; - if (it != original_signal_action.end()) - { - res= ::sigaction(signum, &(it->second), NULL); - if (0 == res) - { - original_signal_action.erase(it); - } - } - return (0 == res); -} // eo restore_signal_handler - - - -/** - * @brief convenience function; send's a signal to a process. - * @param pid PID of the process which should recive the signal. - * @param signal the signal to send. - * @return @a true iff sending of the signal succeeded. - */ -bool send_signal( pid_t pid, Signal signal) -{ - return ::kill(pid, signal.Value) == 0; -} // eo send_signal(pid_t,Signal) - - - -} // eo namespace SystemTools -} // eo namespace I2n diff --git a/src/signalfunc.hpp b/src/signalfunc.hpp deleted file mode 100644 index 35bf2b9..0000000 --- a/src/signalfunc.hpp +++ /dev/null @@ -1,245 +0,0 @@ -/** @file - * @brief provides wrapper and tools for signal related stuff. - * - * - * @copyright © Copyright 2007-2008 by Intra2net AG - * @license commercial - * @contact info@intra2net.com - * - * @bug - * Although most stuff should work under most POSIX like systems; - * some funcs might be very linux related. - * (But at least we use that lib currently under linux only.) - */ - -#ifndef _I2N_SIGNALFUNC_HPP_ -#define _I2N_SIGNALFUNC_HPP_ - -#include - -// with pain in the stomach; the following include was added....: -// (since these includes a lot of #define's... what we usually don't want to have in C++ headers...) -#include - -extern "C" -{ - -struct siginfo; - -} - - -namespace I2n -{ -namespace SystemTools -{ - - -namespace Detail -{ - -/** - * base class for internal implementation classes. - */ -class SObject -{ - public: - virtual ~SObject() {} -}; // eo class SObject - -} // eo namespace Detail - -/** - * @brief representation of system signal. - * - * This struct also provides constants for the usual system signals; so it is not necessary to include signal.h - * for obtaining the constants. - * - * Due to an appropriate cast operator instances of the class can be used in all places where - * a plain signal (i.e. an int) is expected. - */ -struct Signal -{ - static const int VOID; -/// @cond - -#define SIG(s) static const int s - SIG(HUP); SIG(INT); SIG(QUIT); SIG(ILL); SIG(TRAP); - SIG(ABRT); SIG(IOT); SIG(BUS); SIG(FPE); SIG(KILL); - SIG(USR1); SIG(SEGV); SIG(USR2); SIG(PIPE); SIG(ALRM); - SIG(TERM); SIG(STKFLT); SIG(CLD); SIG(CHLD); SIG(CONT); SIG(STOP); - SIG(TSTP); SIG(TTIN); SIG(TTOU); SIG(URG); SIG(XCPU); - SIG(XFSZ); SIG(VTALRM); SIG(PROF); SIG(WINCH); SIG(POLL); - SIG(IO); SIG(PWR); SIG(SYS); -#undef SIG - -/// @endcond - - static int RT(int num=0); - - int Value; - - Signal(int signal) : Value(signal) {} - - operator int () const { return Value; } -}; // eo struct Signal - - -/** - * @brief representation of signal codes. - * - * This struct provides constants for signal codes; so it is not necessary to include signal.h - * for obtaining the constants. - * - * Due to an appropriate cast operator instances of the class can be used in all places where - * a plain signal code (i.e. an int) is expected. - */ -struct SignalCode -{ - - -/// @cond -#define CODE(name) static const int name - CODE(USER); CODE(QUEUE); CODE(TIMER); CODE(MESGQ); - CODE(ASYNCIO); -#undef SIGIO - CODE(SIGIO); -/// @endcond - - /** - * @brief contains the codes for signal SIGILL - */ - struct ILL - { - /// @cond - CODE(ILLOPC); CODE(ILLOPN); CODE(ILLADR); CODE(ILLTRP); - CODE(PRVOPC); CODE(PRVREG); CODE(COPROC); CODE(BADSTK); - /// @endcond - }; // eo struct ILL; - - - /** - * @brief contains the codes for signal SIGFPE - */ - struct FPE - { - /// @cond - CODE(INTDIV); CODE(INTOVF); CODE(FLTDIV); CODE(FLTOVF); - CODE(FLTUND); CODE(FLTRES); CODE(FLTINV); CODE(FLTSUB); - /// @endcond - }; // eo struct FPE - - - /** - * @brief contains the codes for signal SIGSEGV - */ - struct SEGV - { - /// @cond - CODE(MAPERR); CODE(ACCERR); - /// @endcond - }; // eo struct SEGV - - - /** - * @brief contains the codes for signal SIGBUS - */ - struct BUS - { - /// @cond - CODE(ADRALN); CODE(ADRERR); CODE(OBJERR); - /// @endcond - }; // eo struct BUS - - - /** - * @brief contains the codes for signal SIGTRAP - */ - struct TRAP - { - /// @cond - CODE(BRKPT); CODE(TRACE); - /// @endcond - }; // eo struct TRAP - - - /** - * @brief contains the codes for signal SIGCHLD - */ - struct CHLD - { - /// @cond - CODE(EXITED); CODE(KILLED); CODE(DUMPED); CODE(TRAPPED); - CODE(STOPPED); CODE(CONTINUED); - /// @endcond - }; // eo struct CHLD - - - /** - * @brief contains the codes for signal SIGPOLL - */ - struct POLL - { - /// @cond - CODE(IN); CODE(OUT); CODE(MSG); CODE(ERR); CODE(PRI); CODE(HUP); - /// @endcond - }; // eo strcut POLL - -#undef CODE - - int TheCode; - - SignalCode(int code) : TheCode(code) {} - - operator int () const { return TheCode; } -}; // eo SignalCode - - - - -/** - * @brief helper for blocking a (or some) signal(s) during an operation. - * - * This class blocks the given signals when constructed and resets the original block mask - * when destructed. - */ -class ScopedSignalBlocker -{ - public: - ScopedSignalBlocker(Signal sig); - ScopedSignalBlocker(Signal sig1, Signal sig2); - ScopedSignalBlocker(Signal sig1, Signal sig2, Signal sig3); - ScopedSignalBlocker(const std::vector& sigs); - virtual ~ScopedSignalBlocker(); - - private: - Detail::SObject* Implementation; - -}; // eo class ScopedSignalBlocker - - - - -bool install_signal_handler( - Signal sig, - void(*handler)(int) -); - -bool install_signal_handler( - Signal sig, - void(*handler)(int,struct siginfo*,void*) -); - -bool ignore_signal(Signal sig); -bool install_default_signal_handler(Signal sig); - -bool restore_signal_handler(Signal sig); - - -bool send_signal( pid_t pid, Signal signal); - - -} // eo namespace SysTools -} // eo namespace I2n - -#endif diff --git a/test/Makefile.am b/test/Makefile.am index 9fd5b7b..bc53604 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,10 +1,10 @@ -INCLUDES = -I$(top_srcdir)/configlib -I$(top_srcdir)/src @CPPUNIT_CFLAGS@ +INCLUDES = -I$(top_srcdir)/configlib -I$(top_srcdir)/src -I$(top_srcdir)/utils @CPPUNIT_CFLAGS@ METASOURCES = AUTO check_PROGRAMS = test test_SOURCES = ip_range.cpp stringfunc.cpp test.cpp test_containerfunc.cpp \ test_cron_interval.cpp test_cron_point.cpp test_filefunc.cpp test_global_config.cpp \ test_logging.cpp test_pidfile.cpp test_timefunc.cpp -test_LDADD = $(top_builddir)/src/libi2ncommon.la \ +test_LDADD = $(top_builddir)/src/libi2ncommon.la $(top_builddir)/utils/libi2ncommon_utils.la \ $(top_builddir)/configlib/libi2ncommon_config.la @CPPUNIT_LIBS@ TESTS = test diff --git a/utils/Makefile.am b/utils/Makefile.am new file mode 100644 index 0000000..4535091 --- /dev/null +++ b/utils/Makefile.am @@ -0,0 +1,15 @@ +# set the include path found by configure +INCLUDES = -I$(top_srcdir)/src @BOOST_CPPFLAGS@ $(all_includes) +METASOURCES = AUTO + +lib_LTLIBRARIES = libi2ncommon_utils.la + +include_HEADERS = containerfunc.hpp signalfunc.hpp + +# Note: If you specify a:b:c as the version in the next line, +# the library that is made has version (a-c).c.b. In this +# example, the version is 2.1.2. (3:2:1) + +libi2ncommon_utils_la_LDFLAGS = -version-info @LIBI2NCOMMON_LIB_VERSION@ @BOOST_LDFLAGS@ + +libi2ncommon_utils_la_SOURCES = containerfunc.cpp signalfunc.cpp diff --git a/utils/containerfunc.cpp b/utils/containerfunc.cpp new file mode 100644 index 0000000..80e3bce --- /dev/null +++ b/utils/containerfunc.cpp @@ -0,0 +1,27 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ +/** @file + * + * (c) Copyright 2007-2008 by Intra2net AG + * + * opensource@intra2net.com + */ + +#include "containerfunc.hpp" diff --git a/utils/containerfunc.hpp b/utils/containerfunc.hpp new file mode 100644 index 0000000..2e61e54 --- /dev/null +++ b/utils/containerfunc.hpp @@ -0,0 +1,431 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ +/** @file + * @brief some helper for handling (STL) data structures. + * + * @author Reinhard Pfau \ + * + * (c) Copyright 2007-2008 by Intra2net AG + * + * opensource@intra2net.com + */ + +#ifndef _I2N_CONTAINERFUNC_HPP_ +#define _I2N_CONTAINERFUNC_HPP_ + +#include +#include +#include +#include +#include + + +namespace I2n { + + +/** + * convenience class to insert key-value pairs into a map. + */ +template +class MapFiller +{ + std::map & MapRef; + + public: + MapFiller( std::map & map_ref) + : MapRef(map_ref) + { + } + + MapFiller& operator () (const K& key, const V& value) + { + MapRef[key]= value; + return *this; + } + +}; // eo class MapFiller + + +/** + * convenience class to fill values into a container (using push_back). + */ +template< + typename T, + template< typename, typename> class C= std::list, + typename Alloc = std::allocator< T > +> +class PushBackFiller +{ + C< T, Alloc > &CRef; + public: + PushBackFiller( C & c ) + : CRef(c) + {} + + PushBackFiller& operator () (const T& value) + { + CRef.push_back(value); + return *this; + } // eo operator () + +}; // eo class PushBackFiller + + +template< + typename T, + template< typename, typename > class C, + typename Alloc +> +PushBackFiller< T, C, Alloc > get_push_back_filler( C< T, Alloc >& c) +{ + return PushBackFiller< T, C, Alloc >(c); +} // eo get_push_back_filler(C< T, Alloc >&) + + +/** + * convenience class for transient construction of a container including values. + */ +template< + typename T, + template< typename, typename> class C= std::list, + typename Alloc = std::allocator< T > +> +class TransientPushBackFiller +{ + C< T, Alloc > MyC; + public: + typedef C< T, Alloc > CType; + + TransientPushBackFiller() + {} + + TransientPushBackFiller& operator () (const T& value) + { + MyC.push_back(value); + return *this; + } // eo operator () + + operator CType () const { return MyC; } +}; // eo class TransientPushBackFiller + + +/** + * convenience class for transient construction of a map including values. + */ +template +class TransientMapFiller +{ + std::map Map; + + public: + typedef std::map< K, V > CType; + + + TransientMapFiller( ) + { + } + + TransientMapFiller& operator () (const K& key, const V& value) + { + Map[key]= value; + return *this; + } + + operator CType () const { return Map; } +}; // eo class MapFiller + + + + +/** + * returns the keys of a map as a list. + * @param the_map the map. + * @param the_keys the list where the keys are added to. + * @return @a true. + */ +template< typename K, typename V > +bool get_key_list( const std::map< K, V >& the_map, std::list< K >& the_keys ) +{ + for(typename std::map< K, V >::const_iterator it= the_map.begin(); + it != the_map.end(); + ++it ) + { + the_keys.push_back( it->first ); + } + return true; +} // eo get_key_list(const std::map< K,V >, std::list< K >&) + + +/** + * returns the keys of a map as a list. + * @param the_map the map. + * @return the list of keys. + */ +template< typename K, typename V > +std::list< K > get_key_list( const std::map< K, V>& the_map) +{ + std::list< K > result; + get_key_list(the_map, result); + return result; +} // eo get_key_list(const std::map< K,V >) + + +/** + * returns the keys of a map as a set. + * @param the_map the map. + * @param the_keys the set where the keys are added to. + * @return @a true. + */ +template< typename K, typename V > +bool get_key_set( const std::map< K, V >& the_map, std::set< K >& the_keys ) +{ + for(typename std::map< K, V >::const_iterator it= the_map.begin(); + it != the_map.end(); + ++it ) + { + the_keys.insert( it->first ); + } + return true; +} // eo get_key_set(const std::map< K,V >, std::set< K >&) + + +/** + * returns the keys of a map as a set. + * @param the_map the map. + * @return the set of keys. + */ +template< typename K, typename V > +std::list< K > get_key_set( const std::map< K, V>& the_map) +{ + std::set< K > result; + get_key_set(the_map, result); + return result; +} // eo get_key_set(const std::map< K,V >) + + +/** + * functor version of new(). + * can be used for deferred instantiation of objects. + */ +template< + typename T +> +struct New +{ + typedef T* result_type; + + result_type operator() () + { + return new T; + } + + template + result_type operator() (Arg1 arg1) + { + return new T(arg1); + } + + template + result_type operator() (Arg1 arg1,Arg2 arg2) + { + return new T(arg1,arg2); + } + + template + result_type operator() (Arg1 arg1,Arg2 arg2,Arg3 arg3) + { + return new T(arg1,arg2,arg3); + } + + template + result_type operator() (Arg1 arg1,Arg2 arg2,Arg3 arg3,Arg4 arg4) + { + return new T(arg1,arg2,arg3,arg4); + } + + template + result_type operator() (Arg1 arg1,Arg2 arg2,Arg3 arg3,Arg4 arg4,Arg5 arg5) + { + return new T(arg1,arg2,arg3,arg4,arg5); + } + +}; // eo struct New + + + + +/** + * functor version of boost::shared_ptr = new(). + * can be used for deferred instantiation of objects. + */ +template< + typename T +> +struct SharedPtrNew +{ + typedef boost::shared_ptr result_type; + + result_type operator() () + { + return result_type(new T); + } + + template + result_type operator() (Arg1 arg1) + { + return result_type(new T(arg1)); + } + + template + result_type operator() (Arg1 arg1,Arg2 arg2) + { + return result_type(new T(arg1,arg2)); + } + + template + result_type operator() (Arg1 arg1,Arg2 arg2,Arg3 arg3) + { + return result_type(new T(arg1,arg2,arg3)); + } + + template + result_type operator() (Arg1 arg1,Arg2 arg2,Arg3 arg3,Arg4 arg4) + { + return result_type(new T(arg1,arg2,arg3,arg4)); + } + + template + result_type operator() (Arg1 arg1,Arg2 arg2,Arg3 arg3,Arg4 arg4,Arg5 arg5) + { + return result_type(new T(arg1,arg2,arg3,arg4,arg5)); + } + +}; // eo struct SharedPtrNew + + + +/* +** classes holding a shared or weak pointer. +** designed to be used as policy classes... +** (but may be used for other purposes, too) +*/ + +template< + class X +> +class SharedOwnership +{ + public: + + SharedOwnership( boost::shared_ptr< X > ptr) + : StoredPtr(ptr) + {} + + + boost::shared_ptr< X > get_ptr() const { return StoredPtr; } + + public: + + boost::shared_ptr< X > StoredPtr; +}; // eo class SharedOwnership + + + +template< + class X +> +class WeakOwnership +{ + public: + + WeakOwnership( boost::shared_ptr< X > ptr) + : StoredPtr(ptr) + {} + + + boost::shared_ptr< X > get_ptr() const { return StoredPtr.lock(); } + + public: + + boost::weak_ptr< X > StoredPtr; +}; // eo class WeakOwnership + + + +/* +** NoOperation +** =========== +*/ + + +/** + * @brief the ultimate class for doing nothing :-) + * + * Even it sounds odd to have a functor class which is doing nothing it makes + * sense to use this class in some situations. + * + * One example is the usage as Deleter for shared pointers which "own" a pointer to + * a static object (i.e. it is not allowed to be really deleted...). Using this class + * as Deleter in these pointers enables us to use interfaces which expect a shared pointer + * even if we want(/must) to pass pointers to static objects. + */ +struct NoOperation +{ + NoOperation() {}; + + template< + typename Arg1 + > + NoOperation(Arg1) {} + + template< + typename Arg1, typename Arg2 + > + NoOperation(Arg1, Arg2) {} + + template< + typename Arg1, typename Arg2, typename Arg3 + > + NoOperation(Arg1, Arg2, Arg3) {} + + void operator() () const {} + + template< + typename Arg1 + > + void operator() (Arg1) const {} + + template< + typename Arg1, typename Arg2 + > + void operator() (Arg1, Arg2) const {} + + template< + typename Arg1, typename Arg2, typename Arg3 + > + void operator() (Arg1, Arg2, Arg3) const {} + +}; // eo struct NoOperation + + + +} // eo namespace I2n + +#endif diff --git a/utils/signalfunc.cpp b/utils/signalfunc.cpp new file mode 100644 index 0000000..8cad55e --- /dev/null +++ b/utils/signalfunc.cpp @@ -0,0 +1,443 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ +/** @file + * @brief implementation of wrapper and tools for signal related stuff. + * + * @copyright © Copyright 2007-2008 by Intra2net AG + * + * opensource@intra2net.com + */ + +#include "signalfunc.hpp" + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + + +namespace I2n +{ +namespace SystemTools +{ + + +namespace +{ + +/** + * helper for using sigaddset() as unary function within (STL) algorithms. + */ +struct SigAddSet +{ + sigset_t *m_set; + SigAddSet(sigset_t *set) : m_set(set) {} + int operator() (int sig) { return sigaddset(m_set,sig); } +}; // eo struct SigAddSet + + + +/** + * blocks the given signals while existing. + * + * This class is the real (internal) implementation of the @a SignalBlocker . + * + * @internal This internal implementation is used to avoid including signal.h within the header file. + * This way, we can keep the header clean; and hide all the internals in the implementation. + */ +class _ScopedSignalBlocker : public SystemTools::Detail::SObject +{ + public: + _ScopedSignalBlocker(const std::vector& sigs); + ~_ScopedSignalBlocker(); + + bool successful() const {return m_set; } + + protected: + sigset_t m_sigset[1]; + sigset_t m_oldsigset[1]; + bool m_set; +}; // eo _ScopedSignalBlocker + + +/** + * Blocks the given signals. + * + * Constructs a sigset from the passed signals; and calls sigprocmask to block them. + * In case of interruption with EINTR during the call, the call is repeated some times + * to get the desired signals blocked. + * + * @param sigs the vector with the siganls which should be blocked. + */ +_ScopedSignalBlocker::_ScopedSignalBlocker(const std::vector& sigs) +{ + sigemptyset(m_sigset); + + // fill in signals + std::for_each(sigs.begin(), sigs.end(), SigAddSet(m_sigset) ); + + int res; + for(int cnt=1000; cnt-->0;) + { + res= sigprocmask(SIG_BLOCK,m_sigset, m_oldsigset); + if (!res || errno!=EINTR) break; + } + m_set= (res==0); +} // eo _ScopedSignalBlocker::_ScopedSignalBlocker() + + +/** + * Unblocks the signals by restoring the original block mask. + */ +_ScopedSignalBlocker::~_ScopedSignalBlocker() +{ + int res; + if (!m_set) return; + for(int cnt=1000; cnt-->0;) + { + res= sigprocmask(SIG_SETMASK, m_oldsigset, NULL); + if (!res || errno!=EINTR) break; + } +} // eo _ScopedSignalBlocker::~_ScopedSignalBlocker() + + + +} // eo namespace + + +/*************************************************************************\ +\*************************************************************************/ + + + +/* + * Signal + */ +/// @cond + +const int Signal::VOID= 0; + +// helper macro to import the signal nums: +#define IMPORT(sig) const int Signal::sig = SIG ## sig + +IMPORT(HUP); +IMPORT(INT); +IMPORT(QUIT); +IMPORT(ILL); +IMPORT(TRAP); +IMPORT(ABRT); +IMPORT(IOT); +IMPORT(BUS); +IMPORT(FPE); +IMPORT(KILL); +IMPORT(USR1); +IMPORT(SEGV); +IMPORT(USR2); +IMPORT(PIPE); +IMPORT(ALRM); +IMPORT(TERM); +IMPORT(STKFLT); +IMPORT(CLD); +IMPORT(CHLD); +IMPORT(CONT); +IMPORT(STOP); +IMPORT(TSTP); +IMPORT(TTIN); +IMPORT(TTOU); +IMPORT(URG); +IMPORT(XCPU); +IMPORT(XFSZ); +IMPORT(VTALRM); +IMPORT(PROF); +IMPORT(WINCH); +IMPORT(POLL); +IMPORT(IO); +IMPORT(PWR); +IMPORT(SYS); + +// remove helper macro +#undef IMPORT + +/// @endcond + +int Signal::RT(int num) +{ + return SIGRTMIN + num; +} // eo Signal::RT + + +/* + * SignalCode + */ + + +/// @cond + +// basically: define apropriate CODE macro and copy the CODE() parts from hpp: + +#undef CODE +#define CODE(name) const int SignalCode::name = SI_ ## name + CODE(USER); CODE(QUEUE); CODE(TIMER); CODE(MESGQ); + CODE(ASYNCIO); +#undef SIGIO + CODE(SIGIO); +#undef CODE +#define CODE(name) const int SignalCode::ILL::name = ILL_ ## name + CODE(ILLOPC); CODE(ILLOPN); CODE(ILLADR); CODE(ILLTRP); + CODE(PRVOPC); CODE(PRVREG); CODE(COPROC); CODE(BADSTK); +#undef CODE +#define CODE(name) const int SignalCode::FPE::name = FPE_ ## name + CODE(INTDIV); CODE(INTOVF); CODE(FLTDIV); CODE(FLTOVF); + CODE(FLTUND); CODE(FLTRES); CODE(FLTINV); CODE(FLTSUB); +#undef CODE +#define CODE(name) const int SignalCode::SEGV::name = SEGV_ ## name + CODE(MAPERR); CODE(ACCERR); +#undef CODE +#define CODE(name) const int SignalCode::BUS::name = BUS_ ## name + CODE(ADRALN); CODE(ADRERR); CODE(OBJERR); +#undef CODE +#define CODE(name) const int SignalCode::TRAP::name = TRAP_ ## name + CODE(BRKPT); CODE(TRACE); +#undef CODE +#define CODE(name) const int SignalCode::CHLD::name = CLD_ ## name + CODE(EXITED); CODE(KILLED); CODE(DUMPED); CODE(TRAPPED); + CODE(STOPPED); CODE(CONTINUED); +#undef CODE +#define CODE(name) const int SignalCode::POLL::name = POLL_ ## name + CODE(IN); CODE(OUT); CODE(MSG); CODE(ERR); CODE(PRI); CODE(HUP); +#undef CODE +/// @endcond + +/* + * ScopedSignalBlocker + */ + + +/** + * Blocks the given signal. + * @param sig the signal which should be blocked. + */ +ScopedSignalBlocker::ScopedSignalBlocker(Signal sig) +{ + Implementation = new _ScopedSignalBlocker( TransientPushBackFiller< Signal, std::vector >()(sig) ); +} // eo ScopedSignalBlocker::ScopedSignalBlocker + + +ScopedSignalBlocker::ScopedSignalBlocker(Signal sig1, Signal sig2) +{ + Implementation = new _ScopedSignalBlocker( TransientPushBackFiller< Signal, std::vector >()(sig1)(sig2) ); +} // eo ScopedSignalBlocker::ScopedSignalBlocker + + +ScopedSignalBlocker::ScopedSignalBlocker(Signal sig1, Signal sig2, Signal sig3) +{ + Implementation = new _ScopedSignalBlocker( TransientPushBackFiller< Signal, std::vector >()(sig1)(sig2)(sig3) ); +} // eo ScopedSignalBlocker::ScopedSignalBlocker + + +/** + * Blocks the given signals. + * @param sigs vector with the signals which should be blocked. + */ +ScopedSignalBlocker::ScopedSignalBlocker(const std::vector& sigs) +{ + Implementation = new _ScopedSignalBlocker( sigs ); +} // eo ScopedSignalBlocker::ScopedSignalBlocker + + +/** + * Unblocks the signals by restoring the previous blocking list. + */ +ScopedSignalBlocker::~ScopedSignalBlocker() +{ + if (Implementation) + { + delete Implementation; + Implementation= NULL; + } +} // eo ScopedSignalBlocker::ScopedSignalBlocker + + + +/* +** signal handling +*/ + +typedef std::map< int, struct sigaction > SignalActionMap; + +namespace { + +SignalActionMap original_signal_action; + +} // eo namespace + + +/** + * @brief installs a new signal action. + * @param sig the signal + * @param new_action the new signal action. + * @return @a true iff the new signal action was succesfully installed. + * + * Remembers the original value of the signal handler for later restoring. + */ +bool install_signal_handler( + Signal sig, + struct sigaction& new_action +) +{ + struct sigaction old_action[1]; + int signum= sig; + int res= ::sigaction(signum, &new_action, old_action); + if (0 == res) + { + SignalActionMap::iterator it= original_signal_action.find(signum); + if (it == original_signal_action.end()) + { + original_signal_action[signum] = *old_action; + } + } + else if (res > 0) + { + // some glibc's seem to return the errno instead of storing + // it in the appropriate var... *sigh* + errno = res; + } + return (0 == res); +} // eo install_signal_handler(int,sigaction&) + + +/** + * @brief installs a simple signal handler. + * @param sig the signal. + * @param handler pointer to the signal handler. + * @return @a true iff the handler was successfully installed. + * + * Remembers the original value of the signal handler for later restoring. + */ +bool install_signal_handler( + Signal sig, + void(*handler)(int) +) +{ + struct sigaction new_action; + new_action.sa_handler= handler; + sigemptyset( &new_action.sa_mask ); + new_action.sa_flags= 0; + new_action.sa_restorer= NULL; + return install_signal_handler(sig, new_action); +} // eo install_signal_handler(signum,void(*)(int)) + + + +/** + * @brief installs a signal action handler. + * @param sig the signal + * @param handler pointer to the signal action handler. + * @return @a true iff the action handler was successfully installed. + * + * Remembers the original value of the signal handler for later restoring. + */ +bool install_signal_handler( + Signal sig, + void(*handler)(int,struct siginfo*,void*) +) +{ + struct sigaction new_action; + new_action.sa_sigaction= handler; + sigemptyset( &new_action.sa_mask ); + new_action.sa_flags= SA_SIGINFO; + new_action.sa_restorer= NULL; + return install_signal_handler(sig, new_action); +} // eo install_signal_handler(signum,void(*)(int,siginfo_t*,void*)) + + +/** + * @brief ignores a signal. + * @param sig the signal + * @return @a true iff the ignore handler was successfully installed. + * + * Remembers the original value of the signal handler for later restoring. + */ +bool ignore_signal(Signal sig) +{ + return install_signal_handler(sig, SIG_IGN ); +} // eo ignore_signal(Signal) + + +/** + * @brief enables the default signal handler. + * @param sig the signal + * @return @a true iff the default handler was successfully installed. + * + * Remembers the original value of the signal handler for later restoring. + */ +bool install_default_signal_handler(Signal sig) +{ + return install_signal_handler(sig, SIG_DFL ); +} // eo install_default_signal_handler(Signal) + + +/** + * @brief restores a signal handle to its original value. + * @param sig the signal. + * @return @a true iff the handler was sucessfully restored. + */ +bool restore_signal_handler(Signal sig) +{ + int signum= sig; + SignalActionMap::iterator it= original_signal_action.find(signum); + int res= -1; + if (it != original_signal_action.end()) + { + res= ::sigaction(signum, &(it->second), NULL); + if (0 == res) + { + original_signal_action.erase(it); + } + } + return (0 == res); +} // eo restore_signal_handler + + + +/** + * @brief convenience function; send's a signal to a process. + * @param pid PID of the process which should recive the signal. + * @param signal the signal to send. + * @return @a true iff sending of the signal succeeded. + */ +bool send_signal( pid_t pid, Signal signal) +{ + return ::kill(pid, signal.Value) == 0; +} // eo send_signal(pid_t,Signal) + + + +} // eo namespace SystemTools +} // eo namespace I2n diff --git a/utils/signalfunc.hpp b/utils/signalfunc.hpp new file mode 100644 index 0000000..00ebd2c --- /dev/null +++ b/utils/signalfunc.hpp @@ -0,0 +1,263 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ +/** @file + * @brief provides wrapper and tools for signal related stuff. + * + * + * @copyright © Copyright 2007-2008 by Intra2net AG + * @contact opensource@intra2net.com + * + * @bug + * Although most stuff should work under most POSIX like systems; + * some funcs might be very linux related. + * (But at least we use that lib currently under linux only.) + */ + +#ifndef _I2N_SIGNALFUNC_HPP_ +#define _I2N_SIGNALFUNC_HPP_ + +#include + +// with pain in the stomach; the following include was added....: +// (since these includes a lot of #define's... what we usually don't want to have in C++ headers...) +#include + +extern "C" +{ + +struct siginfo; + +} + + +namespace I2n +{ +namespace SystemTools +{ + + +namespace Detail +{ + +/** + * base class for internal implementation classes. + */ +class SObject +{ + public: + virtual ~SObject() {} +}; // eo class SObject + +} // eo namespace Detail + +/** + * @brief representation of system signal. + * + * This struct also provides constants for the usual system signals; so it is not necessary to include signal.h + * for obtaining the constants. + * + * Due to an appropriate cast operator instances of the class can be used in all places where + * a plain signal (i.e. an int) is expected. + */ +struct Signal +{ + static const int VOID; +/// @cond + +#define SIG(s) static const int s + SIG(HUP); SIG(INT); SIG(QUIT); SIG(ILL); SIG(TRAP); + SIG(ABRT); SIG(IOT); SIG(BUS); SIG(FPE); SIG(KILL); + SIG(USR1); SIG(SEGV); SIG(USR2); SIG(PIPE); SIG(ALRM); + SIG(TERM); SIG(STKFLT); SIG(CLD); SIG(CHLD); SIG(CONT); SIG(STOP); + SIG(TSTP); SIG(TTIN); SIG(TTOU); SIG(URG); SIG(XCPU); + SIG(XFSZ); SIG(VTALRM); SIG(PROF); SIG(WINCH); SIG(POLL); + SIG(IO); SIG(PWR); SIG(SYS); +#undef SIG + +/// @endcond + + static int RT(int num=0); + + int Value; + + Signal(int signal) : Value(signal) {} + + operator int () const { return Value; } +}; // eo struct Signal + + +/** + * @brief representation of signal codes. + * + * This struct provides constants for signal codes; so it is not necessary to include signal.h + * for obtaining the constants. + * + * Due to an appropriate cast operator instances of the class can be used in all places where + * a plain signal code (i.e. an int) is expected. + */ +struct SignalCode +{ + + +/// @cond +#define CODE(name) static const int name + CODE(USER); CODE(QUEUE); CODE(TIMER); CODE(MESGQ); + CODE(ASYNCIO); +#undef SIGIO + CODE(SIGIO); +/// @endcond + + /** + * @brief contains the codes for signal SIGILL + */ + struct ILL + { + /// @cond + CODE(ILLOPC); CODE(ILLOPN); CODE(ILLADR); CODE(ILLTRP); + CODE(PRVOPC); CODE(PRVREG); CODE(COPROC); CODE(BADSTK); + /// @endcond + }; // eo struct ILL; + + + /** + * @brief contains the codes for signal SIGFPE + */ + struct FPE + { + /// @cond + CODE(INTDIV); CODE(INTOVF); CODE(FLTDIV); CODE(FLTOVF); + CODE(FLTUND); CODE(FLTRES); CODE(FLTINV); CODE(FLTSUB); + /// @endcond + }; // eo struct FPE + + + /** + * @brief contains the codes for signal SIGSEGV + */ + struct SEGV + { + /// @cond + CODE(MAPERR); CODE(ACCERR); + /// @endcond + }; // eo struct SEGV + + + /** + * @brief contains the codes for signal SIGBUS + */ + struct BUS + { + /// @cond + CODE(ADRALN); CODE(ADRERR); CODE(OBJERR); + /// @endcond + }; // eo struct BUS + + + /** + * @brief contains the codes for signal SIGTRAP + */ + struct TRAP + { + /// @cond + CODE(BRKPT); CODE(TRACE); + /// @endcond + }; // eo struct TRAP + + + /** + * @brief contains the codes for signal SIGCHLD + */ + struct CHLD + { + /// @cond + CODE(EXITED); CODE(KILLED); CODE(DUMPED); CODE(TRAPPED); + CODE(STOPPED); CODE(CONTINUED); + /// @endcond + }; // eo struct CHLD + + + /** + * @brief contains the codes for signal SIGPOLL + */ + struct POLL + { + /// @cond + CODE(IN); CODE(OUT); CODE(MSG); CODE(ERR); CODE(PRI); CODE(HUP); + /// @endcond + }; // eo strcut POLL + +#undef CODE + + int TheCode; + + SignalCode(int code) : TheCode(code) {} + + operator int () const { return TheCode; } +}; // eo SignalCode + + + + +/** + * @brief helper for blocking a (or some) signal(s) during an operation. + * + * This class blocks the given signals when constructed and resets the original block mask + * when destructed. + */ +class ScopedSignalBlocker +{ + public: + ScopedSignalBlocker(Signal sig); + ScopedSignalBlocker(Signal sig1, Signal sig2); + ScopedSignalBlocker(Signal sig1, Signal sig2, Signal sig3); + ScopedSignalBlocker(const std::vector& sigs); + virtual ~ScopedSignalBlocker(); + + private: + Detail::SObject* Implementation; + +}; // eo class ScopedSignalBlocker + + + + +bool install_signal_handler( + Signal sig, + void(*handler)(int) +); + +bool install_signal_handler( + Signal sig, + void(*handler)(int,struct siginfo*,void*) +); + +bool ignore_signal(Signal sig); +bool install_default_signal_handler(Signal sig); + +bool restore_signal_handler(Signal sig); + + +bool send_signal( pid_t pid, Signal signal); + + +} // eo namespace SysTools +} // eo namespace I2n + +#endif -- 1.7.1