diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-03-16 19:23:37 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-03-16 19:23:37 +0000 |
| commit | d005f8819a6040b1db5a4291c630f778c650f1e7 (patch) | |
| tree | 56e0746072e2fe6974313da8b74d1bf125b35e33 | |
| parent | b460823b683a208f7c12b326cabe5f07f7932edc (diff) | |
| download | ATCD-d005f8819a6040b1db5a4291c630f778c650f1e7.tar.gz | |
ChangeLogTag:Thu Mar 16 13:01:02 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | ace/Event_Handler.h | 9 | ||||
| -rw-r--r-- | ace/Timer_Queue_T.cpp | 2 |
6 files changed, 26 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 306aa9fa76d..d2c3da93c39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Mar 16 13:01:02 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Event_Handler.h: Clarified the comments for handle_timeout(). + Thanks to Jonathan Reis <reis@stentorsoft.com> for this + suggestion. + Thu Mar 16 12:47:01 2000 David L. Levine <levine@cs.wustl.edu> * ace/OS.cpp (thr_create): check for stacksize < diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 306aa9fa76d..d2c3da93c39 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Thu Mar 16 13:01:02 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Event_Handler.h: Clarified the comments for handle_timeout(). + Thanks to Jonathan Reis <reis@stentorsoft.com> for this + suggestion. + Thu Mar 16 12:47:01 2000 David L. Levine <levine@cs.wustl.edu> * ace/OS.cpp (thr_create): check for stacksize < diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 306aa9fa76d..d2c3da93c39 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Thu Mar 16 13:01:02 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Event_Handler.h: Clarified the comments for handle_timeout(). + Thanks to Jonathan Reis <reis@stentorsoft.com> for this + suggestion. + Thu Mar 16 12:47:01 2000 David L. Levine <levine@cs.wustl.edu> * ace/OS.cpp (thr_create): check for stacksize < @@ -926,6 +926,7 @@ Charles Scott <Charles.P.Scott@jpl.nasa.gov> Espen Harlinn <espen.harlinn@seamos.no> mulder <mul@iitb.fhg.de> Richard L. Johnson <Richard.L.Johnson@jpl.nasa.gov> +Tam Nguyen <tnguyen@viasat.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson. Paul devised the recursive Makefile scheme that diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h index ba444e508d9..2ab0c8f7106 100644 --- a/ace/Event_Handler.h +++ b/ace/Event_Handler.h @@ -104,9 +104,12 @@ public: virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE); // Called when execption events occur (e.g., SIGURG). - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg = 0); - // Called when timer expires. + virtual int handle_timeout (const ACE_Time_Value ¤t_time, + const void *act = 0); + // Called when timer expires. <current_time> represents the current + // time that the <Event_Handler> was selected for timeout + // dispatching and <act> is the asynchronous completion token that + // was passed in when <schedule_timer> was invoked. virtual int handle_exit (ACE_Process *); // Called when a process exits. diff --git a/ace/Timer_Queue_T.cpp b/ace/Timer_Queue_T.cpp index 86ec13c0a3c..aec10a4cd42 100644 --- a/ace/Timer_Queue_T.cpp +++ b/ace/Timer_Queue_T.cpp @@ -281,7 +281,7 @@ ACE_Event_Handler_Handle_Timeout_Upcall<ACE_LOCK>::timeout (ACE_Timer_Queue_T<AC const void *act, const ACE_Time_Value &cur_time) { - // Upcall to the <handler>s handle_timeout method + // Upcall to the <handler>s handle_timeout method. if (handler->handle_timeout (cur_time, act) == -1) timer_queue.cancel (handler, 0); // 0 means "call handle_close()". |