diff options
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/tests/Bug_3943_Regression_Test.cpp | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index a70417fe40a..b4f664f4f02 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Sat Apr 9 12:56:05 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com> + + * tests/Bug_3943_Regression_Test.cpp: + + Scoreboard cleanup. + Sat Apr 9 08:29:15 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * ace/config-qnx.h: diff --git a/ACE/tests/Bug_3943_Regression_Test.cpp b/ACE/tests/Bug_3943_Regression_Test.cpp index 4043d01cb2c..4165b80c6b3 100644 --- a/ACE/tests/Bug_3943_Regression_Test.cpp +++ b/ACE/tests/Bug_3943_Regression_Test.cpp @@ -236,7 +236,7 @@ namespace { private: enum Direction { READ, WRITE }; - bool wait(Direction direction); + bool wait_for_completion(Direction direction); ssize_t send (IovecGuard& iovec_array, const ACE_TCHAR * const send_desc, @@ -592,7 +592,7 @@ Svc_Handler::send_data (void) send_desc = ACE_TEXT ("indicating no more messages"); this->send(FINISHED_CHAR, send_desc); - this->wait(READ); + this->wait_for_completion(READ); if (close () == -1) { ACE_ERROR ((LM_ERROR, @@ -809,7 +809,7 @@ Svc_Handler::recv_data (void) for (;;) { - if (!wait(READ)) + if (!this->wait_for_completion(READ)) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("select"))); @@ -920,7 +920,7 @@ Svc_Handler::recv_data (void) } bool -Svc_Handler::wait(Direction direction) +Svc_Handler::wait_for_completion(Direction direction) { ACE_SOCK_Stream &new_stream = this->peer (); @@ -1091,7 +1091,7 @@ spawn_threads (ACCEPTOR *acceptor, ACE_TEXT ("maximum wait time of %d msec exceeded\n"), max_wait.msec ())); else - ACE_OS::perror (ACE_TEXT ("wait")); + ACE_OS::perror (ACE_TEXT ("ACE_Thread_Manager::wait")); status = -1; } |