diff options
| -rw-r--r-- | ACE/ChangeLog | 23 | ||||
| -rw-r--r-- | ACE/ace/Condition_T.cpp | 11 | ||||
| -rw-r--r-- | ACE/ace/Service_Config.cpp | 14 | ||||
| -rw-r--r-- | ACE/ace/Service_Config.h | 2 |
4 files changed, 36 insertions, 14 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 948cdc6cadd..6310449cce1 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,26 @@ +Wed Apr 9 02:43:37 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Dynamic_Service.inl (instance): + Adjusting interface to take a smart pointer. + + * ace/OS_NS_unistd.cpp (argv_to_string): + Adding interpretation for tabs and new line characters as + characters to trigger quoting. + + * ace/Service_Config.h: + * ace/Service_Config.cpp: + * ace/Service_Gestalt.h: + * ace/Service_Gestalt.inl: + * ace/Service_Gestalt.cpp: + * ace/Service_Repository.cpp: + Reformatting, updating comments and logging. + +Wed Apr 9 01:21:42 UTC 2008 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Condition_T.cpp (wait): Fixed a bug where the mutex + parameter wasn't being used properly if abstime was 0. Thanks + to Andriy Gapon <avg at icyb dot net dot ua> for reporting this. + Mon Apr 7 18:49:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * bin/MakeProjectCreator/docs/templates/gnu.txt: diff --git a/ACE/ace/Condition_T.cpp b/ACE/ace/Condition_T.cpp index fa0dab4e80a..e4931ce442e 100644 --- a/ACE/ace/Condition_T.cpp +++ b/ACE/ace/Condition_T.cpp @@ -96,13 +96,12 @@ ACE_Condition<MUTEX>::wait (MUTEX &mutex, { // ACE_TRACE ("ACE_Condition<MUTEX>::wait"); if (abstime == 0) - return this->wait (); + return ACE_OS::cond_wait (&this->cond_, + &mutex.lock_); else - { - return ACE_OS::cond_timedwait (&this->cond_, - &mutex.lock_, - (ACE_Time_Value *) abstime); - } + return ACE_OS::cond_timedwait (&this->cond_, + &mutex.lock_, + (ACE_Time_Value *) abstime); } // Peform an "alertable" timed wait. If the argument ABSTIME == 0 diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp index eeb4d005681..1eda39f8a8b 100644 --- a/ACE/ace/Service_Config.cpp +++ b/ACE/ace/Service_Config.cpp @@ -196,7 +196,7 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[], ignore_static_svcs, ignore_default_svc_conf_file, ignore_debug_flag); - + // Check for things we need to do on a per-process basis and which // may not be safe, or wise to do an a per instance basis @@ -337,17 +337,17 @@ ACE_Service_Config::ACE_Service_Config (bool ignore_static_svcs, int signum) { ACE_TRACE ("ACE_Service_Config::ACE_Service_Config"); - + // TODO: Need to find a more customizable way of instantiating the // gestalt but perhaps we should leave this out untill such // customizations are identified. ACE_Service_Gestalt* tmp = 0; ACE_NEW_NORETURN (tmp, ACE_Service_Gestalt (size, false, ignore_static_svcs)); - + this->instance_ = tmp; this->threadkey_.set (tmp); - + ACE_Service_Config::signum_ = signum; } @@ -355,17 +355,17 @@ ACE_Service_Config::ACE_Service_Config (const ACE_TCHAR program_name[], const ACE_TCHAR *logger_key) { ACE_TRACE ("ACE_Service_Config::ACE_Service_Config"); - + // TODO: Need to find a more customizable way of instantiating the // gestalt but perhaps we should leave this out untill such // customizations are identified. ACE_Service_Gestalt* tmp = 0; ACE_NEW_NORETURN (tmp, ACE_Service_Gestalt (ACE_Service_Repository::DEFAULT_SIZE, false)); - + this->instance_ = tmp; this->threadkey_.set (tmp); - + if (this->open (program_name, logger_key) == -1 && errno != ENOENT) { diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h index 14d505fdfdc..1ecfce042f8 100644 --- a/ACE/ace/Service_Config.h +++ b/ACE/ace/Service_Config.h @@ -546,7 +546,7 @@ protected: protected: - /// @deprecated + /// @deprecated /// Process service configuration requests that were provided on the /// command-line. Returns the number of errors that occurred. static int process_commandline_directives (void); |