diff options
Diffstat (limited to 'ace/Signal.h')
| -rw-r--r-- | ace/Signal.h | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/ace/Signal.h b/ace/Signal.h index 576f80f2a70..45bddf2c22f 100644 --- a/ace/Signal.h +++ b/ace/Signal.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -32,6 +32,8 @@ // Type of the extended signal handler. typedef void (*ACE_Sig_Handler_Ex) (int, siginfo_t *siginfo, ucontext_t *ucontext); +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class ACE_Sig_Set * @@ -264,11 +266,11 @@ private: * objects to handle signals in a way that avoids the use of * global/static variables and functions. * - * Using this class a program can register an <ACE_Event_Handler> - * with the <ACE_Sig_Handler> in order to handle a designated + * Using this class a program can register an ACE_Event_Handler + * with the ACE_Sig_Handler in order to handle a designated * <signum>. When a signal occurs that corresponds to this * <signum>, the <handle_signal> method of the registered - * <ACE_Event_Handler> is invoked automatically. + * ACE_Event_Handler is invoked automatically. */ class ACE_Export ACE_Sig_Handler { @@ -279,8 +281,8 @@ public: // = Registration and removal methods. /** - * Add a new <ACE_Event_Handler> and a new sigaction associated with - * <signum>. Passes back the existing <ACE_Event_Handler> and its + * Add a new ACE_Event_Handler and a new sigaction associated with + * <signum>. Passes back the existing ACE_Event_Handler and its * sigaction if pointers are non-zero. Returns -1 on failure and >= * 0 on success. */ @@ -291,7 +293,7 @@ public: ACE_Sig_Action *old_disp = 0); /** - * Remove the <ACE_Event_Handler> currently associated with + * Remove the ACE_Event_Handler currently associated with * <signum>. <sigkey> is ignored in this implementation since there * is only one instance of a signal handler. Install the new * disposition (if given) and return the previous disposition (if @@ -312,10 +314,10 @@ public: // = Set/get the handler associated with a particular signal. - /// Return the <ACE_Sig_Handler> associated with <signum>. + /// Return the ACE_Sig_Handler associated with <signum>. virtual ACE_Event_Handler *handler (int signum); - /// Set a new <ACE_Event_Handler> that is associated with <signum>. + /// Set a new ACE_Event_Handler that is associated with <signum>. /// Return the existing handler. virtual ACE_Event_Handler *handler (int signum, ACE_Event_Handler *); @@ -338,7 +340,7 @@ protected: // = These methods and data members are shared by derived classes. /** - * Set a new <ACE_Event_Handler> that is associated with <signum>. + * Set a new ACE_Event_Handler that is associated with <signum>. * Return the existing handler. Does not acquire any locks so that * it can be called from a signal handler, such as <dispatch>. */ @@ -349,8 +351,8 @@ protected: * This implementation method is called by <register_handler> and * <dispatch>. It doesn't do any locking so that it can be called * within a signal handler, such as <dispatch>. It adds a new - * <ACE_Event_Handler> and a new sigaction associated with <signum>. - * Passes back the existing <ACE_Event_Handler> and its sigaction if + * ACE_Event_Handler and a new sigaction associated with <signum>. + * Passes back the existing ACE_Event_Handler and its sigaction if * pointers are non-zero. Returns -1 on failure and >= 0 on * success. */ @@ -376,7 +378,7 @@ private: * @class ACE_Sig_Adapter * * @brief Provide an adapter that transforms various types of signal - * handlers into the scheme used by the <ACE_Reactor>. + * handlers into the scheme used by the ACE_Reactor. */ class ACE_Export ACE_Sig_Adapter : public ACE_Event_Handler { @@ -387,7 +389,7 @@ public: ~ACE_Sig_Adapter (void); /// Returns this signal key that's used to remove this from the - /// <ACE_Reactor>'s internal table. + /// ACE_Reactor's internal table. int sigkey (void); /// Called by the <Reactor> to dispatch the signal handler. @@ -452,7 +454,7 @@ public: ACE_Sig_Action *old_disp = 0); /** - * Remove an <ACE_Event_Handler> currently associated with <signum>. + * Remove an ACE_Event_Handler currently associated with <signum>. * We remove the handler if (1) its <sigkey> matches the <sigkey> * passed as a parameter or (2) if we've been told to remove all the * handlers, i.e., <sigkey> == -1. If a new disposition is given it @@ -467,12 +469,12 @@ public: // = Set/get the handler associated with a particular signal. - /// Return the head of the list of <ACE_Sig_Handler>s associated with + /// Return the head of the list of ACE_Sig_Handlers associated with /// SIGNUM. virtual ACE_Event_Handler *handler (int signum); /** - * Set a new <ACE_Event_Handler> that is associated with SIGNUM at + * Set a new ACE_Event_Handler that is associated with SIGNUM at * the head of the list of signals. Return the existing handler * that was at the head. */ @@ -506,16 +508,7 @@ private: }; #endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ -#if defined (ACE_HAS_SIG_C_FUNC) -extern "C" void -ace_sig_handler_dispatch (int signum, siginfo_t *info, ucontext_t *context); - -#if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) -extern "C" void -ace_sig_handlers_dispatch (int signum, siginfo_t *info, ucontext_t *context); -#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ - -#endif /* ACE_HAS_SIG_C_FUNC */ +ACE_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "ace/Signal.inl" |