diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-08-12 07:21:55 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-08-12 07:21:55 +0000 |
| commit | b750f508b1bc81baf70bc461b506441a80b43b92 (patch) | |
| tree | 89d325e9f66a9e7a4f678542954f997260ae0fce | |
| parent | 8cd2c92c6719ac0aca63e627b4e49e6c78d70716 (diff) | |
| download | ATCD-b750f508b1bc81baf70bc461b506441a80b43b92.tar.gz | |
ChangeLogTag:Sun Aug 12 02:17:01 2001 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | ace/MEM_Acceptor.cpp | 4 | ||||
| -rw-r--r-- | ace/MEM_Connector.cpp | 4 |
5 files changed, 22 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index d66eae85caf..b0b3270c854 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Aug 12 02:17:01 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/MEM_Acceptor.cpp: + * ace/MEM_Connector.cpp: On non-Win32 platforms, disable + multithreaded MEM_IO if _ACE_USE_SV_SEM is defined. + Sun Aug 12 01:27:51 2001 Steve Huston <shuston@riverace.com> * tests/Log_Msg_Test.cpp: Correct const-ness of a pointer diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index d66eae85caf..b0b3270c854 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Sun Aug 12 02:17:01 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/MEM_Acceptor.cpp: + * ace/MEM_Connector.cpp: On non-Win32 platforms, disable + multithreaded MEM_IO if _ACE_USE_SV_SEM is defined. + Sun Aug 12 01:27:51 2001 Steve Huston <shuston@riverace.com> * tests/Log_Msg_Test.cpp: Correct const-ness of a pointer diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index d66eae85caf..b0b3270c854 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Sun Aug 12 02:17:01 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/MEM_Acceptor.cpp: + * ace/MEM_Connector.cpp: On non-Win32 platforms, disable + multithreaded MEM_IO if _ACE_USE_SV_SEM is defined. + Sun Aug 12 01:27:51 2001 Steve Huston <shuston@riverace.com> * tests/Log_Msg_Test.cpp: Correct const-ness of a pointer diff --git a/ace/MEM_Acceptor.cpp b/ace/MEM_Acceptor.cpp index 76188b97c9f..0124fca8836 100644 --- a/ace/MEM_Acceptor.cpp +++ b/ace/MEM_Acceptor.cpp @@ -158,12 +158,12 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream, // Tell the client side what level of signaling strategy // we support. ACE_INT16 client_signaling = -#if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM) || defined (ACE_PSOS) +#if defined (ACE_WIN32) || !defined (_ACE_USE_SV_SEM) this->preferred_strategy_; #else // We don't support MT. ACE_MEM_IO::Reactive; -#endif /* ACE_WIN32 || ACE_HAS_POSIX_SEM || ACE_PSOS */ +#endif /* ACE_WIN32 || !_ACE_USE_SV_SEM */ if (ACE::send (new_handle, &client_signaling, sizeof (ACE_INT16)) == -1) ACE_ERROR_RETURN ((LM_DEBUG, diff --git a/ace/MEM_Connector.cpp b/ace/MEM_Connector.cpp index af4394603c9..7bb45a1ba0c 100644 --- a/ace/MEM_Connector.cpp +++ b/ace/MEM_Connector.cpp @@ -108,10 +108,10 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, -1); // If either side don't support MT, we will not use it. -#if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM) || defined (ACE_PSOS) +#if defined (ACE_WIN32) || !defined (_ACE_USE_SV_SEM) if (! (this->preferred_strategy_ == ACE_MEM_IO::MT && server_strategy == ACE_MEM_IO::MT)) -#endif /* ACE_WIN32 || ACE_HAS_POSIX_SEM || ACE_PSOS */ +#endif /* ACE_WIN32 || !_ACE_USE_SV_SEM */ server_strategy = ACE_MEM_IO::Reactive; if (ACE::send (new_handle, &server_strategy, |