diff options
| -rw-r--r-- | ChangeLog-98b | 8 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | ace/Synch.h | 5 | ||||
| -rw-r--r-- | tests/Message_Queue_Notifications_Test.cpp | 12 |
4 files changed, 19 insertions, 8 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b index 4746d11cd33..6528f7e51f5 100644 --- a/ChangeLog-98b +++ b/ChangeLog-98b @@ -1,7 +1,11 @@ Sat Aug 22 13:24:00 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - * tests/Message_Queue_Notifications_Test.cpp (main): Cleaned up - the formatting a bit. + * tests/Message_Queue_Notifications_Test.cpp: Surrounded the + ACE_Barrier with conditional compilations for ACE_HAS_THREADS. + Thanks to Ganesh Pai <gpai@voicetek.com> for reporting this. + + * tests/Message_Queue_Notifications_Test.cpp: Cleaned up the + formatting a bit. * tests: Renamed MsgQueue_Notifications_Test.{cpp,bpr,dsp} to Message_Queue_Notifications_Test.{cpp,bpr,dsp} to be more @@ -443,7 +443,7 @@ Rich Christy <rchristy@cccis.com> Satoshi Ueno <satoshi.ueno@gs.com> Eugene R. Somdahl <gene@endo.com> Robert Head <rhead@mail.virtc.com> -Ivan Murphy <Ivan.Murphy@med.siemens.de +Ivan Murphy <Ivan.Murphy@med.siemens.de> Jan Perman <jan.perman@osd.uab.ericsson.se> Shankar Krishnamoorthy <kshankar@lucent.com> Reza Roodsari <reza@sprynet.com> diff --git a/ace/Synch.h b/ace/Synch.h index 59e395a9aa5..6ff48eca1ef 100644 --- a/ace/Synch.h +++ b/ace/Synch.h @@ -1448,9 +1448,12 @@ class ACE_Guard; class ACE_Export ACE_Guard<ACE_Null_Mutex> { // = TITLE + // Template specialization of <ACE_Guard> for the + // <ACE_Null_Mutex>. // // = DESCRIPTION - // + // This specialization is useful since it helps to speedup + // performance of the "Null_Mutex" considerably. public: // = Initialization and termination methods. ACE_Guard (ACE_Null_Mutex &) {} diff --git a/tests/Message_Queue_Notifications_Test.cpp b/tests/Message_Queue_Notifications_Test.cpp index aa8bd6d5226..c5f7fadcc06 100644 --- a/tests/Message_Queue_Notifications_Test.cpp +++ b/tests/Message_Queue_Notifications_Test.cpp @@ -88,8 +88,8 @@ private: const size_t hwm_; const size_t lwm_; ACE_Atomic_Op <ACE_SYNCH_MUTEX, int> role_; - ACE_Barrier mq_full_; - ACE_Barrier mq_low_water_mark_hit_; + ACE_MT (ACE_Barrier mq_full_); + ACE_MT (ACE_Barrier mq_low_water_mark_hit_); }; Message_Handler::Message_Handler (ACE_Reactor &reactor) @@ -183,8 +183,10 @@ Watermark_Test::Watermark_Test (void) hwm_ (this->len_ * default_high_water_mark), lwm_ (this->len_ * default_low_water_mark), role_ (0), +#if defined (ACE_HAS_THREADS) mq_full_ (worker_threads), mq_low_water_mark_hit_ (worker_threads) +#endif /* ACE_HAS_THREADS */ { this->water_marks (ACE_IO_Cntl_Msg::SET_LWM, this->lwm_); @@ -207,7 +209,8 @@ Watermark_Test::producer (void) } ACE_DEBUG ((LM_DEBUG, "(%P|%t) Producer: High water mark hit ---- \n")); - this->mq_full_.wait (); + + ACE_MT (this->mq_full_.wait ()); // The following put_message should block until the message queue // has dropped under the lwm. @@ -229,7 +232,8 @@ Watermark_Test::producer (void) int Watermark_Test::consumer (void) { - this->mq_full_.wait (); + ACE_MT (this->mq_full_.wait ()); + ACE_OS::sleep (1); // Let producer proceed and block in putq. |