diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-05-01 16:10:10 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-05-01 16:10:10 +0000 |
| commit | d8e821571d63e5f89b8ba22d5fac1416c3cff089 (patch) | |
| tree | bacb3de1b9984ac50fc8a8f4bc57bf19906ef2aa | |
| parent | 9a55e9d85a5515c6209c363b6e5761e0528400f5 (diff) | |
| download | ATCD-d8e821571d63e5f89b8ba22d5fac1416c3cff089.tar.gz | |
ChangeLogTag:Tue May 1 09:57:30 2001 Douglas C. Schmidt <schmidt@tango.doc.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/Activation_Queue.cpp | 15 |
5 files changed, 28 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 0363a7cfa7c..5919815409f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue May 1 09:57:30 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/Activation_Queue.cpp (enqueue): Clarified the behavior + of passing sizeof (*mr). Thanks to Guy Bolton King + <guy_bolton_king@non.agilent.com> + Tue May 1 07:13:59 2001 Balachandran Natarajan <bala@cs.wustl.edu> * bin/auto_run_tests.lst : Sun CC 5.1 cannot work with diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 0363a7cfa7c..5919815409f 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Tue May 1 09:57:30 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/Activation_Queue.cpp (enqueue): Clarified the behavior + of passing sizeof (*mr). Thanks to Guy Bolton King + <guy_bolton_king@non.agilent.com> + Tue May 1 07:13:59 2001 Balachandran Natarajan <bala@cs.wustl.edu> * bin/auto_run_tests.lst : Sun CC 5.1 cannot work with diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 0363a7cfa7c..5919815409f 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Tue May 1 09:57:30 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/Activation_Queue.cpp (enqueue): Clarified the behavior + of passing sizeof (*mr). Thanks to Guy Bolton King + <guy_bolton_king@non.agilent.com> + Tue May 1 07:13:59 2001 Balachandran Natarajan <bala@cs.wustl.edu> * bin/auto_run_tests.lst : Sun CC 5.1 cannot work with @@ -1223,6 +1223,7 @@ Dayisi <dayisi@163.com> Peter Georgakakis <peterg@gdc.ca> Richard Hardgrave <hardgrav@ttd.teradyne.com> Mark Drijver <mdrijver@remedy.nl> +Guy Bolton King <guy_bolton_king@non.agilent.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ace/Activation_Queue.cpp b/ace/Activation_Queue.cpp index 491b4d57ad5..4d8f5d395d5 100644 --- a/ace/Activation_Queue.cpp +++ b/ace/Activation_Queue.cpp @@ -55,28 +55,31 @@ ACE_Activation_Queue::dequeue (ACE_Time_Value *tv) if (this->queue_->dequeue_head (mb, tv) != -1) { // Get the next <Method_Request>. - ACE_Method_Request *mo = + ACE_Method_Request *mr = ACE_reinterpret_cast (ACE_Method_Request *, mb->base ()); // Delete the message block. mb->release (); - return mo; + return mr; } else return 0; } int -ACE_Activation_Queue::enqueue (ACE_Method_Request *mo, +ACE_Activation_Queue::enqueue (ACE_Method_Request *mr, ACE_Time_Value *tv) { ACE_Message_Block *mb; + // We pass sizeof (*mr) here so that flow control will work + // correctly. Since we also pass <mr> note that no unnecessary + // memory is actually allocated -- just the size field is set. ACE_NEW_RETURN (mb, - ACE_Message_Block ((char *) mo, - sizeof (*mo), - mo->priority ()), + ACE_Message_Block ((char *) mr, + sizeof (*mr), + mr->priority ()), -1); // Enqueue in priority order. |