diff options
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 19 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 19 | ||||
| -rw-r--r-- | ace/Message_Queue_T.cpp | 9 | ||||
| -rw-r--r-- | ace/Message_Queue_T.h | 2 | ||||
| -rw-r--r-- | ace/Message_Queue_T.i | 32 |
6 files changed, 77 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog index b3bf8a0d387..cc06a2f1eaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +Mon Jan 29 17:29:31 2001 Steve Huston <shuston@riverace.com> + + * ace/Message_Queue_T.{h i cpp}: Corrected a bunch of references + to Message_Queue_Ex's queue_ member to use . rather than -> + and removed the ACE_NEW to allocate it (follow-ups from Doug's + Sun Jan 28 08:32:07 2001 change. Fixed other compile + errors to allow tests/Message_Queue_Test_Ex.cpp to build. + FYI... whomever added this, it probably should have been named + Message_Queue_Ex_Test to conform. + +Mon Jan 29 15:30:27 2001 Steve Huston <shuston@riverace.com> + + * ace/POSIX_Proactor.{h cpp} (ACE_POSIX_SIG_Proactor): Don't + mask/block all signals, just the one(s) being used for this + sig proactor instance. Blocking everything can break other + things, such as debuggers and the ability to kill a program. + Also, don't setup a handler for the signals being blocked/waited + as this is a combination whose behavior is undefined. + Sun Jan 28 08:39:17 2001 Carlos O'Ryan <coryan@uci.edu> * tests/Thread_Mutex_Test.cpp: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index b3bf8a0d387..cc06a2f1eaa 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,22 @@ +Mon Jan 29 17:29:31 2001 Steve Huston <shuston@riverace.com> + + * ace/Message_Queue_T.{h i cpp}: Corrected a bunch of references + to Message_Queue_Ex's queue_ member to use . rather than -> + and removed the ACE_NEW to allocate it (follow-ups from Doug's + Sun Jan 28 08:32:07 2001 change. Fixed other compile + errors to allow tests/Message_Queue_Test_Ex.cpp to build. + FYI... whomever added this, it probably should have been named + Message_Queue_Ex_Test to conform. + +Mon Jan 29 15:30:27 2001 Steve Huston <shuston@riverace.com> + + * ace/POSIX_Proactor.{h cpp} (ACE_POSIX_SIG_Proactor): Don't + mask/block all signals, just the one(s) being used for this + sig proactor instance. Blocking everything can break other + things, such as debuggers and the ability to kill a program. + Also, don't setup a handler for the signals being blocked/waited + as this is a combination whose behavior is undefined. + Sun Jan 28 08:39:17 2001 Carlos O'Ryan <coryan@uci.edu> * tests/Thread_Mutex_Test.cpp: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index b3bf8a0d387..cc06a2f1eaa 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,22 @@ +Mon Jan 29 17:29:31 2001 Steve Huston <shuston@riverace.com> + + * ace/Message_Queue_T.{h i cpp}: Corrected a bunch of references + to Message_Queue_Ex's queue_ member to use . rather than -> + and removed the ACE_NEW to allocate it (follow-ups from Doug's + Sun Jan 28 08:32:07 2001 change. Fixed other compile + errors to allow tests/Message_Queue_Test_Ex.cpp to build. + FYI... whomever added this, it probably should have been named + Message_Queue_Ex_Test to conform. + +Mon Jan 29 15:30:27 2001 Steve Huston <shuston@riverace.com> + + * ace/POSIX_Proactor.{h cpp} (ACE_POSIX_SIG_Proactor): Don't + mask/block all signals, just the one(s) being used for this + sig proactor instance. Blocking everything can break other + things, such as debuggers and the ability to kill a program. + Also, don't setup a handler for the signals being blocked/waited + as this is a combination whose behavior is undefined. + Sun Jan 28 08:39:17 2001 Carlos O'Ryan <coryan@uci.edu> * tests/Thread_Mutex_Test.cpp: diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp index 7c35ce29933..99552d797c2 100644 --- a/ace/Message_Queue_T.cpp +++ b/ace/Message_Queue_T.cpp @@ -54,12 +54,9 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::ACE_Message_Queue_Ex (siz { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::ACE_Message_Queue_Ex"); - ACE_NEW (this->queue_, - ACE_Message_Queue<ACE_SYNCH>); - - if (this->open (hwm, lwm, ns) == -1) + if (this->queue_.open (hwm, lwm, ns) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("open"))); + ACE_TEXT ("ACE_Message_Queue_Ex"))); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> @@ -75,7 +72,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::open (size_t hwm, { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::open"); - return this->queue_.open (hwm, lwm, hs); + return this->queue_.open (hwm, lwm, ns); } // Clean up the queue if we have not already done so! diff --git a/ace/Message_Queue_T.h b/ace/Message_Queue_T.h index 66a73d02a09..5d4117f4b89 100644 --- a/ace/Message_Queue_T.h +++ b/ace/Message_Queue_T.h @@ -1031,7 +1031,7 @@ public: private: /// Implement this via an <ACE_Message_Queue>. - ACE_Message_Queue<ACE_SYNCH> queue_; + ACE_Message_Queue<ACE_SYNCH_DECL> queue_; }; #if defined (__ACE_INLINE__) diff --git a/ace/Message_Queue_T.i b/ace/Message_Queue_T.i index 69f7f8dcd5e..7250dc9ddd2 100644 --- a/ace/Message_Queue_T.i +++ b/ace/Message_Queue_T.i @@ -173,7 +173,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dequeue (ACE_MESSAGE_TYPE { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::notification_strategy"); - return queue_->dequeue (first_item, timeout); + return this->queue_.dequeue (first_item, timeout); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> ACE_INLINE ACE_Notification_Strategy * @@ -181,7 +181,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::notification_strategy (vo { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::notification_strategy"); - return queue_->notification_strategy (); + return this->queue_.notification_strategy (); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> ACE_INLINE void @@ -189,7 +189,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::notification_strategy (AC { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::notification_strategy"); - queue_->notification_strategy (s); + this->queue_.notification_strategy (s); } // Check if queue is empty (holds locks). @@ -199,7 +199,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::is_empty (void) { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::is_empty"); - return queue_->is_empty (); + return this->queue_.is_empty (); } // Check if queue is full (holds locks). @@ -209,7 +209,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::is_full (void) { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::is_full"); - return queue_->is_full (); + return this->queue_.is_full (); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> ACE_INLINE size_t @@ -217,7 +217,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::high_water_mark (void) { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::high_water_mark"); - return queue_->high_water_mark (); + return this->queue_.high_water_mark (); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> ACE_INLINE void @@ -225,7 +225,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::high_water_mark (size_t h { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::high_water_mark"); - queue_->high_water_mark (hwm); + this->queue_.high_water_mark (hwm); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> ACE_INLINE size_t @@ -233,7 +233,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::low_water_mark (void) { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::low_water_mark"); - return queue_->low_water_mark (); + return this->queue_.low_water_mark (); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> ACE_INLINE void @@ -241,7 +241,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::low_water_mark (size_t lw { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::low_water_mark"); - queue_->low_water_mark (lwm); + this->queue_.low_water_mark (lwm); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> ACE_INLINE size_t @@ -249,7 +249,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::message_bytes (void) { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::message_bytes"); - return queue_->message_bytes (); + return this->queue_.message_bytes (); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> ACE_INLINE size_t @@ -257,7 +257,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::message_length (void) { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::message_length"); - return queue_->message_length (); + return this->queue_.message_length (); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> ACE_INLINE size_t @@ -265,7 +265,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::message_count (void) { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::message_count"); - return queue_->message_count (); + return this->queue_.message_count (); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> ACE_INLINE int @@ -273,7 +273,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::activate (void) { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::activate"); - return queue_->activate (); + return this->queue_.activate (); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> ACE_INLINE int @@ -281,7 +281,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::deactivate (void) { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::deactivate"); - return queue_->deactivate (); + return this->queue_.deactivate (); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> ACE_INLINE int @@ -289,7 +289,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::deactivated (void) { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::deactivated"); - return queue_->deactivated (); + return this->queue_.deactivated (); } #if 0 @@ -298,6 +298,6 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::deactivated (void) template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> ACE_INLINE ACE_SYNCH_MUTEX_T & ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::lock (void) { - return queue_->lock (); + return this->queue_.lock (); } #endif /* 0 */ |