summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2003-03-22 18:23:27 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2003-03-22 18:23:27 +0000
commit41f5f4e6460461f540797ce816adc35fb845df59 (patch)
tree3c5ea7f3c38511fa394427294039145017ba2565
parentd6dfbfb075c17af39a7aa9b1fafbcca3ddfe7478 (diff)
downloadATCD-41f5f4e6460461f540797ce816adc35fb845df59.tar.gz
ChangeLogTag:Sat Mar 22 11:58:12 2003 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
-rw-r--r--ChangeLog7
-rw-r--r--ace/Message_Queue_T.cpp13
2 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index fe986bb1f0a..f2df08ae994 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Mar 22 11:58:12 2003 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
+
+ * ace/Message_Queue_T.cpp: Moved the notify() hook calls within
+ the protection of the guard lock critical section to prevent
+ race conditions on cleanup. Thanks to Ron Muck <rlm@sdiusa.com>
+ for this suggestion.
+
Fri Mar 21 13:07:09 2003 Chad Elliott <elliott_c@ociweb.com>
* bin/MakeProjectCreator/USAGE:
diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp
index 9b2f44d9e89..eaa079e7aed 100644
--- a/ace/Message_Queue_T.cpp
+++ b/ace/Message_Queue_T.cpp
@@ -1180,9 +1180,9 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_head (ACE_Message_Block *new_item,
if (queue_count == -1)
return -1;
- }
- this->notify ();
+ this->notify ();
+ }
return queue_count;
}
@@ -1212,8 +1212,9 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_prio (ACE_Message_Block *new_item,
if (queue_count == -1)
return -1;
+
+ this->notify ();
}
- this->notify ();
return queue_count;
}
@@ -1243,8 +1244,9 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_deadline (ACE_Message_Block *new_item,
if (queue_count == -1)
return -1;
+
+ this->notify ();
}
- this->notify ();
return queue_count;
}
@@ -1281,8 +1283,9 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_tail (ACE_Message_Block *new_item,
if (queue_count == -1)
return -1;
+
+ this->notify ();
}
- this->notify ();
return queue_count;
}