diff options
author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-06-25 23:45:22 +0000 |
---|---|---|
committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-06-25 23:45:22 +0000 |
commit | 9889d49a7edfac0f9ef060f83ea283f727b3326d (patch) | |
tree | a5ccedbe0734786134368cebf079092788a6cc43 | |
parent | 660f1efac4cf207d39e1536b7f91de76c7302188 (diff) | |
download | ATCD-9889d49a7edfac0f9ef060f83ea283f727b3326d.tar.gz |
*** empty log message ***
-rw-r--r-- | ChangeLog-97a | 11 | ||||
-rw-r--r-- | ace/Strategies.cpp | 57 | ||||
-rw-r--r-- | ace/Strategies.h | 23 |
3 files changed, 78 insertions, 13 deletions
diff --git a/ChangeLog-97a b/ChangeLog-97a index 98466b6f34b..68d4069e6af 100644 --- a/ChangeLog-97a +++ b/ChangeLog-97a @@ -1,8 +1,3 @@ -Wed Jun 25 17:18:25 1997 Steve Huston <shuston@riverace.com> - - * ace/Parse_Node.cpp: Insure that ACE_Object_Node::symbol(void) - returns 0 if the underlying shared library can't be loaded. - Wed Jun 25 12:59:00 1997 <irfan@TWOSTEP> * ace/Synch_T.h (ACE_SYNCH_PROCESS_MUTEX and @@ -11,8 +6,14 @@ Wed Jun 25 12:59:00 1997 <irfan@TWOSTEP> * tests/Message_Queue_Notifications_Test.cpp: New test for demonstrating notification qualities of Message_Queue. + * ace/Strategies.h: Added accessors to these classes to make them + more usable. + Wed Jun 25 10:47:34 1997 Steve Huston <shuston@riverace.com> + * ace/Parse_Node.cpp: Insure that ACE_Object_Node::symbol(void) + returns 0 if the underlying shared library can't be loaded. + * ace/OS.h: Added a new type, ACE_SHLIB_HANDLE to allow dynamic linking using correct types on all platforms that support it. Also added a const ACE_SHLIB_DEFAULT_MODE for the 'mode' argument diff --git a/ace/Strategies.cpp b/ace/Strategies.cpp index 0943d560b2c..576faa6ee2b 100644 --- a/ace/Strategies.cpp +++ b/ace/Strategies.cpp @@ -20,6 +20,30 @@ ACE_Notification_Strategy::~ACE_Notification_Strategy (void) { } +ACE_Event_Handler * +ACE_Notification_Strategy::event_handler (void) +{ + return eh_; +} + +void +ACE_Notification_Strategy::event_handler (ACE_Event_Handler *eh) +{ + this->eh_ = eh; +} + +ACE_Reactor_Mask +ACE_Notification_Strategy::mask (void) +{ + return mask_; +} + +void +ACE_Notification_Strategy::mask (ACE_Reactor_Mask m) +{ + this->mask_ = m; +} + ACE_Reactor_Notification_Strategy::ACE_Reactor_Notification_Strategy (ACE_Reactor *reactor, ACE_Event_Handler *eh, ACE_Reactor_Mask mask) @@ -41,25 +65,50 @@ ACE_Reactor_Notification_Strategy::notify (ACE_Event_Handler *eh, return this->reactor_->notify (eh, mask); } -ACE_ReactorEx_Notification_Strategy::ACE_ReactorEx_Notification_Strategy (ACE_ReactorEx *reactorex, +ACE_Reactor * +ACE_Reactor_Notification_Strategy::reactor (void) +{ + return this->reactor_; +} + +void +ACE_Reactor_Notification_Strategy::reactor (ACE_Reactor *r) +{ + this->reactor_ = r; +} + +ACE_ReactorEx_Notification_Strategy::ACE_ReactorEx_Notification_Strategy (ACE_ReactorEx *reactorEx, ACE_Event_Handler *eh, ACE_Reactor_Mask mask) : ACE_Notification_Strategy (eh, mask), - reactorex_ (reactorex) + reactorEx_ (reactorEx) { } int ACE_ReactorEx_Notification_Strategy::notify (void) { - return this->reactorex_->notify (this->eh_, this->mask_); + return this->reactorEx_->notify (this->eh_, this->mask_); } int ACE_ReactorEx_Notification_Strategy::notify (ACE_Event_Handler *eh, ACE_Reactor_Mask mask) { - return this->reactorex_->notify (eh, mask); + return this->reactorEx_->notify (eh, mask); } +ACE_ReactorEx * +ACE_ReactorEx_Notification_Strategy::reactorEx (void) +{ + return this->reactorEx_; +} + +void +ACE_ReactorEx_Notification_Strategy::reactorEx (ACE_ReactorEx *r) +{ + this->reactorEx_ = r; +} + #endif /* ACE_STRATEGIES_C */ + diff --git a/ace/Strategies.h b/ace/Strategies.h index 07fc604be90..0c16b0bbbe1 100644 --- a/ace/Strategies.h +++ b/ace/Strategies.h @@ -41,6 +41,13 @@ public: virtual int notify (ACE_Event_Handler *, ACE_Reactor_Mask mask) = 0; + // Get/Set the event handler + ACE_Event_Handler *event_handler (void); + void event_handler (ACE_Event_Handler *eh); + + // Get/Set the reactor mask + ACE_Reactor_Mask mask (void); + void mask (ACE_Reactor_Mask m); protected: ACE_Event_Handler *eh_; @@ -65,7 +72,11 @@ public: virtual int notify (ACE_Event_Handler *, ACE_Reactor_Mask mask); -private: + // Get/Set the reactor + ACE_Reactor *reactor (void); + void reactor (ACE_Reactor *r); + +protected: ACE_Reactor *reactor_; }; @@ -78,7 +89,7 @@ class ACE_Export ACE_ReactorEx_Notification_Strategy : public ACE_Notification_S // ACE_ReactorEx::notify() method. { public: - ACE_ReactorEx_Notification_Strategy (ACE_ReactorEx *reactorex, + ACE_ReactorEx_Notification_Strategy (ACE_ReactorEx *reactorEx, ACE_Event_Handler *eh, ACE_Reactor_Mask mask); @@ -87,8 +98,12 @@ public: virtual int notify (ACE_Event_Handler *, ACE_Reactor_Mask mask); -private: - ACE_ReactorEx *reactorex_; + // Get/Set the reactorEx + ACE_ReactorEx *reactorEx (void); + void reactorEx (ACE_ReactorEx *r); + +protected: + ACE_ReactorEx *reactorEx_; }; // This needs to come here to avoid circular dependencies. |