diff options
| author | Adam Mitz <mitza@ociweb.com> | 2015-11-06 17:07:11 -0600 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2015-11-06 17:07:11 -0600 |
| commit | ac5e1702c9f9bee9f1f7bfce8c1a6f3847ea6b4b (patch) | |
| tree | 0e70d1f51c39e688a05a6cdc2af58408222e4a0d /ACE/tests/Bug_3943_Regression_Test.cpp | |
| parent | 5272b5b81f92c298cb998b5bb0b0dbca3e7f29fe (diff) | |
| download | ATCD-ac5e1702c9f9bee9f1f7bfce8c1a6f3847ea6b4b.tar.gz | |
Merged branch ace-face-safety (FACE Safety Profile import from OCITAO).
Diffstat (limited to 'ACE/tests/Bug_3943_Regression_Test.cpp')
| -rw-r--r-- | ACE/tests/Bug_3943_Regression_Test.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ACE/tests/Bug_3943_Regression_Test.cpp b/ACE/tests/Bug_3943_Regression_Test.cpp index 9495d3bf57d..c0d1b0beaa7 100644 --- a/ACE/tests/Bug_3943_Regression_Test.cpp +++ b/ACE/tests/Bug_3943_Regression_Test.cpp @@ -54,6 +54,7 @@ # else # include "ace/Process_Mutex.h" typedef ACE_Process_Mutex ACCEPTOR_LOCKING; +# define CLEANUP_PROCESS_MUTEX # endif /* ACE_HAS_THREAD_SAFE_ACCEPT */ #endif /* ACE_LACKS_FORK */ @@ -1042,7 +1043,6 @@ server (void *arg) // Spawn threads and run the client and server. -static int spawn_threads (ACCEPTOR *acceptor, ACE_INET_Addr *server_addr) @@ -1103,7 +1103,9 @@ run_main (int , ACE_TCHAR *[]) int status = 0; #if defined (ACE_HAS_THREADS) # if !defined (ACE_WIN32) || ((defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || !defined (ACE_LACKS_SEND)) - // Acceptor + +# ifndef ACE_LACKS_ACCEPT + ACCEPTOR acceptor; ACE_INET_Addr server_addr; @@ -1132,6 +1134,11 @@ run_main (int , ACE_TCHAR *[]) if (!client_complete || !server_complete) status = 1; +# ifdef CLEANUP_PROCESS_MUTEX + ACE_Process_Mutex::unlink (acceptor.acceptor ().lock ().name ()); +# endif + +# endif // ACE_LACKS_ACCEPT # endif /* ACE_HAS_WINSOCK2 && (ACE_HAS_WINSOCK2 != 0)) || !ACE_LACKS_SEND */ #else /* !ACE_HAS_THREADS */ ACE_ERROR ((LM_INFO, |