diff options
Diffstat (limited to 'ACE/ace/Process_Manager.cpp')
| -rw-r--r-- | ACE/ace/Process_Manager.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/ACE/ace/Process_Manager.cpp b/ACE/ace/Process_Manager.cpp index 1884bdadc7b..7c02ed1d8f1 100644 --- a/ACE/ace/Process_Manager.cpp +++ b/ACE/ace/Process_Manager.cpp @@ -12,7 +12,7 @@ #include "ace/Process.h" #include "ace/Signal.h" #include "ace/Object_Manager.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Reactor.h" #include "ace/Countdown_Time.h" #include "ace/OS_NS_sys_wait.h" @@ -69,12 +69,12 @@ ACE_Process_Manager::Process_Descriptor::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Process_Manager::Process_Descriptor::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nproc_id_ = %d"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nproc_id_ = %d"), this->process_->getpid( ))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -84,15 +84,15 @@ ACE_Process_Manager::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Process_Manager::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmax_process_table_size_ = %d"), this->max_process_table_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_count_ = %d"), this->current_count_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmax_process_table_size_ = %d"), this->max_process_table_size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_count_ = %d"), this->current_count_)); for (size_t i = 0; i < this->current_count_; i++) this->process_table_[i].dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -259,7 +259,7 @@ ACE_Process_Manager::ACE_Process_Manager (size_t size, if (this->open (size, r) == -1) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Process_Manager"))); } @@ -382,7 +382,7 @@ ACE_Process_Manager::handle_signal (int, return -1; // remove this HANDLE/Event_Handler combination } else - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Process still active") ACE_TEXT (" -- shouldn't have been called yet!\n")), 0); // return 0 : stay registered @@ -390,7 +390,7 @@ ACE_Process_Manager::handle_signal (int, else { // <GetExitCodeProcess> failed. - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("GetExitCodeProcess failed")), -1); // return -1: unregister } @@ -881,7 +881,7 @@ ACE_Process_Manager::wait (pid_t pid, // uh oh...handle removed from process_table_, even though // we're holding a lock! delete [] handles; - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Process removed") ACE_TEXT (" -- somebody's ignoring the lock!\n")), -1); @@ -964,7 +964,7 @@ ACE_Process_Manager::wait (pid_t pid, if (idx == -1) { // oops, reaped an unmanaged process! - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) oops, reaped unmanaged %d\n"), pid)); return pid; @@ -1011,7 +1011,7 @@ ACE_Process_Manager::notify_proc_handler (size_t i, } else { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P:%t|%T) ACE_Process_Manager::notify_proc_handler:") ACE_TEXT (" unknown/unmanaged process reaped\n"))); return 0; |