diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-21 05:21:11 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-21 05:21:11 +0000 |
| commit | ce0fd457f6499aa3ddfc30a3a6008d7b1e35165b (patch) | |
| tree | e00b6ece2f7b36217f5c2b95af523d331fa34db1 | |
| parent | 32d66a8f74ee4249ff1b9e19752b26160d5616b2 (diff) | |
| download | ATCD-ce0fd457f6499aa3ddfc30a3a6008d7b1e35165b.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-98b | 4 | ||||
| -rw-r--r-- | ace/WFMO_Reactor.cpp | 14 | ||||
| -rw-r--r-- | ace/WFMO_Reactor.h | 5 | ||||
| -rw-r--r-- | ace/WFMO_Reactor.i | 2 |
4 files changed, 19 insertions, 6 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b index 4ac6f692168..04fcccf51b4 100644 --- a/ChangeLog-98b +++ b/ChangeLog-98b @@ -1,10 +1,10 @@ Sun Jun 21 00:16:56 1998 Nanbor Wang <nanbor@cs.wustl.edu> - * ace/WFMO_Reactor.{h,cpp}: Changed the parent class of + * ace/WFMO_Reactor.{h,i,cpp}: Changed the parent class of ACE_WFMO_Reactor_Notify from ACE_Event_Handler to ACE_Reactor_Notify. (dump): Added this virtual function implementation for - ACE_WFMO_Reactor_Notify. + ACE_WFMO_Reactor_Notify. * Ace/Proactor.cpp (timeout): Fixed a typo. diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp index 74637f63144..4260c99042e 100644 --- a/ace/WFMO_Reactor.cpp +++ b/ace/WFMO_Reactor.cpp @@ -964,11 +964,11 @@ ACE_WFMO_Reactor::open (size_t size, if (this->notify_handler_ == 0) { ACE_NEW_RETURN (this->notify_handler_, - ACE_WMFO_Reactor_Notify, + ACE_WFMO_Reactor_Notify, -1); if (this->notify_handler_ == 0) - result = -1; + return -1; else this->delete_notify_handler_ = 1; } @@ -1876,6 +1876,16 @@ ACE_WFMO_Reactor_Notify::max_notify_iterations (void) } void +ACE_WFMO_Reactor_Notify::dump (void) const +{ + ACE_TRACE ("ACE_WFMO_Reactor_Notify::dump"); + ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + this->timer_queue_->dump (); + ACE_DEBUG ((LM_DEBUG, "Max. iteration: %d\n", this->max_notify_iterations_)); + ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); +} + +void ACE_WFMO_Reactor::max_notify_iterations (int iterations) { ACE_TRACE ("ACE_WFMO_Reactor::max_notify_iterations"); diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h index 38acbdd3899..548c99bf40e 100644 --- a/ace/WFMO_Reactor.h +++ b/ace/WFMO_Reactor.h @@ -379,7 +379,7 @@ protected: }; -class ACE_Export ACE_WFMO_Reactor_Notify : public ACE_Event_Handler +class ACE_Export ACE_WFMO_Reactor_Notify : public ACE_Reactor_Notify { // = TITLE // Unblock the <ACE_WFMO_Reactor> from its event loop, passing @@ -442,6 +442,9 @@ public: // notify queue before breaking out of its // <ACE_Message_Queue::dequeue> loop. + virtual void dump (void) const; + // Dump the state of an object. + private: ACE_Timer_Queue *timer_queue_; // Pointer to the wfmo_reactor's timer queue. diff --git a/ace/WFMO_Reactor.i b/ace/WFMO_Reactor.i index d337fe6ab53..3890b884370 100644 --- a/ace/WFMO_Reactor.i +++ b/ace/WFMO_Reactor.i @@ -863,7 +863,7 @@ ACE_WFMO_Reactor::notify (ACE_Event_Handler *event_handler, ACE_Reactor_Mask mask, ACE_Time_Value *timeout) { - return this->notify_handler_.notify (event_handler, mask, timeout); + return this->notify_handler_->notify (event_handler, mask, timeout); } ACE_INLINE int |