diff options
| author | Steve Huston <shuston@riverace.com> | 2008-04-29 20:08:52 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2008-04-29 20:08:52 +0000 |
| commit | dfbc40ed1f90a2e23a5d96e299087405576287a8 (patch) | |
| tree | a0d61269c855f14e83f43fd1ab857bd9c54a1dac /ACE/ace/Proactor.cpp | |
| parent | 69621b550b9905c0b1e021e2631de971f1b01511 (diff) | |
| download | ATCD-dfbc40ed1f90a2e23a5d96e299087405576287a8.tar.gz | |
ChangeLogTag:Tue Apr 29 19:52:48 UTC 2008 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ACE/ace/Proactor.cpp')
| -rw-r--r-- | ACE/ace/Proactor.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp index a907ce61cae..883a567c1fb 100644 --- a/ACE/ace/Proactor.cpp +++ b/ACE/ace/Proactor.cpp @@ -112,7 +112,7 @@ ACE_Proactor_Timer_Handler::~ACE_Proactor_Timer_Handler (void) this->timer_event_.signal (); // Wait for the Timer Handler thread to exit. - this->thr_mgr ()->wait_grp (this->grp_id ()); + this->wait (); } int @@ -347,7 +347,7 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation, ACE_Proactor_Timer_Handler (*this)); // Activate <timer_handler>. - if (this->timer_handler_->activate (THR_NEW_LWP) == -1) + if (this->timer_handler_->activate () == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("%N:%l:(%P | %t):%p\n"), ACE_TEXT ("Task::activate:could not create thread\n"))); @@ -603,10 +603,9 @@ ACE_Proactor::close (void) { // Close the implementation. if (this->implementation ()->close () == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%N:%l:(%P | %t):%p\n"), - ACE_TEXT ("ACE_Proactor::close:implementation couldnt be closed")), - -1); + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("%N:%l:(%P | %t):%p\n"), + ACE_TEXT ("ACE_Proactor::close: implementation close"))); // Delete the implementation. if (this->delete_implementation_) |