ChangeLogTag:Thu Jul 19 22:39:32 2001 Nanbor Wang <nanbor@cs.wustl.edu>

7 files changed, 39 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 7db08885321..b5becc293e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jul 19 22:39:32 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* tests/MEM_Stream_Test.cpp:
+	* ace/MEM_IO.h:
+	* ace/MEM_IO.i:
+	* ace/MEM_IO.cpp: On non-Win32 platforms, disable multithreaded
+	  MEM_IO if _ACE_USE_SV_SEM is defined.
+
 Thu Jul 19 15:25:11 2001  Paul Calabrese  <calabrese_p@ociweb.com>
 
 	* ace/MEM_Acceptor.i (mmap_prefix):
@@ -36,7 +44,7 @@ Wed Jul 18 13:15:06 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 	* ace/Malloc_T.i (release): Removed an unnecessary "else" to
 	  make gcc 2.96 happy.  Thanks to Frank Wolf <fwolf@gum.de> for
  	  reporting this.
-  
+
         * Happy birthday to me and Angelo Corsaro!
 
 Tue Jul 17 00:34:40 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 7db08885321..b5becc293e1 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Thu Jul 19 22:39:32 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* tests/MEM_Stream_Test.cpp:
+	* ace/MEM_IO.h:
+	* ace/MEM_IO.i:
+	* ace/MEM_IO.cpp: On non-Win32 platforms, disable multithreaded
+	  MEM_IO if _ACE_USE_SV_SEM is defined.
+
 Thu Jul 19 15:25:11 2001  Paul Calabrese  <calabrese_p@ociweb.com>
 
 	* ace/MEM_Acceptor.i (mmap_prefix):
@@ -36,7 +44,7 @@ Wed Jul 18 13:15:06 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 	* ace/Malloc_T.i (release): Removed an unnecessary "else" to
 	  make gcc 2.96 happy.  Thanks to Frank Wolf <fwolf@gum.de> for
  	  reporting this.
-  
+
         * Happy birthday to me and Angelo Corsaro!
 
 Tue Jul 17 00:34:40 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 7db08885321..b5becc293e1 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,11 @@
+Thu Jul 19 22:39:32 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* tests/MEM_Stream_Test.cpp:
+	* ace/MEM_IO.h:
+	* ace/MEM_IO.i:
+	* ace/MEM_IO.cpp: On non-Win32 platforms, disable multithreaded
+	  MEM_IO if _ACE_USE_SV_SEM is defined.
+
 Thu Jul 19 15:25:11 2001  Paul Calabrese  <calabrese_p@ociweb.com>
 
 	* ace/MEM_Acceptor.i (mmap_prefix):
@@ -36,7 +44,7 @@ Wed Jul 18 13:15:06 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 	* ace/Malloc_T.i (release): Removed an unnecessary "else" to
 	  make gcc 2.96 happy.  Thanks to Frank Wolf <fwolf@gum.de> for
  	  reporting this.
-  
+
         * Happy birthday to me and Angelo Corsaro!
 
 Tue Jul 17 00:34:40 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
diff --git a/ace/MEM_IO.cpp b/ace/MEM_IO.cpp
index 5d49427fa88..fc2070dced9 100644
--- a/ace/MEM_IO.cpp
+++ b/ace/MEM_IO.cpp
@@ -88,7 +88,7 @@ ACE_Reactive_MEM_IO::send_buf (ACE_MEM_SAP_Node *buf,
   return buf->size ();
 }
 
-#if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM) || defined (ACE_PSOS)
+#if defined (ACE_WIN32) || !defined (_ACE_USE_SV_SEM)
 int
 ACE_MT_MEM_IO::Simple_Queue::write (ACE_MEM_SAP_Node *new_node)
 {
@@ -304,7 +304,7 @@ ACE_MT_MEM_IO::send_buf (ACE_MEM_SAP_Node *buf,
 
   return buf->size ();
 }
-#endif /* ACE_WIN32 || ACE_HAS_POSIX_SEM || ACE_PSOS */
+#endif /* ACE_WIN32 || !_ACE_USE_SV_SEM */
 
 void
 ACE_MEM_IO::dump (void) const
@@ -328,13 +328,13 @@ ACE_MEM_IO::init (const ACE_TCHAR *name,
                       ACE_Reactive_MEM_IO (),
                       -1);
       break;
-#if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM) || defined (ACE_PSOS)
+#if defined (ACE_WIN32) || !defined (_ACE_USE_SV_SEM)
     case ACE_MEM_IO::MT:
       ACE_NEW_RETURN (this->deliver_strategy_,
                       ACE_MT_MEM_IO (),
                       -1);
       break;
-#endif /* ACE_WIN32 || ACE_HAS_POSIX_SEM || ACE_PSOS */
+#endif /* ACE_WIN32 || !_ACE_USE_SV_SEM */
     default:
       return -1;
     }
