diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 9 | ||||
| -rw-r--r-- | ace/Select_Reactor_T.cpp | 8 | ||||
| -rw-r--r-- | ace/TP_Reactor.cpp | 20 | ||||
| -rw-r--r-- | ace/TP_Reactor.h | 2 |
6 files changed, 25 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog index 628f02dc1a9..d654027031e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Jan 14 15:42:28 2000 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/Select_Reactor_T.cpp (work_pending): Made the code more + general such that any thread can call it, i.e., it is not + limited to the owner thread. This change alleviated the need + for the specialization in TP_Reactor. + Fri Jan 14 01:48:26 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace/Process: Moved the command_line_argv() from the @@ -18,7 +25,7 @@ Fri Jan 14 01:48:26 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> executable name and a different argv[0]. This helps us to have the name for a process to be different from the executable name. In this case, <ps> command will show the processes with - different argv[0] names. + different argv[0] names. Therefore, we added a method called <process_name> to ACE_Process_Options to specify the executable name. If you do diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 628f02dc1a9..d654027031e 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Fri Jan 14 15:42:28 2000 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/Select_Reactor_T.cpp (work_pending): Made the code more + general such that any thread can call it, i.e., it is not + limited to the owner thread. This change alleviated the need + for the specialization in TP_Reactor. + Fri Jan 14 01:48:26 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace/Process: Moved the command_line_argv() from the @@ -18,7 +25,7 @@ Fri Jan 14 01:48:26 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> executable name and a different argv[0]. This helps us to have the name for a process to be different from the executable name. In this case, <ps> command will show the processes with - different argv[0] names. + different argv[0] names. Therefore, we added a method called <process_name> to ACE_Process_Options to specify the executable name. If you do diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 628f02dc1a9..d654027031e 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Fri Jan 14 15:42:28 2000 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/Select_Reactor_T.cpp (work_pending): Made the code more + general such that any thread can call it, i.e., it is not + limited to the owner thread. This change alleviated the need + for the specialization in TP_Reactor. + Fri Jan 14 01:48:26 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace/Process: Moved the command_line_argv() from the @@ -18,7 +25,7 @@ Fri Jan 14 01:48:26 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> executable name and a different argv[0]. This helps us to have the name for a process to be different from the executable name. In this case, <ps> command will show the processes with - different argv[0] names. + different argv[0] names. Therefore, we added a method called <process_name> to ACE_Process_Options to specify the executable name. If you do diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp index e983afa94d5..c468b60c909 100644 --- a/ace/Select_Reactor_T.cpp +++ b/ace/Select_Reactor_T.cpp @@ -908,13 +908,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::remove_handler_i template <class ACE_SELECT_REACTOR_TOKEN> int ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::work_pending (const ACE_Time_Value &timeout) { -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1); - - if (ACE_OS::thr_equal (ACE_Thread::self (), - this->owner_) == 0) - return -1; -#endif /* defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) */ + ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); u_long width = (u_long) this->handler_rep_.max_handlep1 (); diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp index ef21a298a00..f8b0bca927b 100644 --- a/ace/TP_Reactor.cpp +++ b/ace/TP_Reactor.cpp @@ -109,26 +109,6 @@ ACE_TP_Reactor::dispatch_io_set (int number_of_active_handles, } int -ACE_TP_Reactor::work_pending (const ACE_Time_Value &timeout) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, - ace_mon, this->token_, -1)); - - u_long width = (u_long) this->handler_rep_.max_handlep1 (); - - ACE_Select_Reactor_Handle_Set fd_set; - fd_set.rd_mask_ = this->wait_set_.rd_mask_; - fd_set.wr_mask_ = this->wait_set_.wr_mask_; - fd_set.ex_mask_ = this->wait_set_.ex_mask_; - - return ACE_OS::select (int (width), - fd_set.rd_mask_, - fd_set.wr_mask_, - fd_set.ex_mask_, - timeout); -} - -int ACE_TP_Reactor::handle_events (ACE_Time_Value *max_wait_time) { ACE_TRACE ("ACE_TP_Reactor::handle_events"); diff --git a/ace/TP_Reactor.h b/ace/TP_Reactor.h index 21962cf8164..6a093d872ce 100644 --- a/ace/TP_Reactor.h +++ b/ace/TP_Reactor.h @@ -143,8 +143,6 @@ public: virtual int handle_events (ACE_Time_Value &max_wait_time); - virtual int work_pending (const ACE_Time_Value &timeout); - virtual int mask_ops (ACE_Event_Handler *eh, ACE_Reactor_Mask mask, int ops); |