(file) Return to Signal.h CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Signal.h between version 1.12 and 1.29

version 1.12, 2003/04/25 01:02:47 version 1.29, 2008/12/02 09:00:52
Line 1 
Line 1 
 //%/////////////////////////////////////////////////////////////////////////////  //%LICENSE////////////////////////////////////////////////////////////////
 //  
 // Copyright (c) 2000, 2001, 2002 BMC Software, Hewlett-Packard Company, IBM,  
 // The Open Group, Tivoli Systems  
 //  
 // Permission is hereby granted, free of charge, to any person obtaining a copy  
 // of this software and associated documentation files (the "Software"), to  
 // deal in the Software without restriction, including without limitation the  
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  
 // sell copies of the Software, and to permit persons to whom the Software is  
 // furnished to do so, subject to the following conditions:  
 //  
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 // //
 //==============================================================================  // Licensed to The Open Group (TOG) under one or more contributor license
   // agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
   // this work for additional information regarding copyright ownership.
   // Each contributor licenses this file to you under the OpenPegasus Open
   // Source License; you may not use this file except in compliance with the
   // License.
   //
   // Permission is hereby granted, free of charge, to any person obtaining a
   // copy of this software and associated documentation files (the "Software"),
   // to deal in the Software without restriction, including without limitation
   // the rights to use, copy, modify, merge, publish, distribute, sublicense,
   // and/or sell copies of the Software, and to permit persons to whom the
   // Software is furnished to do so, subject to the following conditions:
   //
   // The above copyright notice and this permission notice shall be included
   // in all copies or substantial portions of the Software.
   //
   // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // //
 // Author: Markus Mueller (markus_mueller@de.ibm.com)  //////////////////////////////////////////////////////////////////////////
 //  
 // Modified By: Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)  
 //            : Yi Zhou, Hewlett-Packard Company (yi_zhou@hp.com)  
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 32 
Line 33 
 #define Pegasus_Signal_h #define Pegasus_Signal_h
  
 #include <Pegasus/Common/Linkage.h> #include <Pegasus/Common/Linkage.h>
 #include <Pegasus/Common/IPC.h>  #include <Pegasus/Common/Mutex.h>
   
 // // Ensure Unix 98  
 // #ifdef PEGASUS_PLATFORM_LINUX_IX86_GNU  
 //    #ifndef _GNU_SOURCE  
 //       #define _GNU_SOURCE  
 //    #endif  
 // #else  
 //    #ifdef _XOPEN_SOURCE  
 //       #undef _XOPEN_SOURCE  
 //    #endif  
 //    #define _XOPEN_SOURCE 600  
 // #endif  
  
 #ifdef PEGASUS_HAS_SIGNALS #ifdef PEGASUS_HAS_SIGNALS
  
Line 53 
Line 42 
 # define PEGASUS_SIGHUP   SIGHUP # define PEGASUS_SIGHUP   SIGHUP
 # define PEGASUS_SIGABRT  SIGABRT # define PEGASUS_SIGABRT  SIGABRT
 # define PEGASUS_SIGPIPE  SIGPIPE # define PEGASUS_SIGPIPE  SIGPIPE
   # define PEGASUS_SIGTERM   SIGTERM
 # define PEGASUS_SIGUSR1  SIGUSR1 # define PEGASUS_SIGUSR1  SIGUSR1
   # define PEGASUS_SIGCHLD   SIGCHLD
   # define PEGASUS_SIGDANGER SIGDANGER
  
 #else // PEGASUS_HAS_SIGNALS #else // PEGASUS_HAS_SIGNALS
  
Line 61 
Line 53 
 # define PEGASUS_SIGHUP   1 # define PEGASUS_SIGHUP   1
 # define PEGASUS_SIGABRT  11 # define PEGASUS_SIGABRT  11
 # define PEGASUS_SIGPIPE  13 # define PEGASUS_SIGPIPE  13
   # define PEGASUS_SIGTERM   15
 # define PEGASUS_SIGUSR1  16 # define PEGASUS_SIGUSR1  16
   # define PEGASUS_SIGCHLD   18
   # define PEGASUS_SIGDANGER 33
  
 #endif // PEGASUS_HAS_SIGNALS #endif // PEGASUS_HAS_SIGNALS
  
  
 #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)  
 extern "C" { extern "C" {
 #endif  
   
 typedef void (* signal_handler)(int, PEGASUS_SIGINFO_T *, void *); typedef void (* signal_handler)(int, PEGASUS_SIGINFO_T *, void *);
   
 #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)  
 } }
 #endif  
   
 // Sample signal handler for SIGABRT that stops the failing thread normally  
 void sig_act(int s_n, PEGASUS_SIGINFO_T * s_info, void * sig);  
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
Line 90 
Line 76 
  
       // these functions should throw exceptions       // these functions should throw exceptions
  
       void registerHandler(Uint32 signum, signal_handler _sighandler);      /**
           Registers a signal handler.
       void activate(Uint32 signum);          @param signum The signal number for which to register the handler.
           @sighandler The signal handler to register
       //void activateAll();          @exception IndexOutOfBoundsException if signum is outside the range
               of signals supported by the SignalHandler (see PEGASUS_NSIG).
       void deactivate(Uint32 signum);      */
       void registerHandler(unsigned signum, signal_handler sighandler);
   
       /**
           Activates a signal handler.
           @param signum The signal number for which to activate the handler.
           @exception IndexOutOfBoundsException if signum is outside the range
               of signals supported by the SignalHandler (see PEGASUS_NSIG).
       */
       void activate(unsigned signum);
   
       /**
           Deactivates a signal handler.
           @param signum The signal number for which to deactivate the handler.
           @exception IndexOutOfBoundsException if signum is outside the range
               of signals supported by the SignalHandler (see PEGASUS_NSIG).
       */
       void deactivate(unsigned signum);
  
       void deactivateAll();       void deactivateAll();
  
       static void ignore(Uint32 signum);      /**
           Sets a signal action to "ignore".
           @param signum The signal number to ignore.
           @exception IndexOutOfBoundsException if signum is outside the range
               of signals supported by the SignalHandler (see PEGASUS_NSIG).
       */
       static void ignore(unsigned signum);
   
       /**
           Resets a signal action to its default.
           @param signum The signal number for which to reset the signal action.
           @exception IndexOutOfBoundsException if signum is outside the range
               of signals supported by the SignalHandler (see PEGASUS_NSIG).
       */
       static void defaultAction(unsigned signum);
  
    private:    private:
  
 #ifdef PEGASUS_HAS_SIGNALS #ifdef PEGASUS_HAS_SIGNALS
       enum
       {
           PEGASUS_NSIG = 33
       };
   
       static void verifySignum(unsigned signum);
   
       typedef struct {       typedef struct {
           int signum;
           int active;           int active;
           signal_handler sh;           signal_handler sh;
           struct sigaction oldsa;           struct sigaction oldsa;
       } register_handler;       } register_handler;
  
       register_handler reg_handler[32];      register_handler reg_handler[PEGASUS_NSIG + 1];
       Mutex reg_mutex;       Mutex reg_mutex;
  
       void deactivate_i(Uint32 signum);      void deactivate_i(register_handler &rh);
   
       register_handler &getHandler(unsigned sigum);
 #endif #endif
  
 }; };


Legend:
Removed from v.1.12  
changed lines
  Added in v.1.29

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2