diff --git a/ace/MEM_IO.h b/ace/MEM_IO.h
index 312ccc85473..101f41e6256 100644
--- a/ace/MEM_IO.h
+++ b/ace/MEM_IO.h
@@ -67,7 +67,7 @@ public:
   ssize_t get_buf_len (const off_t off, ACE_MEM_SAP_Node *&buf);
 };
 
-#if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM) || defined (ACE_PSOS)
+#if defined (ACE_WIN32) || !defined (_ACE_USE_SV_SEM)
 class ACE_Export ACE_MT_MEM_IO : public ACE_MEM_SAP
 {
 public:
@@ -132,7 +132,7 @@ private:
   Channel recv_channel_;
   Channel send_channel_;
 };
-#endif /* ACE_WIN32 || ACE_HAS_POSIX_SEM || ACE_PSOS */
+#endif /* ACE_WIN32 || !_ACE_USE_SV_SEM */
 
 /**
  * @class ACE_MEM_IO
diff --git a/ace/MEM_IO.i b/ace/MEM_IO.i
index 50bf21cd529..796121a6c6e 100644
--- a/ace/MEM_IO.i
+++ b/ace/MEM_IO.i
@@ -8,7 +8,7 @@ ACE_Reactive_MEM_IO::ACE_Reactive_MEM_IO ()
 {
 }
 
-#if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM) || defined (ACE_PSOS)
+#if defined (ACE_WIN32) || !defined (_ACE_USE_SV_SEM)
 ASYS_INLINE
 ACE_MT_MEM_IO::Simple_Queue::Simple_Queue (void)
   : mq_ (0),
@@ -43,7 +43,7 @@ ACE_MT_MEM_IO::Simple_Queue::init (MQ_Struct *mq,
   this->malloc_ = malloc;
   return 0;
 }
-#endif /* ACE_WIN32 || ACE_HAS_POSIX_SEM || ACE_PSOS */
+#endif /* ACE_WIN32 || !_ACE_USE_SV_SEM */
 
 ASYS_INLINE ssize_t
 ACE_Reactive_MEM_IO::get_buf_len (const off_t off, ACE_MEM_SAP_Node *&buf)
diff --git a/tests/MEM_Stream_Test.cpp b/tests/MEM_Stream_Test.cpp
index d7e05cb349d..4811bde511b 100644
--- a/tests/MEM_Stream_Test.cpp
+++ b/tests/MEM_Stream_Test.cpp
@@ -35,13 +35,13 @@ ACE_RCSID(tests, MEM_Stream_Test, "$Id$")
 #include "MEM_Stream_Test.h"         // Defines Echo_Handler
 
 #define NO_OF_REACTIVE_CONNECTION 3
-#if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM) || defined (ACE_PSOS)
+#if defined (ACE_WIN32) || !defined (_ACE_USE_SV_SEM)
 # define NO_OF_MT_CONNECTION 3
 #else
   // We will use SysV Semaphore in this case which is not very scalable
   // and can only handle one connection.
 # define NO_OF_MT_CONNECTION 1
-#endif /* ACE_WIN32 || ACE_HAS_POSIX_SEM || ACE_PSOS */
+#endif /* ACE_WIN32 || !_ACE_USE_SV_SEM */
 
 #define NO_OF_ITERATION 100
 
@@ -347,10 +347,10 @@ main (int, ACE_TCHAR *[])
   ACE_Reactor::instance ()->reset_event_loop ();
 
 
-#if !defined (ACE_WIN32) && !defined (ACE_HAS_POSIX_SEM) && !defined (ACE_PSOS)
+#if !defined (ACE_WIN32) && defined (_ACE_USE_SV_SEM)
   ACE_ERROR ((LM_WARNING,
               ACE_TEXT ("\n *** Platform only support non-scalable SysV semaphores ***\n\n")));
-#endif /* !ACE_WIN32 && !ACE_HAS_POSIX_SEM && !ACE_PSOS */
+#endif /* !ACE_WIN32 && _ACE_USE_SV_SEM */
 
   reset_handler (NO_OF_MT_CONNECTION);