diff options
| author | wolff1 <wolff1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-02-23 21:33:57 +0000 |
|---|---|---|
| committer | wolff1 <wolff1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-02-23 21:33:57 +0000 |
| commit | a10286c7bf3faf525feb22a40852a10644666fec (patch) | |
| tree | ae59833feb0069d74a932c0b86bbd4da04dfc7e2 /ACE/ace/Process_Manager.cpp | |
| parent | 21bd6c21eb3346a10e81be73857e45ed241ceca3 (diff) | |
| download | ATCD-a10286c7bf3faf525feb22a40852a10644666fec.tar.gz | |
merge in changes from trunk/ACE revisions 83248 - 84587
Diffstat (limited to 'ACE/ace/Process_Manager.cpp')
| -rw-r--r-- | ACE/ace/Process_Manager.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/ACE/ace/Process_Manager.cpp b/ACE/ace/Process_Manager.cpp index 369584cf4b4..f7e6b7897b0 100644 --- a/ACE/ace/Process_Manager.cpp +++ b/ACE/ace/Process_Manager.cpp @@ -19,6 +19,7 @@ #include "ace/OS_NS_signal.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_time.h" +#include "ace/os_include/os_typeinfo.h" #include "ace/Truncate.h" ACE_RCSID (ace, @@ -131,11 +132,13 @@ ACE_Process_Manager::instance (void) #if defined ACE_HAS_SIG_C_FUNC ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_, ACE_Process_Manager_cleanup, - 0); + 0, + typeid (*ACE_Process_Manager::instance_).name ()); #else ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_, ACE_Process_Manager::cleanup, - 0); + 0, + typeid (*ACE_Process_Manager::instance_).name ()); #endif /* ACE_HAS_SIG_C_FUNC */ } @@ -162,11 +165,13 @@ ACE_Process_Manager::instance (ACE_Process_Manager *tm) #if defined ACE_HAS_SIG_C_FUNC ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_, ACE_Process_Manager_cleanup, - 0); + 0, + typeid (*ACE_Process_Manager::instance_).name ()); #else ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_, ACE_Process_Manager::cleanup, - 0); + 0, + typeid (*ACE_Process_Manager::instance_).name ()); #endif /* ACE_HAS_SIG_C_FUNC */ ACE_Process_Manager::instance_ = tm; @@ -427,7 +432,7 @@ ACE_Process_Manager::spawn (ACE_Process_Options &options, ACE_Managed_Process, ACE_INVALID_PID); - pid_t const pid = spawn (process, options, event_handler); + pid_t const pid = this->spawn (process, options, event_handler); if (pid == ACE_INVALID_PID || pid == 0) delete process; @@ -686,7 +691,7 @@ ACE_Process_Manager::find_proc (pid_t pid) { ACE_TRACE ("ACE_Process_Manager::find_proc"); - for (size_t i = 0; i < this->current_count_; ++i) + for (size_t i = 0; i < this->current_count_; ++i) { if (pid == this->process_table_[i].process_->getpid ()) { @@ -841,7 +846,7 @@ ACE_Process_Manager::wait (pid_t pid, // WAIT_OBJECT_0 is a pointless comparison because // WAIT_OBJECT_0 is zero and DWORD is unsigned long, so this // test is skipped for Green Hills. Same for mingw. -# if defined (ghs) || defined (__MINGW32__) || (defined (_MSC_VER) && _MSC_VER >= 1300) +# if defined (ghs) || defined (__MINGW32__) || defined (_MSC_VER) ACE_ASSERT (result < WAIT_OBJECT_0 + this->current_count_); # else ACE_ASSERT (result >= WAIT_OBJECT_0 |