diff options
Diffstat (limited to 'ACE/examples')
32 files changed, 58 insertions, 148 deletions
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: |