diff options
Diffstat (limited to 'ACE')
61 files changed, 144 insertions, 325 deletions
diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp index 70110b42acc..bb5b9e3432b 100644 --- a/ACE/ace/Configuration.cpp +++ b/ACE/ace/Configuration.cpp @@ -114,7 +114,6 @@ ACE_Configuration::expand_path (const ACE_Configuration_Section_Key& key, } return 0; - } int @@ -1098,11 +1097,6 @@ ACE_Configuration_Value_IntId::free (ACE_Allocator *alloc) // Do nothing in other cases... } -ACE_Configuration_ExtId::ACE_Configuration_ExtId () - : name_ (0) -{ -} - ACE_Configuration_ExtId::ACE_Configuration_ExtId (const ACE_TCHAR* name) : name_ (name) { @@ -1113,10 +1107,6 @@ ACE_Configuration_ExtId::ACE_Configuration_ExtId (const ACE_Configuration_ExtId& { } -ACE_Configuration_ExtId::~ACE_Configuration_ExtId () -{ -} - ACE_Configuration_ExtId& ACE_Configuration_ExtId::operator= (const ACE_Configuration_ExtId& rhs) { if (this != &rhs) @@ -1521,8 +1511,7 @@ ACE_Configuration_Heap::open_section (const ACE_Configuration_Section_Key& base, ) { ACE_TString simple_section (sub_section, separator - sub_section); - int ret_val = - open_simple_section (result, simple_section.c_str (), create, result); + int const ret_val = open_simple_section (result, simple_section.c_str (), create, result); if (ret_val) return ret_val; sub_section = separator + 1; diff --git a/ACE/ace/Configuration.h b/ACE/ace/Configuration.h index 175e26cf7b6..76ef66f2cd7 100644 --- a/ACE/ace/Configuration.h +++ b/ACE/ace/Configuration.h @@ -426,7 +426,7 @@ public: protected: /// Destructor - invokes <RegCloseKey> - virtual ~ACE_Section_Key_Win32 (void); + virtual ~ACE_Section_Key_Win32 (); // Not used ACE_Section_Key_Win32 (const ACE_Section_Key_Win32& rhs); @@ -454,7 +454,7 @@ public: u_long security_access = KEY_ALL_ACCESS); /// Destructor - virtual ~ACE_Configuration_Win32Registry (void); + virtual ~ACE_Configuration_Win32Registry (); virtual int open_section (const ACE_Configuration_Section_Key& base, const ACE_TCHAR* sub_section, @@ -557,7 +557,7 @@ class ACE_Export ACE_Configuration_ExtId { public: /// Defeault ctor - ACE_Configuration_ExtId (void); + ACE_Configuration_ExtId () = default; /// Named constructor explicit ACE_Configuration_ExtId (const ACE_TCHAR* name); @@ -566,7 +566,7 @@ public: ACE_Configuration_ExtId (const ACE_Configuration_ExtId& rhs); /// destructor - ~ACE_Configuration_ExtId (void); + ~ACE_Configuration_ExtId () = default; /// Assignment operator ACE_Configuration_ExtId& operator= (const ACE_Configuration_ExtId& rhs); @@ -586,11 +586,10 @@ public: u_long hash () const; // = Data members. - - const ACE_TCHAR * name_; + const ACE_TCHAR * name_ {}; // Accessors - const ACE_TCHAR *name (void); + const ACE_TCHAR *name (); }; typedef ACE_Hash_Map_With_Allocator<ACE_Configuration_ExtId, int> diff --git a/ACE/ace/POSIX_CB_Proactor.cpp b/ACE/ace/POSIX_CB_Proactor.cpp index 77b2e406268..ef58e76d5ae 100644 --- a/ACE/ace/POSIX_CB_Proactor.cpp +++ b/ACE/ace/POSIX_CB_Proactor.cpp @@ -73,7 +73,7 @@ ACE_POSIX_CB_Proactor::notify_completion (int sig_num) ssize_t ACE_POSIX_CB_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) { - ssize_t slot = ACE_POSIX_AIOCB_Proactor::allocate_aio_slot (result); + ssize_t const slot = ACE_POSIX_AIOCB_Proactor::allocate_aio_slot (result); if (slot == -1) return -1; @@ -83,8 +83,7 @@ ACE_POSIX_CB_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) // the proactor, but the aiocb as well. result->aio_sigevent.sigev_notify = SIGEV_THREAD; # if defined (ACE_HAS_SIG_C_FUNC) - result->aio_sigevent.sigev_notify_function = - ACE_POSIX_CB_Proactor_aio_completion; + result->aio_sigevent.sigev_notify_function = ACE_POSIX_CB_Proactor_aio_completion; # else result->aio_sigevent.sigev_notify_function = aio_completion_func; # endif /* ACE_HAS_SIG_C_FUNC */ diff --git a/ACE/ace/POSIX_CB_Proactor.h b/ACE/ace/POSIX_CB_Proactor.h index e38360f5f9f..9aa8221c43b 100644 --- a/ACE/ace/POSIX_CB_Proactor.h +++ b/ACE/ace/POSIX_CB_Proactor.h @@ -22,26 +22,22 @@ #include "ace/Synch_Traits.h" #include "ace/Thread_Semaphore.h" #include "ace/Null_Semaphore.h" - #include "ace/POSIX_Proactor.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class ACE_POSIX_CB_Proactor * * @brief Implementation of Callback-based Proactor - * }; */ class ACE_Export ACE_POSIX_CB_Proactor : public ACE_POSIX_AIOCB_Proactor { - public: - virtual Proactor_Type get_impl_type (void); + virtual Proactor_Type get_impl_type (); /// Destructor. - virtual ~ACE_POSIX_CB_Proactor (void); + virtual ~ACE_POSIX_CB_Proactor (); /// Constructor defines max number asynchronous operations that can /// be started at the same time. @@ -52,7 +48,6 @@ public: static void aio_completion_func (sigval cb_data); protected: - /** * Dispatch a single set of events. If @a wait_time elapses before * any events occur, return 0. Return 1 on success i.e., when a @@ -68,7 +63,7 @@ protected: * completion is dispatched, non-zero (-1) on errors and errno is * set accordingly. */ - virtual int handle_events (void); + virtual int handle_events (); /// Find free slot to store result and aiocb pointer virtual ssize_t allocate_aio_slot (ACE_POSIX_Asynch_Result *result); diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp index cc3a25d2636..d75e5458815 100644 --- a/ACE/ace/Process.cpp +++ b/ACE/ace/Process.cpp @@ -32,8 +32,7 @@ // to do anything with the signal - it's just needed to interrupt a sleep. // See wait() for more info. #if !defined (ACE_WIN32) && !defined(ACE_LACKS_UNIX_SIGNALS) -static void -sigchld_nop (int, siginfo_t *, ucontext_t *) +static void sigchld_nop (int, siginfo_t *, ucontext_t *) { return; } diff --git a/ACE/ace/Process_Manager.cpp b/ACE/ace/Process_Manager.cpp index 6990ba40eec..fa2e5cefec5 100644 --- a/ACE/ace/Process_Manager.cpp +++ b/ACE/ace/Process_Manager.cpp @@ -333,9 +333,7 @@ ACE_Process_Manager::handle_close (ACE_HANDLE /* handle */, // On Win32, this routine is called synchronously, and is passed the // HANDLE of the Process that exited, so we can do all our work here. int -ACE_Process_Manager::handle_signal (int, - siginfo_t *si, - ucontext_t *) +ACE_Process_Manager::handle_signal (int, siginfo_t *si, ucontext_t *) { #if defined (ACE_WIN32) ACE_HANDLE proc = si->si_handle_; diff --git a/ACE/ace/Process_Manager.h b/ACE/ace/Process_Manager.h index 90fc88d5472..b3491ff090e 100644 --- a/ACE/ace/Process_Manager.h +++ b/ACE/ace/Process_Manager.h @@ -389,12 +389,9 @@ protected: * On Win32, this routine is called synchronously, and is passed the * HANDLE of the Process that exited, so we can do all our work here */ - virtual int handle_signal (int signum, - siginfo_t * = 0, - ucontext_t * = 0); + virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); private: - /** * @struct Process_Descriptor * diff --git a/ACE/ace/SPIPE_Addr.cpp b/ACE/ace/SPIPE_Addr.cpp index 81240d557eb..e0c6e681cf9 100644 --- a/ACE/ace/SPIPE_Addr.cpp +++ b/ACE/ace/SPIPE_Addr.cpp @@ -27,16 +27,13 @@ ACE_SPIPE_Addr::set_addr (const void *addr, int len) } // Return the address. - void * ACE_SPIPE_Addr::get_addr () const { return (void *) &this->SPIPE_addr_; } - // Do nothing constructor. - ACE_SPIPE_Addr::ACE_SPIPE_Addr () : ACE_Addr (AF_SPIPE, sizeof this->SPIPE_addr_) { @@ -55,7 +52,6 @@ ACE_SPIPE_Addr::addr_to_string (ACE_TCHAR *s, size_t len) const } // Transform the string into the current addressing format. - int ACE_SPIPE_Addr::string_to_addr (const ACE_TCHAR *addr) { @@ -79,7 +75,6 @@ ACE_SPIPE_Addr::set (const ACE_SPIPE_Addr &sa) } // Copy constructor. - ACE_SPIPE_Addr::ACE_SPIPE_Addr (const ACE_SPIPE_Addr &sa) : ACE_Addr (AF_SPIPE, sizeof this->SPIPE_addr_) { @@ -147,7 +142,6 @@ ACE_SPIPE_Addr::set (const ACE_TCHAR *addr, } // Create a ACE_Addr from a ACE_SPIPE pathname. - ACE_SPIPE_Addr::ACE_SPIPE_Addr (const ACE_TCHAR *addr, gid_t gid, uid_t uid) diff --git a/ACE/ace/SPIPE_Addr.inl b/ACE/ace/SPIPE_Addr.inl index be00866dc80..53041a4a090 100644 --- a/ACE/ace/SPIPE_Addr.inl +++ b/ACE/ace/SPIPE_Addr.inl @@ -8,15 +8,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE bool ACE_SPIPE_Addr::operator == (const ACE_SPIPE_Addr &sap) const { - return ACE_OS::strcmp (this->SPIPE_addr_.rendezvous_, - sap.SPIPE_addr_.rendezvous_) == 0; + return ACE_OS::strcmp (this->SPIPE_addr_.rendezvous_, sap.SPIPE_addr_.rendezvous_) == 0; } // Compare two addresses for inequality. ACE_INLINE bool ACE_SPIPE_Addr::operator != (const ACE_SPIPE_Addr &sap) const { - return !((*this) == sap); // This is lazy, of course... ;-) + return !((*this) == sap); } // Return the path name used for the rendezvous point. diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp index 54b48c37a1a..f88ef610fe4 100644 --- a/ACE/ace/Service_Config.cpp +++ b/ACE/ace/Service_Config.cpp @@ -513,9 +513,7 @@ ACE_Service_Config::create_service_type_impl (const ACE_TCHAR *name, // Signal handling API to trigger dynamic reconfiguration. void -ACE_Service_Config::handle_signal (int sig, - siginfo_t *, - ucontext_t *) +ACE_Service_Config::handle_signal (int sig, siginfo_t *, ucontext_t *) { #if defined (ACE_NDEBUG) ACE_UNUSED_ARG (sig); diff --git a/ACE/ace/Sig_Adapter.cpp b/ACE/ace/Sig_Adapter.cpp index 2010f8a3e0a..c6722b21a7c 100644 --- a/ACE/ace/Sig_Adapter.cpp +++ b/ACE/ace/Sig_Adapter.cpp @@ -4,49 +4,36 @@ ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Sig_Action &sa, int sigkey) : sigkey_ (sigkey), type_ (SIG_ACTION), sa_ (sa), - eh_ (0), - sig_func_ (0) + sig_func_ (nullptr) { - // ACE_TRACE ("ACE_Sig_Adapter::ACE_Sig_Adapter"); } -ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Event_Handler *eh, - int sigkey) +ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Event_Handler *eh, int sigkey) : sigkey_ (sigkey), type_ (ACE_HANDLER), eh_ (eh), - sig_func_ (0) + sig_func_ (nullptr) { - // ACE_TRACE ("ACE_Sig_Adapter::ACE_Sig_Adapter"); } -ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Sig_Handler_Ex sig_func, - int sigkey) +ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Sig_Handler_Ex sig_func, int sigkey) : sigkey_ (sigkey), type_ (C_FUNCTION), - eh_ (0), sig_func_ (sig_func) { - // ACE_TRACE ("ACE_Sig_Adapter::ACE_Sig_Adapter"); -} - -ACE_Sig_Adapter::~ACE_Sig_Adapter () -{ } ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Adapter) int -ACE_Sig_Adapter::sigkey () +ACE_Sig_Adapter::sigkey () const { ACE_TRACE ("ACE_Sig_Adapter::sigkey"); return this->sigkey_; } int -ACE_Sig_Adapter::handle_signal (int signum, - siginfo_t *siginfo, - ucontext_t *ucontext) +ACE_Sig_Adapter::handle_signal (int signum, siginfo_t *siginfo, ucontext_t *ucontext) { ACE_TRACE ("ACE_Sig_Adapter::handle_signal"); @@ -56,7 +43,6 @@ ACE_Sig_Adapter::handle_signal (int signum, { // We have to dispatch a handler that was registered by a // third-party library. - ACE_Sig_Action old_disp; // Make sure this handler executes in the context it was diff --git a/ACE/ace/Sig_Adapter.h b/ACE/ace/Sig_Adapter.h index bb0f791a07c..0142f2e6795 100644 --- a/ACE/ace/Sig_Adapter.h +++ b/ACE/ace/Sig_Adapter.h @@ -36,20 +36,20 @@ public: ACE_Sig_Adapter (ACE_Sig_Action &, int sigkey); ACE_Sig_Adapter (ACE_Event_Handler *, int sigkey); ACE_Sig_Adapter (ACE_Sig_Handler_Ex, int sigkey = 0); - ~ACE_Sig_Adapter (void); + ~ACE_Sig_Adapter () override = default; /// Returns this signal key that's used to remove this from the /// ACE_Reactor's internal table. - int sigkey (void); + int sigkey () const; - /// Called by the <Reactor> to dispatch the signal handler. - virtual int handle_signal (int, siginfo_t *, ucontext_t *); + /// Called by the ACE_Reactor to dispatch the signal handler. + int handle_signal (int, siginfo_t *, ucontext_t *) override; ACE_ALLOC_HOOK_DECLARE; private: /// Key for this signal handler (used to remove it). - int sigkey_; + int const sigkey_; /// Is this an external handler or an ACE handler? enum @@ -68,7 +68,7 @@ private: ACE_Sig_Action sa_; /// This is an ACE hander. - ACE_Event_Handler *eh_; + ACE_Event_Handler *eh_ {}; /// This is a normal C function. ACE_Sig_Handler_Ex sig_func_; diff --git a/ACE/ace/Sig_Handler.cpp b/ACE/ace/Sig_Handler.cpp index 9b6e4a8e272..3fb63c52ffc 100644 --- a/ACE/ace/Sig_Handler.cpp +++ b/ACE/ace/Sig_Handler.cpp @@ -146,12 +146,12 @@ ACE_Sig_Handler::register_handler_i (int signum, ACE_Sig_Action sa; // Define a "null" action. ACE_Event_Handler *sh = ACE_Sig_Handler::handler_i (signum, new_sh); - // Return a pointer to the old <ACE_Sig_Handler> if the user + // Return a pointer to the old ACE_Event_Handler if the user // asks for this. if (old_sh != 0) *old_sh = sh; - // Make sure that <new_disp> points to a valid location if the + // Make sure that @a new_disp points to a valid location if the // user doesn't care... if (new_disp == 0) new_disp = &sa; @@ -236,9 +236,7 @@ ACE_Sig_Handler::remove_handler (int signum, /// Master dispatcher function that gets called by a signal handler and /// dispatches one handler... void -ACE_Sig_Handler::dispatch (int signum, - siginfo_t *siginfo, - ucontext_t *ucontext) +ACE_Sig_Handler::dispatch (int signum, siginfo_t *siginfo, ucontext_t *ucontext) { ACE_TRACE ("ACE_Sig_Handler::dispatch"); @@ -346,8 +344,8 @@ ACE_Sig_Handlers::register_handler (int signum, if (ACE_Sig_Handler::in_range (signum)) { - ACE_Sig_Adapter *ace_sig_adapter = 0; // Our signal handler. - ACE_Sig_Adapter *extern_sh = 0; // An external signal handler. + ACE_Sig_Adapter *ace_sig_adapter = nullptr; // Our signal handler. + ACE_Sig_Adapter *extern_sh = nullptr; // An external signal handler. ACE_Sig_Action sa; // Get current signal disposition. @@ -355,7 +353,6 @@ ACE_Sig_Handlers::register_handler (int signum, // Check whether we are already in control of the signal // handling disposition... - if (!(sa.handler () == ace_signal_handlers_dispatcher || sa.handler () == ACE_SignalHandler (SIG_IGN) || sa.handler () == ACE_SignalHandler (SIG_DFL))) @@ -364,7 +361,6 @@ ACE_Sig_Handlers::register_handler (int signum, // Upto here we never disabled RESTART_MODE. Thus, // RESTART_MODE can only be changed by 3rd party libraries. - if (ACE_BIT_DISABLED (sa.flags (), SA_RESTART) && ACE_Sig_Handlers::third_party_sig_handler_) // Toggling is disallowed since we might break 3rd party @@ -397,7 +393,7 @@ ACE_Sig_Handlers::register_handler (int signum, // Add the ACE signal handler to the set of handlers for this // signal (make sure it goes before the external one if there is // one of these). - int result = ACE_Sig_Handlers_Set::instance (signum)->insert (ace_sig_adapter); + int const result = ACE_Sig_Handlers_Set::instance (signum)->insert (ace_sig_adapter); if (result == -1) { @@ -516,9 +512,7 @@ ACE_Sig_Handlers::remove_handler (int signum, /// Master dispatcher function that gets called by a signal handler and /// dispatches *all* the handlers... void -ACE_Sig_Handlers::dispatch (int signum, - siginfo_t *siginfo, - ucontext_t *ucontext) +ACE_Sig_Handlers::dispatch (int signum, siginfo_t *siginfo, ucontext_t *ucontext) { ACE_TRACE ("ACE_Sig_Handlers::dispatch"); // The following is #ifdef'd out because it's entirely non-portable @@ -580,7 +574,7 @@ ACE_Sig_Handlers::handler (int signum, ACE_Event_Handler *new_sh) ACE_SIG_HANDLERS_SET *handler_set = ACE_Sig_Handlers_Set::instance (signum); ACE_SIG_HANDLERS_ITERATOR handler_iterator (*handler_set); - ACE_Event_Handler **eh = 0; + ACE_Event_Handler **eh = nullptr; // Find the first handler... handler_iterator.next (eh); @@ -591,12 +585,12 @@ ACE_Sig_Handlers::handler (int signum, ACE_Event_Handler *new_sh) // ... and then insert the new signal handler into the beginning of // the set (note, this is a bit too tied up in the implementation of // ACE_Unbounded_Set...). - ACE_Sig_Adapter *temp = 0; + ACE_Sig_Adapter *temp = nullptr; ACE_NEW_RETURN (temp, ACE_Sig_Adapter (new_sh, ++ACE_Sig_Handlers::sigkey_), - 0); + nullptr); handler_set->insert (temp); return *eh; } diff --git a/ACE/ace/Sig_Handler.h b/ACE/ace/Sig_Handler.h index 3a9e08be45b..337f6a63521 100644 --- a/ACE/ace/Sig_Handler.h +++ b/ACE/ace/Sig_Handler.h @@ -94,8 +94,7 @@ public: * <handle_signal> method of the appropriate pre-registered * ACE_Event_Handler. */ - static void dispatch (int, siginfo_t *, - ucontext_t *); + static void dispatch (int, siginfo_t *, ucontext_t *); /// Dump the state of an object. void dump () const; @@ -149,7 +148,7 @@ private: /** * @class ACE_Sig_Handlers * - * @brief This is an alternative signal handling dispatcher for ACE. It + * @brief This is an alternative signal handling dispatcher for ACE. It * allows a list of signal handlers to be registered for each * signal. It also makes SA_RESTART the default mode. * diff --git a/ACE/ace/Signal.cpp b/ACE/ace/Signal.cpp index 74c60bb2f5c..90f09bbd13c 100644 --- a/ACE/ace/Signal.cpp +++ b/ACE/ace/Signal.cpp @@ -93,7 +93,7 @@ ACE_Sig_Action::ACE_Sig_Action (ACE_SignalHandler sig_handler, // ACE_TRACE ("ACE_Sig_Action::ACE_Sig_Action"); this->sa_.sa_flags = sig_flags; - if (sig_mask == 0) + if (sig_mask == nullptr) ACE_OS::sigemptyset (&this->sa_.sa_mask); else this->sa_.sa_mask = *sig_mask; // Structure assignment... @@ -121,7 +121,7 @@ ACE_Sig_Action::ACE_Sig_Action (ACE_SignalHandler sig_handler, // ACE_TRACE ("ACE_Sig_Action::ACE_Sig_Action"); this->sa_.sa_flags = sig_flags; - if (sig_mask == 0) + if (sig_mask == nullptr) ACE_OS::sigemptyset (&this->sa_.sa_mask); else this->sa_.sa_mask = *sig_mask; // Structure assignment... diff --git a/ACE/ace/Signal.h b/ACE/ace/Signal.h index c4299437c51..d16268539fa 100644 --- a/ACE/ace/Signal.h +++ b/ACE/ace/Signal.h @@ -164,7 +164,7 @@ public: /// Register @c this as the current disposition and store old /// disposition into @a oaction if it is non-NULL. int register_action (int signum, - ACE_Sig_Action *oaction = 0); + ACE_Sig_Action *oaction = nullptr); /// Assign the value of @a oaction to @c this and make it become the /// new signal disposition. @@ -223,7 +223,7 @@ public: /// This is kind of conditional Guard, needed when guard should be /// activated only when a specific condition met. When condition == /// true (default), Guard is activated - ACE_Sig_Guard (ACE_Sig_Set *mask = 0, bool condition = true); + ACE_Sig_Guard (ACE_Sig_Set *mask = nullptr, bool condition = true); /// Restore blocked signals. ~ACE_Sig_Guard (); @@ -239,7 +239,7 @@ private: ACE_Sig_Set omask_; /// Guard Condition - bool condition_; + bool const condition_; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/TP_Reactor.inl b/ACE/ace/TP_Reactor.inl index fc712b13c68..1660925ee3c 100644 --- a/ACE/ace/TP_Reactor.inl +++ b/ACE/ace/TP_Reactor.inl @@ -52,7 +52,6 @@ ACE_EH_Dispatch_Info::dispatch () const ACE_INLINE ACE_TP_Token_Guard::ACE_TP_Token_Guard (ACE_Select_Reactor_Token &token) - : token_ (token), owner_ (false) { diff --git a/ACE/ace/Test_and_Set.h b/ACE/ace/Test_and_Set.h index d7351dd1cc3..69a32502bbe 100644 --- a/ACE/ace/Test_and_Set.h +++ b/ACE/ace/Test_and_Set.h @@ -45,9 +45,7 @@ public: /// Called when object is signaled by OS (either via UNIX signals or /// when a Win32 object becomes signaled). - virtual int handle_signal (int signum, - siginfo_t * = 0, - ucontext_t * = 0); + virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); private: /// Keeps track of our state. diff --git a/ACE/ace/Timer_Queue_Adapters.cpp b/ACE/ace/Timer_Queue_Adapters.cpp index 7f12d825813..d440e4ca2bc 100644 --- a/ACE/ace/Timer_Queue_Adapters.cpp +++ b/ACE/ace/Timer_Queue_Adapters.cpp @@ -120,9 +120,7 @@ ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::ACE_Async_Timer_Queue_Adapter (ACE_Sig_ // occurs. template <class TQ, class TYPE> int -ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::handle_signal (int signum, - siginfo_t *, - ucontext_t *) +ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::handle_signal (int signum, siginfo_t *, ucontext_t *) { switch (signum) { diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp index dc61a2a642b..c08b0e744de 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -1621,14 +1621,13 @@ ACE_WFMO_Reactor_Handler_Repository::handler (ACE_HANDLE handle, ACE_Event_Handler **user_event_handler) { long existing_masks = 0; - int found = 0; + bool found = false; ACE_Event_Handler_var safe_event_handler = - this->handler (handle, - existing_masks); + this->handler (handle, existing_masks); if (safe_event_handler.handler ()) - found = 1; + found = true; if (!found) return -1; @@ -1639,37 +1638,36 @@ ACE_WFMO_Reactor_Handler_Repository::handler (ACE_HANDLE handle, ACE_BIT_ENABLED (user_masks, ACE_Event_Handler::READ_MASK)) if (!ACE_BIT_ENABLED (existing_masks, FD_READ) && !ACE_BIT_ENABLED (existing_masks, FD_CLOSE)) - found = 0; + found = false; if (found && ACE_BIT_ENABLED (user_masks, ACE_Event_Handler::WRITE_MASK)) if (!ACE_BIT_ENABLED (existing_masks, FD_WRITE)) - found = 0; + found = false; if (found && ACE_BIT_ENABLED (user_masks, ACE_Event_Handler::EXCEPT_MASK)) if (!ACE_BIT_ENABLED (existing_masks, FD_OOB)) - found = 0; + found = false; if (found && ACE_BIT_ENABLED (user_masks, ACE_Event_Handler::ACCEPT_MASK)) if (!ACE_BIT_ENABLED (existing_masks, FD_ACCEPT)) - found = 0; + found = false; if (found && ACE_BIT_ENABLED (user_masks, ACE_Event_Handler::CONNECT_MASK)) if (!ACE_BIT_ENABLED (existing_masks, FD_CONNECT)) - found = 0; + found = false; if (found && ACE_BIT_ENABLED (user_masks, ACE_Event_Handler::QOS_MASK)) if (!ACE_BIT_ENABLED (existing_masks, FD_QOS)) - found = 0; - + found = false; if (found && ACE_BIT_ENABLED (user_masks, ACE_Event_Handler::GROUP_QOS_MASK)) if (!ACE_BIT_ENABLED (existing_masks, FD_GROUP_QOS)) - found = 0; + found = false; if (found && user_event_handler) @@ -1898,12 +1896,12 @@ ACE_WFMO_Reactor::calculate_timeout (ACE_Time_Value *max_wait_time) return time->msec (); } - int -ACE_WFMO_Reactor::expire_timers (void) +ACE_WFMO_Reactor::expire_timers () { // If "owner" thread if (ACE_Thread::self () == this->owner_) + // expire all pending timers. return this->timer_queue_->expire (); @@ -2420,9 +2418,7 @@ ACE_WFMO_Reactor_Notify::get_handle () const // Handle all pending notifications. int -ACE_WFMO_Reactor_Notify::handle_signal (int signum, - siginfo_t *siginfo, - ucontext_t *) +ACE_WFMO_Reactor_Notify::handle_signal (int signum, siginfo_t *siginfo, ucontext_t *) { ACE_UNUSED_ARG (signum); diff --git a/ACE/ace/WFMO_Reactor.inl b/ACE/ace/WFMO_Reactor.inl index 0cd239a2bbf..5d1993b77a2 100644 --- a/ACE/ace/WFMO_Reactor.inl +++ b/ACE/ace/WFMO_Reactor.inl @@ -10,9 +10,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL /************************************************************/ ACE_INLINE int -ACE_Wakeup_All_Threads_Handler::handle_signal (int /* signum */, - siginfo_t * /* siginfo */, - ucontext_t *) +ACE_Wakeup_All_Threads_Handler::handle_signal (int /* signum */, siginfo_t * /* siginfo */, ucontext_t *) { // This will get called when <WFMO_Reactor->wakeup_all_threads_> event // is signaled. There is nothing to be done here. @@ -1153,9 +1151,7 @@ ACE_WFMO_Reactor::handler (ACE_HANDLE handle, { ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - return this->handler_rep_.handler (handle, - mask, - event_handler); + return this->handler_rep_.handler (handle, mask, event_handler); } ACE_INLINE bool diff --git a/ACE/apps/Gateway/Gateway/Gateway.cpp b/ACE/apps/Gateway/Gateway/Gateway.cpp index 0aa586c6fc8..a711cd4d7a8 100644 --- a/ACE/apps/Gateway/Gateway/Gateway.cpp +++ b/ACE/apps/Gateway/Gateway/Gateway.cpp @@ -10,53 +10,49 @@ #include "Event_Channel.h" #include "Gateway.h" +// Integrates the whole Gateway application. +// +// This implementation uses the <Event_Channel> as the basis +// for the <Gateway> routing. class ACE_Svc_Export Gateway : public ACE_Service_Object { - // = TITLE - // Integrates the whole Gateway application. - // - // = DESCRIPTION - // This implementation uses the <Event_Channel> as the basis - // for the <Gateway> routing. protected: // = Service configurator hooks. - virtual int init (int argc, ACE_TCHAR *argv[]); // Perform initialization. + virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (); // Perform termination when unlinked dynamically. + virtual int fini (); - virtual int info (ACE_TCHAR **, size_t) const; // Return info about this service. + virtual int info (ACE_TCHAR **, size_t) const; // = Configuration methods. - int parse_connection_config_file (void); // Parse the proxy configuration file. + int parse_connection_config_file (void); - int parse_consumer_config_file (void); // Parse the consumer configuration file. + int parse_consumer_config_file (void); // = Lifecycle management methods. - int handle_input (ACE_HANDLE); // Shut down the Gateway when input comes in from the controlling // console. + int handle_input (ACE_HANDLE); - int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); // Shut down the Gateway when a signal arrives. + int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); - Event_Channel event_channel_; // The Event Channel routes events from Supplier(s) to Consumer(s) // using <Supplier_Handler> and <Consumer_Handler> objects. + Event_Channel event_channel_; - Connection_Handler_Factory connection_handler_factory_; // Creates the appropriate type of <Connection_Handlers>. + Connection_Handler_Factory connection_handler_factory_; }; int -Gateway::handle_signal (int signum, siginfo_t *, ucontext_t *) +Gateway::handle_signal (int, siginfo_t *, ucontext_t *) { - ACE_UNUSED_ARG (signum); - // Shut down the main event loop. ACE_Reactor::end_event_loop (); return 0; diff --git a/ACE/apps/JAWS3/bench/rqfiles.cpp b/ACE/apps/JAWS3/bench/rqfiles.cpp index 81a99be3f4c..f09c56662b3 100644 --- a/ACE/apps/JAWS3/bench/rqfiles.cpp +++ b/ACE/apps/JAWS3/bench/rqfiles.cpp @@ -136,7 +136,6 @@ class Signal_Handler : public ACE_Event_Handler { public: - int handle_signal (int signo, siginfo_t *, ucontext_t *) { switch (signo) @@ -151,7 +150,6 @@ public: return 0; } - }; typedef ACE_Select_Reactor_Token_T<ACE_Noop_Token> diff --git a/ACE/examples/APG/Reactor/HAStatus.cpp b/ACE/examples/APG/Reactor/HAStatus.cpp index cd2c4d1bcfe..0242a893b17 100644 --- a/ACE/examples/APG/Reactor/HAStatus.cpp +++ b/ACE/examples/APG/Reactor/HAStatus.cpp @@ -241,9 +241,7 @@ public: LoopStopper (int signum = SIGINT); // Called when object is signaled by OS. - virtual int handle_signal (int signum, - siginfo_t * = 0, - ucontext_t * = 0); + virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); }; LoopStopper::LoopStopper (int signum) @@ -268,9 +266,7 @@ public: LogSwitcher (int on_sig, int off_sig); // Called when object is signaled by OS. - virtual int handle_signal (int signum, - siginfo_t * = 0, - ucontext_t * = 0); + virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); // Called when an exceptional event occurs. virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE); diff --git a/ACE/examples/APG/Reactor/Reschedule.cpp b/ACE/examples/APG/Reactor/Reschedule.cpp index b7a79941d8b..ab525e4c31d 100644 --- a/ACE/examples/APG/Reactor/Reschedule.cpp +++ b/ACE/examples/APG/Reactor/Reschedule.cpp @@ -33,9 +33,7 @@ public: { } - int handle_signal (int, - siginfo_t * = 0, - ucontext_t * = 0) + int handle_signal (int, siginfo_t * = 0, ucontext_t * = 0) { ACE_DEBUG ((LM_INFO, ACE_TEXT ("Resetting interval of timer ") diff --git a/ACE/examples/APG/Reactor/Schedule_Timers.cpp b/ACE/examples/APG/Reactor/Schedule_Timers.cpp index 2e31097c6bd..06a66699ac9 100644 --- a/ACE/examples/APG/Reactor/Schedule_Timers.cpp +++ b/ACE/examples/APG/Reactor/Schedule_Timers.cpp @@ -30,8 +30,7 @@ public: class SigintHandler : public ACE_Event_Handler { public: - int handle_signal (int signum, siginfo_t * = 0, - ucontext_t * = 0) + int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0) { if (signum == SIGINT) { diff --git a/ACE/examples/APG/Reactor/Timer_Cancel.cpp b/ACE/examples/APG/Reactor/Timer_Cancel.cpp index 1f309201676..2dc784d7ac4 100644 --- a/ACE/examples/APG/Reactor/Timer_Cancel.cpp +++ b/ACE/examples/APG/Reactor/Timer_Cancel.cpp @@ -35,9 +35,7 @@ public: { } - int handle_signal (int sig, - siginfo_t * = 0, - ucontext_t * = 0) + int handle_signal (int sig, siginfo_t * = 0, ucontext_t * = 0) { if (sig == SIGINT) { diff --git a/ACE/examples/APG/Reactor/Timer_State_Data.cpp b/ACE/examples/APG/Reactor/Timer_State_Data.cpp index a1b8056b49d..d84dfdd5c18 100644 --- a/ACE/examples/APG/Reactor/Timer_State_Data.cpp +++ b/ACE/examples/APG/Reactor/Timer_State_Data.cpp @@ -99,8 +99,7 @@ private: class SigintHandler : public ACE_Event_Handler { public: - int handle_signal (int signum, siginfo_t * = 0, - ucontext_t * = 0) + int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0) { if (signum == SIGINT) { diff --git a/ACE/examples/APG/Signals/SigGuard.cpp b/ACE/examples/APG/Signals/SigGuard.cpp index 86c8f437fb8..ea2bc6d3c6e 100644 --- a/ACE/examples/APG/Signals/SigGuard.cpp +++ b/ACE/examples/APG/Signals/SigGuard.cpp @@ -7,8 +7,7 @@ class MySignalHandler : public ACE_Event_Handler { public: - virtual int handle_signal(int signo, - siginfo_t * = 0, ucontext_t * = 0) + virtual int handle_signal(int signo, siginfo_t * = 0, ucontext_t * = 0) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Signal %d\n"), signo)); return 0; diff --git a/ACE/examples/APG/Signals/SigHandler.cpp b/ACE/examples/APG/Signals/SigHandler.cpp index aca7f6c9b47..9f171ed2daa 100644 --- a/ACE/examples/APG/Signals/SigHandler.cpp +++ b/ACE/examples/APG/Signals/SigHandler.cpp @@ -13,9 +13,7 @@ public: virtual ~MySignalHandler() { } - virtual int handle_signal (int signum, - siginfo_t * = 0, - ucontext_t * = 0) + virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0) { ACE_TRACE ("MySignalHandler::handle_signal"); diff --git a/ACE/examples/APG/Signals/SigInfo.cpp b/ACE/examples/APG/Signals/SigInfo.cpp index 82c236ce51d..557b2008fce 100644 --- a/ACE/examples/APG/Signals/SigInfo.cpp +++ b/ACE/examples/APG/Signals/SigInfo.cpp @@ -15,9 +15,7 @@ public: { } // Listing A code/ch11 - int handle_signal (int signum, - siginfo_t * siginfo = 0, - ucontext_t * = 0) + int handle_signal (int signum, siginfo_t * siginfo = 0, ucontext_t * = 0) { ACE_DEBUG ((LM_INFO, ACE_TEXT ("Received signal [%S]\n"), signum)); diff --git a/ACE/examples/APG/ThreadManagement/Signals.cpp b/ACE/examples/APG/ThreadManagement/Signals.cpp index aea37ab2312..80d424a5275 100644 --- a/ACE/examples/APG/ThreadManagement/Signals.cpp +++ b/ACE/examples/APG/ThreadManagement/Signals.cpp @@ -12,9 +12,7 @@ class SignalableTask : public ACE_Task<ACE_MT_SYNCH> { public: - virtual int handle_signal (int signum, - siginfo_t * = 0, - ucontext_t * = 0) + virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0) { if (signum == SIGUSR1) { diff --git a/ACE/examples/APG/ThreadManagement/Signals2.cpp b/ACE/examples/APG/ThreadManagement/Signals2.cpp index cd43d0fabc1..1a23f38565d 100644 --- a/ACE/examples/APG/ThreadManagement/Signals2.cpp +++ b/ACE/examples/APG/ThreadManagement/Signals2.cpp @@ -11,9 +11,7 @@ class SignalableTask : public ACE_Task<ACE_MT_SYNCH> { public: - virtual int handle_signal (int signum, - siginfo_t * = 0, - ucontext_t * = 0) + virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0) { if (signum == SIGUSR1) { diff --git a/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp index c7f87832649..2e9f25bf598 100644 --- a/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp +++ b/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp @@ -59,8 +59,7 @@ Event_Transceiver::parse_args (int argc, ACE_TCHAR *argv[]) } int -Event_Transceiver::handle_close (ACE_HANDLE, - ACE_Reactor_Mask) +Event_Transceiver::handle_close (ACE_HANDLE, ACE_Reactor_Mask) { ACE_Reactor::instance ()->end_reactor_event_loop (); return 0; @@ -69,9 +68,7 @@ Event_Transceiver::handle_close (ACE_HANDLE, // Close down via SIGINT or SIGQUIT. int -Event_Transceiver::handle_signal (int, - siginfo_t *, - ucontext_t *) +Event_Transceiver::handle_signal (int, siginfo_t *, ucontext_t *) { ACE_Reactor::instance ()->end_reactor_event_loop (); return 0; diff --git a/ACE/examples/ASX/Event_Server/Transceiver/transceiver.h b/ACE/examples/ASX/Event_Server/Transceiver/transceiver.h index 7bd5dab056d..69a7cbe5f84 100644 --- a/ACE/examples/ASX/Event_Server/Transceiver/transceiver.h +++ b/ACE/examples/ASX/Event_Server/Transceiver/transceiver.h @@ -5,53 +5,51 @@ #include "ace/SOCK_Stream.h" #include "ace/Svc_Handler.h" +// Generate and receives messages from the event server. +// +// This class is both a consumer and supplier of events, i.e., +// it's a ``transceiver.'' class Event_Transceiver : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> { - // = TITLE - // Generate and receives messages from the event server. - // - // = DESCRIPTION - // This class is both a consumer and supplier of events, i.e., - // it's a ``transceiver.'' public: - Event_Transceiver (int argc, ACE_TCHAR *argv[]); // Performs the actual initialization. + Event_Transceiver (int argc, ACE_TCHAR *argv[]); - Event_Transceiver (void); // No-op constructor (required by the <ACE_Connector>). + Event_Transceiver (); // = Svc_Handler hook called by the <ACE_Connector>. - virtual int open (void *); // Initialize the transceiver when we are connected. + virtual int open (void *); // = Demultplexing hooks from the <ACE_Reactor>. - virtual int handle_input (ACE_HANDLE); // Receive data from STDIN or socket. + virtual int handle_input (ACE_HANDLE); - virtual int handle_signal (int signum, siginfo_t *, ucontext_t *); // Close down via SIGINT. + virtual int handle_signal (int signum, siginfo_t *, ucontext_t *); - virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask); // Close down the event loop. + virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask); private: - int receiver (void); // Reads data from socket and writes to ACE_STDOUT. + int receiver (); - int transmitter (void); // Writes data from ACE_STDIN to socket. + int transmitter (); - int parse_args (int argc, ACE_TCHAR *argv[]); // Parse the command-line arguments. + int parse_args (int argc, ACE_TCHAR *argv[]); - u_short port_number_; // Port number of event server. + u_short port_number_; - const ACE_TCHAR *host_name_; // Name of event server. + const ACE_TCHAR *host_name_; - const ACE_TCHAR *role_; // Are we playing the Consumer or Supplier role? + const ACE_TCHAR *role_; }; #endif /* ACE_TRANSCEIVER_H */ diff --git a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp index 8425e66b85d..9d0766d61d9 100644 --- a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp +++ b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp @@ -73,9 +73,7 @@ IPC_Server::~IPC_Server (void) } int -IPC_Server::handle_signal (int, - siginfo_t *, - ucontext_t *) +IPC_Server::handle_signal (int, siginfo_t *, ucontext_t *) { ACE_LOG_MSG->log (LM_INFO, ACE_TEXT ("IPC_Server::handle_signal().\n")); diff --git a/ACE/examples/Connection/misc/Connection_Handler.cpp b/ACE/examples/Connection/misc/Connection_Handler.cpp index ec76b06eaa0..f33407233aa 100644 --- a/ACE/examples/Connection/misc/Connection_Handler.cpp +++ b/ACE/examples/Connection/misc/Connection_Handler.cpp @@ -146,13 +146,10 @@ Connection_Handler::handle_input (ACE_HANDLE) } int -Connection_Handler::handle_signal (int signum, - siginfo_t *, - ucontext_t *) +Connection_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *) { // @@ Note that this code is not portable to all OS platforms since // it uses print statements within signal handler context. - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("received signal %S\n"), signum)); this->finished_ = 1; diff --git a/ACE/examples/Connection/misc/Connection_Handler.h b/ACE/examples/Connection/misc/Connection_Handler.h index 8ce52f9e472..f743fcdb339 100644 --- a/ACE/examples/Connection/misc/Connection_Handler.h +++ b/ACE/examples/Connection/misc/Connection_Handler.h @@ -9,34 +9,32 @@ class Connection_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> { public: - virtual int open (void *); // Initialize the <Connection_Handler> and make it an Active Object. + virtual int open (void *); - virtual int close (u_long); // Terminate the <Connection_Handler>. + virtual int close (u_long); - virtual int svc (); // Run the <Connection_Handler>'s main event loop. + virtual int svc (); protected: + // Signal the Active Object to stop when called. virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask); - // Signal the Active Object to stop when called. - virtual int handle_input (ACE_HANDLE); // Handle input from the client. + virtual int handle_input (ACE_HANDLE); + // Handle timeouts. virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg); - // Handle timeouts. - virtual int handle_signal (int signum, - siginfo_t *, - ucontext_t *); - // Handle timeouts. + // Handle signal. + virtual int handle_signal (int signum, siginfo_t *, ucontext_t *); - sig_atomic_t finished_; // Keeps track of whether we're done. + sig_atomic_t finished_; }; #endif /* ACE_CONNECTION_HANDLER_H */ diff --git a/ACE/examples/Connection/non_blocking/CPP-connector.cpp b/ACE/examples/Connection/non_blocking/CPP-connector.cpp index 9b18a6c5459..5eaea661e4e 100644 --- a/ACE/examples/Connection/non_blocking/CPP-connector.cpp +++ b/ACE/examples/Connection/non_blocking/CPP-connector.cpp @@ -137,9 +137,7 @@ Peer_Handler<PEER_STREAM>::handle_output (ACE_HANDLE) } template <typename PEER_STREAM> int -Peer_Handler<PEER_STREAM>::handle_signal (int, - siginfo_t *, - ucontext_t *) +Peer_Handler<PEER_STREAM>::handle_signal (int, siginfo_t *, ucontext_t *) { // @@ Note that this code is not portable to all OS platforms since // it uses print statements within signal handler context. diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.h index 486e5ca378b..d90c2dd5b7b 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.h +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.h @@ -8,7 +8,6 @@ */ //============================================================================= - #ifndef QOS_SIGNAL_HANDLER_H #define QOS_SIGNAL_HANDLER_H @@ -17,15 +16,13 @@ /** * @class QoS_Signal_Handler - TITLE + * * This class Handles the SIGINT signal through the Reactor. * Useful to gracefully release QoS sessions. */ class QoS_Signal_Handler : public ACE_Event_Handler { - public: - /// constructor. QoS_Signal_Handler (ACE_QoS_Session *qos_session); @@ -33,10 +30,8 @@ public: int handle_signal(int signum, siginfo_t*,ucontext_t*); private: - /// Session to be gracefully shutdown. ACE_QoS_Session *qos_session_; - }; #endif /* QOS_SIGNAL_HANDLER_H */ diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.cpp b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.cpp index 8a21d050fe0..09f625772a3 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.cpp @@ -1,10 +1,6 @@ -// QoS_Signal_Handler.cpp #include "ace/Log_Msg.h" #include "QoS_Signal_Handler.h" - - -// constructor. QoS_Signal_Handler::QoS_Signal_Handler (ACE_QoS_Session *qos_session) : qos_session_ (qos_session) { diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.h b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.h index 486e5ca378b..339daedd51b 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.h +++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.h @@ -8,7 +8,6 @@ */ //============================================================================= - #ifndef QOS_SIGNAL_HANDLER_H #define QOS_SIGNAL_HANDLER_H @@ -23,21 +22,15 @@ */ class QoS_Signal_Handler : public ACE_Event_Handler { - public: - /// constructor. QoS_Signal_Handler (ACE_QoS_Session *qos_session); /// Override this method to implement graceful shutdown. int handle_signal(int signum, siginfo_t*,ucontext_t*); - private: - /// Session to be gracefully shutdown. ACE_QoS_Session *qos_session_; - }; #endif /* QOS_SIGNAL_HANDLER_H */ - diff --git a/ACE/examples/QOS/Simple/QoS_Signal_Handler.h b/ACE/examples/QOS/Simple/QoS_Signal_Handler.h index 486e5ca378b..71c8e60ada6 100644 --- a/ACE/examples/QOS/Simple/QoS_Signal_Handler.h +++ b/ACE/examples/QOS/Simple/QoS_Signal_Handler.h @@ -8,7 +8,6 @@ */ //============================================================================= - #ifndef QOS_SIGNAL_HANDLER_H #define QOS_SIGNAL_HANDLER_H @@ -17,26 +16,21 @@ /** * @class QoS_Signal_Handler - TITLE + * * This class Handles the SIGINT signal through the Reactor. * Useful to gracefully release QoS sessions. */ class QoS_Signal_Handler : public ACE_Event_Handler { - public: - /// constructor. QoS_Signal_Handler (ACE_QoS_Session *qos_session); /// Override this method to implement graceful shutdown. int handle_signal(int signum, siginfo_t*,ucontext_t*); - private: - /// Session to be gracefully shutdown. ACE_QoS_Session *qos_session_; - }; #endif /* QOS_SIGNAL_HANDLER_H */ diff --git a/ACE/examples/Reactor/Misc/notification.cpp b/ACE/examples/Reactor/Misc/notification.cpp index c5300a6b08b..a31fd5f3fe1 100644 --- a/ACE/examples/Reactor/Misc/notification.cpp +++ b/ACE/examples/Reactor/Misc/notification.cpp @@ -35,9 +35,7 @@ public: ~Thread_Handler (void); // Destructor. - virtual int handle_signal (int signum, - siginfo_t * = 0, - ucontext_t * = 0); + virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); // Handle signals. virtual int handle_exception (ACE_HANDLE); diff --git a/ACE/examples/Reactor/Misc/test_demuxing.cpp b/ACE/examples/Reactor/Misc/test_demuxing.cpp index 61c6f75f290..87669a81baa 100644 --- a/ACE/examples/Reactor/Misc/test_demuxing.cpp +++ b/ACE/examples/Reactor/Misc/test_demuxing.cpp @@ -20,15 +20,14 @@ // Default is to have a 2 second timeout. static int timeout = 2; +// This class illustrates how to handle signal-driven I/O using +// the <ACE_Reactor> framework. Note that signals may be caught +// and processed without requiring the use of global signal +// handler functions or global signal handler data. class Sig_Handler : public ACE_Event_Handler { - // = TITLE - // This class illustrates how to handle signal-driven I/O using - // the <ACE_Reactor> framework. Note that signals may be caught - // and processed without requiring the use of global signal - // handler functions or global signal handler data. public: - Sig_Handler (void); + Sig_Handler (); virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE); @@ -36,8 +35,7 @@ public: virtual int shutdown (ACE_HANDLE, ACE_Reactor_Mask); //FUZZ: enable check_for_lack_ACE_OS - virtual int handle_signal (int signum, siginfo_t * = 0, - ucontext_t * = 0); + virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); private: ACE_HANDLE handle_; @@ -46,7 +44,7 @@ private: // A dummy_handle is required to reserve a slot in the ACE_Reactor's // descriptor table. -Sig_Handler::Sig_Handler (void) +Sig_Handler::Sig_Handler () { // Assign the Sig_Handler a dummy I/O descriptor. Note that even // though we open this file "Write Only" we still need to use the diff --git a/ACE/examples/Reactor/Misc/test_event_handler_t.cpp b/ACE/examples/Reactor/Misc/test_event_handler_t.cpp index 40d16a72f60..9915f0bb167 100644 --- a/ACE/examples/Reactor/Misc/test_event_handler_t.cpp +++ b/ACE/examples/Reactor/Misc/test_event_handler_t.cpp @@ -14,9 +14,7 @@ public: virtual int shutdown (ACE_HANDLE, ACE_Reactor_Mask) { return 0; } //FUZZ: enable check_for_lack_ACE_OS - virtual int signal_handler (int /* signum */, - siginfo_t * = 0, - ucontext_t * = 0) + virtual int signal_handler (int /* signum */, siginfo_t * = 0, ucontext_t * = 0) { return 0; } diff --git a/ACE/examples/Reactor/Misc/test_signals_1.cpp b/ACE/examples/Reactor/Misc/test_signals_1.cpp index 1e6b01f59ba..aa8238931d2 100644 --- a/ACE/examples/Reactor/Misc/test_signals_1.cpp +++ b/ACE/examples/Reactor/Misc/test_signals_1.cpp @@ -8,8 +8,6 @@ #include "ace/Log_Msg.h" #include "ace/Signal.h" - - // Number of times to allow signal to execute until we quit. static size_t signal_count = 10; @@ -24,9 +22,7 @@ my_signal_function (int sig) class My_Handler : public ACE_Event_Handler { public: - virtual int handle_signal (int sig, - siginfo_t *, - ucontext_t *) + virtual int handle_signal (int sig, siginfo_t *, ucontext_t *) { // @@ Note that this code is not portable to all OS platforms // since it uses print statements within signal handler context. diff --git a/ACE/examples/Reactor/Misc/test_signals_2.cpp b/ACE/examples/Reactor/Misc/test_signals_2.cpp index e5c5b292831..66db4d2d5fb 100644 --- a/ACE/examples/Reactor/Misc/test_signals_2.cpp +++ b/ACE/examples/Reactor/Misc/test_signals_2.cpp @@ -125,9 +125,7 @@ public: // @@ Note that this code is not portable to all OS platforms since // it does print statements within the signal handler. - virtual int handle_signal (int signum, - siginfo_t *, - ucontext_t *) + virtual int handle_signal (int signum, siginfo_t *, ucontext_t *) { this->count_++; ACE_DEBUG ((LM_DEBUG, @@ -189,9 +187,7 @@ public: { } - virtual int handle_signal (int signum, - siginfo_t *, - ucontext_t *) + virtual int handle_signal (int signum, siginfo_t *, ucontext_t *) { this->count_++; ACE_DEBUG ((LM_DEBUG, diff --git a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp index bb2000fa963..5f9792a7166 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp @@ -10,7 +10,6 @@ */ //============================================================================= - #include "ace/OS_main.h" #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && _WIN32_WINNT >= 0x400 @@ -19,17 +18,12 @@ #include "ace/Auto_Event.h" #include "ace/Log_Msg.h" - - class Event_Handler : public ACE_Event_Handler { public: - int handle_signal (int signum, - siginfo_t * = 0, - ucontext_t * = 0); + int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); - int handle_timeout (const ACE_Time_Value &tv, - const void *arg = 0); + int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); ACE_Auto_Event handle_; int iterations_; @@ -58,9 +52,7 @@ queue_apc (void) } int -Event_Handler::handle_signal (int, - siginfo_t *, - ucontext_t *) +Event_Handler::handle_signal (int, siginfo_t *, ucontext_t *) { --this->iterations_; diff --git a/ACE/examples/Reactor/WFMO_Reactor/Abandoned.cpp b/ACE/examples/Reactor/WFMO_Reactor/Abandoned.cpp index d6b7285f3b7..574dd3afd23 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Abandoned.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Abandoned.cpp @@ -9,7 +9,6 @@ */ //============================================================================= - #include "ace/OS_main.h" #if defined (ACE_WIN32) @@ -19,8 +18,6 @@ #include "ace/Process_Mutex.h" #include "ace/Auto_Event.h" - - class Event_Handler : public ACE_Event_Handler { public: diff --git a/ACE/examples/Reactor/WFMO_Reactor/Console_Input.cpp b/ACE/examples/Reactor/WFMO_Reactor/Console_Input.cpp index b9a043e823d..5ccb292680b 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Console_Input.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Console_Input.cpp @@ -10,15 +10,12 @@ */ //============================================================================= - #include "ace/Reactor.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" #include "ace/OS_main.h" #include "ace/Log_Msg.h" - - class Event_Handler : public ACE_Event_Handler { public: diff --git a/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp b/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp index ac52dbe9b84..83df6afa6b4 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp @@ -9,7 +9,6 @@ */ //============================================================================= - #include "ace/OS_main.h" #if defined (ACE_WIN32) diff --git a/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp b/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp index 231f0b08c11..c5b166217a4 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp @@ -9,7 +9,6 @@ */ //============================================================================= - #include "ace/OS_main.h" #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) && !defined (ACE_LACKS_REGNOTIFYCHANGEKEYVALUE) @@ -19,8 +18,6 @@ #include "ace/Auto_Event.h" #include "ace/OS_NS_unistd.h" - - static int stop_test = 0; static HKEY context_to_monitor = HKEY_CURRENT_USER; static const ACE_TCHAR *temp_context_name = ACE_TEXT ("ACE temporary context"); diff --git a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp index decac6d0b97..6e62e2efde2 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp @@ -527,7 +527,6 @@ STDIN_Handler::register_thread_exit_hook (void) // The STDIN thread has exited. This means the user hit ^C. We can // end the event loop and delete ourself. - int STDIN_Handler::handle_signal (int, siginfo_t *si, ucontext_t *) { diff --git a/ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp b/ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp index 2436f22489b..6ee6a0de8cb 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp @@ -20,8 +20,6 @@ #include "ace/Auto_Ptr.h" #include "ace/Auto_Event.h" - - class Event_Handler : public ACE_Event_Handler { public: diff --git a/ACE/netsvcs/lib/TS_Clerk_Handler.cpp b/ACE/netsvcs/lib/TS_Clerk_Handler.cpp index 82ded8f1eec..55497e394d0 100644 --- a/ACE/netsvcs/lib/TS_Clerk_Handler.cpp +++ b/ACE/netsvcs/lib/TS_Clerk_Handler.cpp @@ -64,7 +64,6 @@ ACE_TS_Clerk_Handler::timeout (void) } // This is called when a <send> to the logging server fails... - int ACE_TS_Clerk_Handler::handle_signal (int, siginfo_t *, ucontext_t *) { diff --git a/ACE/netsvcs/lib/TS_Clerk_Handler.h b/ACE/netsvcs/lib/TS_Clerk_Handler.h index 268ba5b1f08..75ed73303ee 100644 --- a/ACE/netsvcs/lib/TS_Clerk_Handler.h +++ b/ACE/netsvcs/lib/TS_Clerk_Handler.h @@ -121,9 +121,7 @@ public: protected: /// Handle SIGPIPE. - virtual int handle_signal (int signum, - siginfo_t *, - ucontext_t *); + virtual int handle_signal (int signum, siginfo_t *, ucontext_t *); static void stderr_output (int = 0); diff --git a/ACE/tests/Bug_2368_Regression_Test.cpp b/ACE/tests/Bug_2368_Regression_Test.cpp index 0dbacfb4d07..f3afd214362 100644 --- a/ACE/tests/Bug_2368_Regression_Test.cpp +++ b/ACE/tests/Bug_2368_Regression_Test.cpp @@ -19,8 +19,7 @@ static bool handleB_close_called = false; class My_HandlerA : public ACE_Event_Handler { public: - int handle_close (ACE_HANDLE, - ACE_Reactor_Mask) override + int handle_close (ACE_HANDLE, ACE_Reactor_Mask) override { ACE_DEBUG ((LM_DEBUG, "Handle close called\n")); @@ -29,9 +28,7 @@ public: return 0; } - int handle_signal (int, - siginfo_t *, - ucontext_t *) override + int handle_signal (int, siginfo_t *, ucontext_t *) override { ACE_DEBUG ((LM_DEBUG, "Handle signal called\n")); @@ -43,8 +40,7 @@ public: class My_HandlerB : public ACE_Event_Handler { public: - int handle_close (ACE_HANDLE, - ACE_Reactor_Mask) override + int handle_close (ACE_HANDLE, ACE_Reactor_Mask) override { ACE_DEBUG ((LM_DEBUG, "Handle close called\n")); @@ -53,9 +49,7 @@ public: return 0; } - int handle_signal (int, - siginfo_t *, - ucontext_t *) override + int handle_signal (int, siginfo_t *, ucontext_t *) override { ACE_DEBUG ((LM_DEBUG, "Handle signal called\n")); diff --git a/ACE/tests/Network_Adapters_Test.cpp b/ACE/tests/Network_Adapters_Test.cpp index 35e417c226e..e42fc226182 100644 --- a/ACE/tests/Network_Adapters_Test.cpp +++ b/ACE/tests/Network_Adapters_Test.cpp @@ -583,9 +583,7 @@ Stop_Handler::open () } int -Stop_Handler::handle_signal (int signum, - siginfo_t * , - ucontext_t *) +Stop_Handler::handle_signal (int signum, siginfo_t * , ucontext_t *) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Stop_Handler::handle_signal - started.\n"))); diff --git a/ACE/tests/Network_Adapters_Test.h b/ACE/tests/Network_Adapters_Test.h index 4fe8cf6dbe0..ead6e6a120a 100644 --- a/ACE/tests/Network_Adapters_Test.h +++ b/ACE/tests/Network_Adapters_Test.h @@ -185,9 +185,7 @@ public: virtual int handle_input (ACE_HANDLE); // Dispatches handle_input () notification. - virtual int handle_signal (int signum, - siginfo_t * = 0, - ucontext_t * = 0); + virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); virtual int handle_timeout (ACE_Time_Value const & current_time, void const * act = 0); diff --git a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp index 61ab493c66c..7e2081b837d 100644 --- a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp +++ b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp @@ -40,7 +40,6 @@ static const char *two_second_timeout = "two second timeout"; class Reference_Counted_Event_Handler : public ACE_Event_Handler { public: - Reference_Counted_Event_Handler (int &events); ~Reference_Counted_Event_Handler () override; @@ -64,7 +63,6 @@ public: ACE_Pipe pipe_; int &events_; - }; Reference_Counted_Event_Handler::Reference_Counted_Event_Handler (int &events) @@ -470,7 +468,6 @@ reference_count_2 (ACE_Reactor_Impl *impl) class Simple_Event_Handler : public ACE_Event_Handler { public: - Simple_Event_Handler (int &events, int close_count); @@ -485,15 +482,13 @@ public: int handle_signal (int, siginfo_t *, ucontext_t *) override; - int handle_close (ACE_HANDLE, - ACE_Reactor_Mask) override; + int handle_close (ACE_HANDLE, ACE_Reactor_Mask) override; ACE_Pipe pipe_; int &events_; int close_count_; - }; Simple_Event_Handler::Simple_Event_Handler (int &events, |