diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-12-10 00:04:59 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-12-10 00:04:59 +0000 |
| commit | abc81e436df0454fc943b9e436b6cd64d0127b61 (patch) | |
| tree | d0e1298b17bccfb97715b30c630359dd8847c18e | |
| parent | 9458cb2b77cab58924dedfb061da113b73f8c619 (diff) | |
| download | ATCD-abc81e436df0454fc943b9e436b6cd64d0127b61.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-98b | 5 | ||||
| -rw-r--r-- | examples/Reactor/WFMO_Reactor/test_network_events.cpp | 17 |
2 files changed, 10 insertions, 12 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b index ce4fe36d391..aeacb9f33e4 100644 --- a/ChangeLog-98b +++ b/ChangeLog-98b @@ -1,3 +1,8 @@ +Wed Dec 09 18:03:58 1998 Irfan Pyarali <irfan@cs.wustl.edu> + + * examples/Reactor/WFMO_Reactor/test_network_events.cpp (main): + Removed global variables and cleaned up some minor things. + Wed Dec 09 07:02:06 1998 David L. Levine <levine@cs.wustl.edu> * README, VERSION: expanded mention of BUG-REPORT-FORM. diff --git a/examples/Reactor/WFMO_Reactor/test_network_events.cpp b/examples/Reactor/WFMO_Reactor/test_network_events.cpp index 8c951215946..eed8464bf8b 100644 --- a/examples/Reactor/WFMO_Reactor/test_network_events.cpp +++ b/examples/Reactor/WFMO_Reactor/test_network_events.cpp @@ -39,10 +39,6 @@ ACE_RCSID(ReactorEx, test_network_events, "$Id$") -// Globals for this test -int stop_test = 0; -ACE_Reactor reactor; - class Network_Handler : public ACE_Event_Handler { public: @@ -61,7 +57,7 @@ public: Network_Handler::Network_Handler (ACE_SOCK_Stream &s) : stream_ (s) { - this->reactor (&::reactor); + this->reactor (ACE_Reactor::instance ()); ACE_ASSERT (this->reactor ()->register_handler (this, READ_MASK) == 0); } @@ -133,7 +129,7 @@ Network_Listener::Network_Listener (void) : local_address_ (ACE_DEFAULT_SERVER_PORT), acceptor_ (local_address_, 1) { - this->reactor (&::reactor); + this->reactor (ACE_Reactor::instance ()); ACE_ASSERT (this->reactor ()->register_handler (this, ACE_Event_Handler::ACCEPT_MASK) == 0); } @@ -186,13 +182,10 @@ Network_Listener::handle_close (ACE_HANDLE handle, int main (int, char *[]) -{ +{ Network_Listener listener; - int result = 0; - while (!stop_test && result != -1) - { - result = reactor.handle_events (); - } + ACE_Reactor::run_event_loop (); + return 0; }; |