diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-17 04:04:44 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-17 04:04:44 +0000 |
| commit | 2e413354c797bb9f1e12d6e2297c347c92c27dc0 (patch) | |
| tree | 8a9b4fd2e49f774b808513e3ddc1f96c532d6717 | |
| parent | 0466b3f531afbc5a44a985fa12edf7977b390ad8 (diff) | |
| download | ATCD-pace_removal.tar.gz | |
ChangeLogTag:Wed Jul 17 03:50:56 UTC 2002 Don Hinton <dhinton@objectsciences.com>pace_removal
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 16 | ||||
| -rw-r--r-- | ace/ACE.cpp | 19 | ||||
| -rw-r--r-- | ace/OS.cpp | 446 | ||||
| -rw-r--r-- | ace/OS.h | 161 | ||||
| -rw-r--r-- | ace/OS.i | 1128 | ||||
| -rw-r--r-- | ace/OS_Dirent.inl | 51 | ||||
| -rw-r--r-- | ace/OS_Memory.h | 59 | ||||
| -rw-r--r-- | ace/OS_String.inl | 150 | ||||
| -rw-r--r-- | ace/Thread_Manager.cpp | 10 | ||||
| -rw-r--r-- | ace/WFMO_Reactor.cpp | 7 | ||||
| -rw-r--r-- | ace/config-all.h | 7 | ||||
| -rw-r--r-- | ace/config-win32-borland.h | 6 | ||||
| -rw-r--r-- | ace/config-win32-msvc-5.h | 6 | ||||
| -rw-r--r-- | ace/config-win32-msvc-6.h | 6 |
15 files changed, 446 insertions, 1642 deletions
diff --git a/ChangeLog b/ChangeLog index 7b1ae980a56..d534e7ab6d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +Wed Jul 17 03:50:56 UTC 2002 Don Hinton <dhinton@objectsciences.com> + + * ace/ACE.cpp: + * ace/OS.{h,i,cpp}: + * ace/OS_Dirent.inl: + * ace/OS_Memory.h + * ace/OS_String.inl: + * ace/Thread_Manager.cpp: + * ace/WFMO_Reactor.cpp: + * ace/config-all.h: + * ace/config-win32-borland.h: + * ace/config-win32-msvc-5.h: + * ace/config-win32-msvc-6.h: + + Removed PACE. + Sat Jul 13 13:31:54 2002 Balachandran Natarajan <bala@cs.wustl.edu> * bin/auto_run_tests.lst: Added the Stack_Recursion test to the diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 7b1ae980a56..d534e7ab6d1 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,19 @@ +Wed Jul 17 03:50:56 UTC 2002 Don Hinton <dhinton@objectsciences.com> + + * ace/ACE.cpp: + * ace/OS.{h,i,cpp}: + * ace/OS_Dirent.inl: + * ace/OS_Memory.h + * ace/OS_String.inl: + * ace/Thread_Manager.cpp: + * ace/WFMO_Reactor.cpp: + * ace/config-all.h: + * ace/config-win32-borland.h: + * ace/config-win32-msvc-5.h: + * ace/config-win32-msvc-6.h: + + Removed PACE. + Sat Jul 13 13:31:54 2002 Balachandran Natarajan <bala@cs.wustl.edu> * bin/auto_run_tests.lst: Added the Stack_Recursion test to the diff --git a/ace/ACE.cpp b/ace/ACE.cpp index e296346cec0..2ae61ece33d 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -173,9 +173,7 @@ ACE::select (int width, int ACE::terminate_process (pid_t pid) { -#if defined (ACE_HAS_PACE) - return pace_kill (pid, 9); -#elif defined (ACE_HAS_PHARLAP) +#if defined (ACE_HAS_PHARLAP) ACE_UNUSED_ARG (pid); ACE_NOTSUP_RETURN (-1); #elif defined (ACE_WIN32) @@ -211,22 +209,13 @@ ACE::terminate_process (pid_t pid) return -1; #else return ACE_OS::kill (pid, 9); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_PHARLAP */ } int ACE::process_active (pid_t pid) { -#if defined (ACE_HAS_PACE) - int retval = pace_kill (pid, 0); - - if (retval == 0) - return 1; - else if (errno == ESRCH) - return 0; - else - return -1; -#elif !defined(ACE_WIN32) +#if !defined(ACE_WIN32) int retval = ACE_OS::kill (pid, 0); if (retval == 0) @@ -254,7 +243,7 @@ ACE::process_active (pid_t pid) ::CloseHandle (process_handle); return result; } -#endif /* ACE_HAS_PACE */ +#endif /* !ACE_WIN32 */ } const ACE_TCHAR * diff --git a/ace/OS.cpp b/ace/OS.cpp index 9643d536fdf..0549f898018 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -834,10 +834,7 @@ void ACE_OS::mutex_lock_cleanup (void *mutex) { ACE_OS_TRACE ("ACE_OS::mutex_lock_cleanup"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - pace_pthread_mutex_t *p_lock = (pace_pthread_mutex_t *) mutex; - pace_pthread_mutex_unlock (p_lock); -# elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) ACE_mutex_t *p_lock = (ACE_mutex_t *) mutex; ACE_OS::mutex_unlock (p_lock); @@ -846,7 +843,7 @@ ACE_OS::mutex_lock_cleanup (void *mutex) # endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (mutex); -# endif /* ACE_HAS_PACE && !ACE_WIN32 */ +# endif /* ACE_HAS_THREADS */ } #if defined (ACE_USES_WCHAR) @@ -941,11 +938,7 @@ ACE_OS::fprintf (FILE *fp, const char *format, ...) int result = 0; va_list ap; va_start (ap, format); -#if defined (ACE_HAS_PACE) - ACE_OSCALL (::pace_vfprintf (fp, format, ap), int, -1, result); -#else ACE_OSCALL (::vfprintf (fp, format, ap), int, -1, result); -#endif /* ACE_HAS_PACE */ va_end (ap); return result; } @@ -980,11 +973,7 @@ ACE_OS::printf (const char *format, ...) int result; va_list ap; va_start (ap, format); -#if defined (ACE_HAS_PACE) - ACE_OSCALL (::pace_vprintf (format, ap), int, -1, result); -#else ACE_OSCALL (::vprintf (format, ap), int, -1, result); -#endif /* ACE_HAS_PACE */ va_end (ap); return result; } @@ -997,11 +986,7 @@ ACE_OS::sprintf (char *buf, const char *format, ...) int result; va_list ap; va_start (ap, format); -#if defined (ACE_HAS_PACE) - ACE_OSCALL (ACE_SPRINTF_ADAPTER (::pace_vsprintf (buf, format, ap)), int, -1, result); -#else ACE_OSCALL (ACE_SPRINTF_ADAPTER (::vsprintf (buf, format, ap)), int, -1, result); -#endif /* ACE_HAS_PACE */ va_end (ap); return result; } @@ -1035,9 +1020,6 @@ char * ACE_OS::gets (char *str, int n) { ACE_OS_TRACE ("ACE_OS::gets"); -#if defined (ACE_HAS_PACE) - return pace_fgets (str, n, stdin); -#else int c; char *s = str; @@ -1066,7 +1048,6 @@ ACE_OS::gets (char *str, int n) if (s) *s = '\0'; return (c == EOF) ? 0 : str; -#endif /* ACE_HAS_PACE */ } int @@ -1277,46 +1258,7 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, ACE_id_t id) { ACE_OS_TRACE ("ACE_OS::sched_params"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_UNUSED_ARG (id); - if (sched_params.quantum () != ACE_Time_Value::zero) - { - // quantums not supported - errno = EINVAL; - return -1; - } - - // Thanks to Thilo Kielmann <kielmann@informatik.uni-siegen.de> for - // providing this code for 1003.1c PThreads. Please note that this - // has only been tested for POSIX 1003.1c threads, and may cause problems - // with other PThreads flavors! - - struct sched_param param; - param.sched_priority = sched_params.priority (); - - if (sched_params.scope () == ACE_SCOPE_PROCESS) - return pace_sched_setscheduler (0, // this process - sched_params.policy (), - ¶m) == -1 ? -1 : 0; - else if (sched_params.scope () == ACE_SCOPE_THREAD) - { - ACE_thread_t thr_id = ACE_OS::thr_self (); - return pace_pthread_setschedparam (thr_id, - sched_params.policy (), - ¶m); - } -#if defined (sun) - // We need to be able to set LWP priorities on Suns, even without - // ACE_HAS_STHREADS, to obtain preemption. - else if (sched_params.scope () == ACE_SCOPE_LWP) - return ACE_OS::set_scheduling_params (sched_params, id); -#endif /* sun */ - else // sched_params.scope () == ACE_SCOPE_LWP, which isn't POSIX - { - errno = EINVAL; - return -1; - } -# elif defined (CHORUS) +# if defined (CHORUS) ACE_UNUSED_ARG (id); int result; struct sched_param param; @@ -1380,12 +1322,12 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, int, -1); # endif /* ACE_HAS_PTHREADS_DRAFT4 */ } -#if defined (sun) +# if defined (sun) // We need to be able to set LWP priorities on Suns, even without // ACE_HAS_STHREADS, to obtain preemption. else if (sched_params.scope () == ACE_SCOPE_LWP) return ACE_OS::set_scheduling_params (sched_params, id); -#endif /* sun */ +# endif /* sun */ else // sched_params.scope () == ACE_SCOPE_LWP, which isn't POSIX { errno = EINVAL; @@ -1448,11 +1390,11 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, // Set the thread priority on the current thread. return ACE_OS::thr_setprio (sched_params.priority ()); -#else +# else ACE_UNUSED_ARG (sched_params); ACE_UNUSED_ARG (id); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE && !ACE_WIN32 */ +# endif /* CHORUS */ } // = Static initialization. @@ -2469,301 +2411,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func, # define ACE_THREAD_ARGUMENT thread_args # endif /* ! defined (ACE_NO_THREAD_ADAPTER) */ -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_Base_Thread_Adapter *thread_args; - if (thread_adapter == 0) - ACE_NEW_RETURN (thread_args, - ACE_OS_Thread_Adapter (func, args, - (ACE_THR_C_FUNC) ace_thread_adapter), - -1); - else - thread_args = thread_adapter; - -# if defined (ACE_NEEDS_HUGE_THREAD_STACKSIZE) - if (stacksize < ACE_NEEDS_HUGE_THREAD_STACKSIZE) - stacksize = ACE_NEEDS_HUGE_THREAD_STACKSIZE; -# endif /* ACE_NEEDS_HUGE_THREAD_STACKSIZE */ - - ACE_thread_t tmp_thr; - - if (thr_id == 0) - thr_id = &tmp_thr; - - ACE_hthread_t tmp_handle; - if (thr_handle == 0) - thr_handle = &tmp_handle; - - int result = 0; - pace_pthread_attr_t attr; - if (::pace_pthread_attr_init (&attr) != 0) - return -1; - - if (stacksize != 0) - { - size_t size = stacksize; -# if defined (PACE_PTHREAD_STACK_MIN) - if (size < ACE_static_cast (pace_size_t, PACE_PTHREAD_STACK_MIN)) - size = PACE_PTHREAD_STACK_MIN; -# endif /* PACE_PTHREAD_STACK_MIN */ - - if (ACE_ADAPT_RETVAL(::pace_pthread_attr_setstacksize (&attr, size), result) == -1) - { - ::pace_pthread_attr_destroy (&attr); - return -1; - } - } - - // *** Set Stack Address - if (stack != 0) - { - if (::pace_pthread_attr_setstackaddr (&attr, stack) != 0) - { - ::pace_pthread_attr_destroy (&attr); - return -1; - } - } - - // *** Deal with various attributes - if (flags != 0) - { - // *** Set Detach state - if (ACE_BIT_ENABLED (flags, THR_DETACHED) - || ACE_BIT_ENABLED (flags, THR_JOINABLE)) - { - int dstate = PACE_PTHREAD_CREATE_JOINABLE; - - if (ACE_BIT_ENABLED (flags, THR_DETACHED)) - dstate = PACE_PTHREAD_CREATE_DETACHED; - if (ACE_ADAPT_RETVAL(::pace_pthread_attr_setdetachstate (&attr, dstate), - result) != 0) - { - ::pace_pthread_attr_destroy (&attr); - return -1; - } - } - - // *** Set Policy - // If we wish to set the priority explicitly, we have to enable - // explicit scheduling, and a policy, too. - if (priority != ACE_DEFAULT_THREAD_PRIORITY) - { - ACE_SET_BITS (flags, THR_EXPLICIT_SCHED); - if (ACE_BIT_DISABLED (flags, THR_SCHED_FIFO) - && ACE_BIT_DISABLED (flags, THR_SCHED_RR) - && ACE_BIT_DISABLED (flags, THR_SCHED_DEFAULT)) - ACE_SET_BITS (flags, THR_SCHED_DEFAULT); - } - - if (ACE_BIT_ENABLED (flags, THR_SCHED_FIFO) - || ACE_BIT_ENABLED (flags, THR_SCHED_RR) - || ACE_BIT_ENABLED (flags, THR_SCHED_DEFAULT)) - { - int spolicy; - -# if defined (ACE_HAS_ONLY_SCHED_OTHER) - // SunOS, thru version 5.6, only supports SCHED_OTHER. - spolicy = SCHED_OTHER; -# else - // Make sure to enable explicit scheduling, in case we didn't - // enable it above (for non-default priority). - ACE_SET_BITS (flags, THR_EXPLICIT_SCHED); - - if (ACE_BIT_ENABLED (flags, THR_SCHED_DEFAULT)) - spolicy = SCHED_OTHER; - else if (ACE_BIT_ENABLED (flags, THR_SCHED_FIFO)) - spolicy = SCHED_FIFO; -# if defined (SCHED_IO) - else if (ACE_BIT_ENABLED (flags, THR_SCHED_IO)) - spolicy = SCHED_IO; -# else - else if (ACE_BIT_ENABLED (flags, THR_SCHED_IO)) - { - errno = ENOSYS; - return -1; - } -# endif /* SCHED_IO */ - else - spolicy = SCHED_RR; - - ACE_ADAPT_RETVAL(::pace_pthread_attr_setschedpolicy (&attr, spolicy), - result); - if (result != 0) - { - ::pace_pthread_attr_destroy (&attr); - return -1; - } - } - - // *** Set Priority (use reasonable default priorities) -# if defined(ACE_HAS_PTHREADS_STD) - // If we wish to explicitly set a scheduling policy, we also - // have to specify a priority. We choose a "middle" priority as - // default. Maybe this is also necessary on other POSIX'ish - // implementations? - if ((ACE_BIT_ENABLED (flags, THR_SCHED_FIFO) - || ACE_BIT_ENABLED (flags, THR_SCHED_RR) - || ACE_BIT_ENABLED (flags, THR_SCHED_DEFAULT)) - && priority == ACE_DEFAULT_THREAD_PRIORITY) - { - if (ACE_BIT_ENABLED (flags, THR_SCHED_FIFO)) - priority = ACE_THR_PRI_FIFO_DEF; - else if (ACE_BIT_ENABLED (flags, THR_SCHED_RR)) - priority = ACE_THR_PRI_RR_DEF; - else // THR_SCHED_DEFAULT - priority = ACE_THR_PRI_OTHER_DEF; - } -# endif /* ACE_HAS_PTHREADS_STD */ - if (priority != ACE_DEFAULT_THREAD_PRIORITY) - { - pace_sched_param sparam; - ACE_OS::memset ((void *) &sparam, 0, sizeof sparam); - sparam.sched_priority = priority; -# if defined (sun) && defined (ACE_HAS_ONLY_SCHED_OTHER) - // SunOS, through 5.6, POSIX only allows priorities > 0 to - // ::pthread_attr_setschedparam. If a priority of 0 was - // requested, set the thread priority after creating it, below. - if (priority > 0) -# endif /* sun && ACE_HAS_ONLY_SCHED_OTHER */ - { - ACE_ADAPT_RETVAL(::pace_pthread_attr_setschedparam (&attr, &sparam), - result); - if (result != 0) - { - ::pace_pthread_attr_destroy (&attr); - return -1; - } - } - } - - if (ACE_BIT_ENABLED (flags, THR_INHERIT_SCHED) - || ACE_BIT_ENABLED (flags, THR_EXPLICIT_SCHED)) - { - int sched = PTHREAD_EXPLICIT_SCHED; - if (ACE_BIT_ENABLED (flags, THR_INHERIT_SCHED)) - sched = PTHREAD_INHERIT_SCHED; - if (::pace_pthread_attr_setinheritsched (&attr, sched) != 0) - { - ::pace_pthread_attr_destroy (&attr); - return -1; - } - } - - // *** Set Scope -# if !defined (ACE_LACKS_THREAD_PROCESS_SCOPING) - if (ACE_BIT_ENABLED (flags, THR_SCOPE_SYSTEM) - || ACE_BIT_ENABLED (flags, THR_SCOPE_PROCESS)) - { -# if defined (ACE_CONFIG_LINUX_H) - // LinuxThreads do not have support for PTHREAD_SCOPE_PROCESS. - int scope = PTHREAD_SCOPE_SYSTEM; -# else /* ACE_CONFIG_LINUX_H */ - int scope = PTHREAD_SCOPE_PROCESS; -# endif /* ACE_CONFIG_LINUX_H */ - if (ACE_BIT_ENABLED (flags, THR_SCOPE_SYSTEM)) - scope = PTHREAD_SCOPE_SYSTEM; - - if (::pace_pthread_attr_setscope (&attr, scope) != 0) - { - ::pace_pthread_attr_destroy (&attr); - return -1; - } - } -# endif /* !ACE_LACKS_THREAD_PROCESS_SCOPING */ - - if (ACE_BIT_ENABLED (flags, THR_NEW_LWP)) - { - // Increment the number of LWPs by one to emulate the - // SunOS semantics. - int lwps = ACE_OS::thr_getconcurrency (); - if (lwps == -1) - { - if (errno == ENOTSUP) - // Suppress the ENOTSUP because it's harmless. - errno = 0; - else - // This should never happen on SunOS: - // ::thr_getconcurrency () should always succeed. - return -1; - } - else if (ACE_OS::thr_setconcurrency (lwps + 1) == -1) - { - if (errno == ENOTSUP) - { - // Unlikely: ::thr_getconcurrency () is supported - // but ::thr_setconcurrency () is not? - } - else - return -1; - } - } - } - - ACE_OSCALL (ACE_ADAPT_RETVAL (::pace_pthread_create (thr_id, - &attr, - PACE_THR_ENTRY_CAST (void * (*)(void *)) thread_args->entry_point (), - thread_args), - result), - int, -1, result); - ::pace_pthread_attr_destroy (&attr); -# endif /* ACE_HAS_PTHREADS_DRAFT4 */ - - // This is a SunOS or POSIX implementation of pthreads, - // where we assume that ACE_thread_t and ACE_hthread_t are the same. - // If this *isn't* correct on some platform, please let us know. - if (result != -1) - *thr_handle = *thr_id; - -# if defined (sun) && defined (ACE_HAS_ONLY_SCHED_OTHER) - // SunOS prior to 5.7: - - // If the priority is 0, then we might have to set it now - // because we couldn't set it with - // ::pthread_attr_setschedparam, as noted above. This doesn't - // provide strictly correct behavior, because the thread was - // created (above) with the priority of its parent. (That - // applies regardless of the inherit_sched attribute: if it - // was PTHREAD_INHERIT_SCHED, then it certainly inherited its - // parent's priority. If it was PTHREAD_EXPLICIT_SCHED, then - // "attr" was initialized by the SunOS ::pthread_attr_init - // () to contain NULL for the priority, which indicated to - // SunOS ::pthread_create () to inherit the parent - // priority.) - if (priority == 0) - { - // Check the priority of this thread, which is the parent - // of the newly created thread. If it is 0, then the - // newly created thread will have inherited the priority - // of 0, so there's no need to explicitly set it. - struct sched_param sparam; - int policy = 0; - ACE_OSCALL (ACE_ADAPT_RETVAL (::pace_pthread_getschedparam (thr_self (), - &policy, - &sparam), - result), int, - -1, result); - - // The only policy supported by by SunOS, thru version 5.6, - // is SCHED_OTHER, so that's hard-coded here. - policy = ACE_SCHED_OTHER; - - if (sparam.sched_priority != 0) - { - ACE_OS::memset ((void *) &sparam, 0, sizeof sparam); - // The memset to 0 sets the priority to 0, so we don't need - // to explicitly set sparam.sched_priority. - - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_setschedparam ( - *thr_id, - policy, - &sparam), - result), - int, -1); - } - } -# endif /* sun && ACE_HAS_ONLY_SCHED_OTHER */ - return result; - -#else /* ACE_HAS_PACE && !ACE_WIN32 */ ACE_Base_Thread_Adapter *thread_args; if (thread_adapter == 0) @@ -3582,16 +3229,13 @@ ACE_OS::thr_create (ACE_THR_FUNC func, ACE_UNUSED_ARG (stacksize); ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_THREADS */ -#endif /* ACE_HAS_PACE && !ACE_WIN32 */ } void ACE_OS::thr_exit (ACE_THR_FUNC_RETURN status) { ACE_OS_TRACE ("ACE_OS::thr_exit"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ::pace_pthread_exit (status); -# elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) ::pthread_exit (status); # elif defined (ACE_HAS_STHREADS) @@ -3659,7 +3303,7 @@ ACE_OS::thr_exit (ACE_THR_FUNC_RETURN status) # endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (status); -# endif /* ACE_HAS_PACE && !ACE_WIN32 */ +# endif /* ACE_HAS_THREADS */ } int @@ -3769,13 +3413,7 @@ int ACE_OS::thr_setspecific (ACE_thread_key_t key, void *data) { // ACE_OS_TRACE ("ACE_OS::thr_setspecific"); - // If we are using TSS emulation then we shuld use ACE's implementation - // of it and not make any PACE calls. -#if defined (ACE_HAS_PACE) && !defined (ACE_HAS_TSS_EMULATION) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_setspecific (key, data), - ace_result_), - int, -1); -# elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_TSS_EMULATION) ACE_KEY_INDEX (key_index, key); @@ -3834,18 +3472,14 @@ ACE_OS::thr_setspecific (ACE_thread_key_t key, void *data) ACE_UNUSED_ARG (key); ACE_UNUSED_ARG (data); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PACE && !ACE_HAS_TSS_EMULATION && !ACE_WIN32 */ +# endif /* ACE_HAS_THREADS */ } int ACE_OS::thr_keyfree (ACE_thread_key_t key) { ACE_OS_TRACE ("ACE_OS::thr_keyfree"); - // If we are using TSS emulation then we should use ACE's implementation - // of it and not make any PACE calls. -# if defined (ACE_HAS_PACE) && !defined (ACE_HAS_TSS_EMULATION) && !defined (ACE_WIN32) - return ::pace_pthread_key_delete (key); -# elif defined (ACE_HAS_THREADS) +# if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_TSS_EMULATION) // Release the key in the TSS_Emulation administration ACE_TSS_Emulation::release_key (key); @@ -3877,7 +3511,7 @@ ACE_OS::thr_keyfree (ACE_thread_key_t key) # else ACE_UNUSED_ARG (key); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PACE && !ACE_HAS_TSS_EMULATION && !ACE_WIN32 */ +# endif /* ACE_HAS_THREADS */ } # if defined (ACE_HAS_TSS_EMULATION) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) @@ -3891,12 +3525,7 @@ ACE_OS::thr_keycreate (ACE_OS_thread_key_t *key, void *inst) { // ACE_OS_TRACE ("ACE_OS::thr_keycreate"); -# if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_key_create (key, dest), - ace_result_), - int, -1); - -# elif defined (ACE_HAS_THREADS) +# if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) ACE_UNUSED_ARG (inst); @@ -3937,7 +3566,7 @@ ACE_OS::thr_keycreate (ACE_OS_thread_key_t *key, ACE_UNUSED_ARG (dest); ACE_UNUSED_ARG (inst); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PACE && !ACE_WIN32 */ +# endif /* ACE_HAS_THREADS */ } # endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */ @@ -3951,17 +3580,7 @@ ACE_OS::thr_keycreate (ACE_thread_key_t *key, void *inst) { // ACE_OS_TRACE ("ACE_OS::thr_keycreate"); - // If we are using TSS emulation then we shuld use ACE's implementation - // of it and not make any PACE calls. -#if defined (ACE_HAS_PACE) && !defined (ACE_HAS_TSS_EMULATION) && !defined (ACE_WIN32) - ACE_UNUSED_ARG (inst); -# if defined (ACE_WIN32) - int ace_result_ = 0; -# endif /* ACE_WIN32 */ - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_key_create (key, dest), - ace_result_), - int, -1); -# elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_TSS_EMULATION) if (ACE_TSS_Emulation::next_key (*key) == 0) { @@ -4037,7 +3656,7 @@ ACE_OS::thr_keycreate (ACE_thread_key_t *key, ACE_UNUSED_ARG (dest); ACE_UNUSED_ARG (inst); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PACE && !ACE_HAS_TSS_EMULATION && !ACE_WIN32 */ +# endif /* ACE_HAS_THREADS */ } int @@ -4891,7 +4510,7 @@ spaef (FUNCPTR entry, ...) # endif /* VXWORKS */ # if !defined (ACE_HAS_SIGINFO_T) -# if !defined (ACE_HAS_PACE) || !defined (ACE_WIN32) +# if !defined (ACE_WIN32) siginfo_t::siginfo_t (ACE_HANDLE handle) : si_handle_ (handle), si_handles_ (&handle) @@ -4903,7 +4522,7 @@ siginfo_t::siginfo_t (ACE_HANDLE *handles) si_handles_ (handles) { } -# endif /* ! ACE_HAS_PACE || ! ACE_WIN32 */ +# endif /* ! ACE_WIN32 */ # endif /* ACE_HAS_SIGINFO_T */ pid_t @@ -5815,10 +5434,7 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw, } # endif /* ! ACE_HAS_THREADS || ACE_LACKS_RWLOCK_T */ -// If we're using PACE then we don't want this method (since PACE -// takes care of it) unless we're on Windows. Win32 mutexes, semaphores, -// and condition variables are not yet supported in PACE. -#if defined (ACE_LACKS_COND_T) && ! defined (ACE_PSOS_DIAB_MIPS) && ! (defined (ACE_HAS_PACE) && ! defined (ACE_WIN32)) +#if defined (ACE_LACKS_COND_T) && ! defined (ACE_PSOS_DIAB_MIPS) // NOTE: The ACE_OS::cond_* functions for some non-Unix platforms are // defined here either because they're too big to be inlined, or // to avoid use before definition if they were inline. @@ -6012,9 +5628,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv, ACE_mutex_t *external_mutex) { ACE_OS_TRACE ("ACE_OS::cond_wait"); -# if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - return (::pace_pthread_cond_wait(cv, external_mutex); -# elif defined (ACE_HAS_THREADS) +# if defined (ACE_HAS_THREADS) // Prevent race conditions on the <waiters_> count. ACE_OS::thread_mutex_lock (&cv->waiters_lock_); cv->waiters_++; @@ -6025,17 +5639,10 @@ ACE_OS::cond_wait (ACE_cond_t *cv, # if defined (ACE_HAS_SIGNAL_OBJECT_AND_WAIT) if (external_mutex->type_ == USYNC_PROCESS) // This call will automatically release the mutex and wait on the semaphore. -# if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_WIN32CALL (ACE_ADAPT_RETVAL (::SignalObjectAndWait (external_mutex->proc_mutex_, - cv->sema_.sema_, INFINITE, FALSE), - result), - int, -1, result); -# else ACE_WIN32CALL (ACE_ADAPT_RETVAL (::SignalObjectAndWait (external_mutex->proc_mutex_, cv->sema_, INFINITE, FALSE), result), int, -1, result); -# endif /* ACE_HAS_PACE && !ACE_WIN32 */ else # endif /* ACE_HAS_SIGNAL_OBJECT_AND_WAIT */ { @@ -6116,9 +5723,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, ACE_Time_Value *timeout) { ACE_OS_TRACE ("ACE_OS::cond_timedwait"); -# if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - return (::pace_pthread_cond_timedwait(cv, external_mutex, timeout); -# elif defined (ACE_HAS_THREADS) +# if defined (ACE_HAS_THREADS) // Handle the easy case first. if (timeout == 0) return ACE_OS::cond_wait (cv, external_mutex); @@ -6154,17 +5759,10 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, if (external_mutex->type_ == USYNC_PROCESS) // This call will automatically release the mutex and wait on the // semaphore. -# if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - result = ::SignalObjectAndWait (external_mutex->proc_mutex_, - cv->sema_.sema_, - msec_timeout, - FALSE); -# else result = ::SignalObjectAndWait (external_mutex->proc_mutex_, cv->sema_, msec_timeout, FALSE); -# endif /* ACE_HAS_PACE && !ACE_WIN32 */ else # endif /* ACE_HAS_SIGNAL_OBJECT_AND_WAIT */ { @@ -136,25 +136,6 @@ typedef int key_t; // // /////////////////////////////////////////// -#if defined (ACE_HAS_PACE) -# include /**/ "pace/dirent.h" -# include /**/ "pace/fcntl.h" -# include /**/ "pace/sys/mman.h" -# include /**/ "pace/pthread.h" -# include /**/ "pace/pwd.h" -# include /**/ "pace/stdio.h" -# include /**/ "pace/stdlib.h" -# include /**/ "pace/sched.h" -# include /**/ "pace/semaphore.h" -# include /**/ "pace/signal.h" -# include /**/ "pace/sys/stat.h" -# include /**/ "pace/stdio.h" -# include /**/ "pace/time.h" -# include /**/ "pace/unistd.h" -# include /**/ "pace/sys/utsname.h" -# include /**/ "pace/sys/wait.h" -#endif /* ACE_HAS_PACE */ - # if defined (ACE_PSOS) # if defined (ACE_LACKS_ASSERT_MACRO) @@ -1228,25 +1209,7 @@ typedef const struct rlimit ACE_SETRLIMIT_TYPE; # define ACE_DEFAULT_THREAD_PRIORITY (-0x7fffffffL - 1L) # endif /* ACE_DEFAULT_THREAD_PRIORITY */ -# if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) -# include /**/ "pace/semaphore.h" -# if !defined (SEM_FAILED) -# define SEM_FAILED ((pace_sem_t *) -1) -# endif /* !SEM_FAILED */ - -typedef struct -{ - /// Pointer to semaphore handle. This is allocated by ACE if we are - /// working with an unnamed POSIX semaphore or by the OS if we are - /// working with a named POSIX semaphore. - pace_sem_t *sema_; - - /// Name of the semaphore (if this is non-NULL then this is a named - /// POSIX semaphore, else its an unnamed POSIX semaphore). - char *name_; -} ACE_sema_t; - -# elif defined (ACE_HAS_POSIX_SEM) +# if defined (ACE_HAS_POSIX_SEM) # include /**/ <semaphore.h> # if !defined (SEM_FAILED) && !defined (ACE_LACKS_NAMED_POSIX_SEM) # define SEM_FAILED ((sem_t *) -1) @@ -1263,14 +1226,14 @@ typedef struct /// POSIX semaphore, else its an unnamed POSIX semaphore). char *name_; -#if defined (ACE_LACKS_NAMED_POSIX_SEM) +# if defined (ACE_LACKS_NAMED_POSIX_SEM) /// this->sema_ doesn't always get created dynamically if a platform /// doesn't support named posix semaphores. We use this flag to /// remember if we need to delete <sema_> or not. int new_sema_; -#endif /* ACE_LACKS_NAMED_POSIX_SEM */ +# endif /* ACE_LACKS_NAMED_POSIX_SEM */ } ACE_sema_t; -# endif /* ACE_HAS_PACE && !ACE_WIN32 */ +# endif /* ACE_HAS_POSIX_SEM */ struct cancel_state { @@ -1902,32 +1865,6 @@ struct sockaddr_un { # define USYNC_THREAD 0 # define USYNC_PROCESS 1 /* It's all global on VxWorks (without MMU option). */ -# if defined (ACE_HAS_PACE) -# define ACE_PROC_PRI_FIFO_MIN (sched_get_priority_min(SCHED_FIFO)) -# define ACE_PROC_PRI_FIFO_MAX (sched_get_priority_max(SCHED_FIFO)) -# define ACE_PROC_PRI_RR_MIN (sched_get_priority_min(SCHED_RR)) -# define ACE_PROC_PRI_RR_MAX (sched_get_priority_max(SCHED_RR)) -# define ACE_PROC_PRI_OTHER_MIN (sched_get_priority_min(SCHED_OTHER)) -# define ACE_PROC_PRI_OTHER_MAX (sched_get_priority_max(SCHED_OTHER)) -# if !defined (ACE_THR_PRI_FIFO_MIN) -# define ACE_THR_PRI_FIFO_MIN (long) ACE_PROC_PRI_FIFO_MIN -# endif /* !ACE_THR_PRI_FIFO_MIN */ -# if !defined (ACE_THR_PRI_FIFO_MAX) -# define ACE_THR_PRI_FIFO_MAX (long) ACE_PROC_PRI_FIFO_MAX -# endif /* !ACE_THR_PRI_FIFO_MAX */ -# if !defined (ACE_THR_PRI_RR_MIN) -# define ACE_THR_PRI_RR_MIN (long) ACE_PROC_PRI_RR_MIN -# endif /* !ACE_THR_PRI_RR_MIN */ -# if !defined (ACE_THR_PRI_RR_MAX) -# define ACE_THR_PRI_RR_MAX (long) ACE_PROC_PRI_RR_MAX -# endif /* !ACE_THR_PRI_RR_MAX */ -# if !defined (ACE_THR_PRI_OTHER_MIN) -# define ACE_THR_PRI_OTHER_MIN (long) ACE_PROC_PRI_OTHER_MIN -# endif /* !ACE_THR_PRI_OTHER_MIN */ -# if !defined (ACE_THR_PRI_OTHER_MAX) -# define ACE_THR_PRI_OTHER_MAX (long) ACE_PROC_PRI_OTHER_MAX -# endif /* !ACE_THR_PRI_OTHER_MAX */ -# endif /* ACE_HAS_PACE */ # if !defined (ACE_DEFAULT_SYNCH_TYPE) // Types include these options: SEM_Q_PRIORITY, SEM_Q_FIFO, @@ -1936,14 +1873,7 @@ struct sockaddr_un { # define ACE_DEFAULT_SYNCH_TYPE SEM_Q_FIFO # endif /* ! ACE_DEFAULT_SYNCH_TYPE */ -# if defined (ACE_HAS_PACE) -typedef pace_pthread_mutex_t ACE_mutex_t; -typedef pace_pthread_mutexattr_t ACE_mutexattr_t; -typedef pace_pthread_cond_t ACE_cond_t; -typedef pace_pthread_condattr_t ACE_condattr_t; -# else typedef SEM_ID ACE_mutex_t; -# endif /* ACE_HAS_PACE */ // Implement ACE_thread_mutex_t with ACE_mutex_t because there's just // one process . . . typedef ACE_mutex_t ACE_thread_mutex_t; @@ -1952,23 +1882,14 @@ typedef ACE_mutex_t ACE_thread_mutex_t; typedef struct { /// Semaphore handle. This is allocated by VxWorks. -# if defined (ACE_HAS_PACE) - pace_pthread_mutex_t sema_; -# else SEM_ID sema_; -# endif /* ACE_HAS_PACE */ /// Name of the semaphore: always NULL with VxWorks. char *name_; } ACE_sema_t; # endif /* !ACE_HAS_POSIX_SEM */ -# if defined (ACE_HAS_PACE) -typedef pace_pthread_t ACE_thread_t; -typedef pace_pthread_t ACE_hthread_t; -# else typedef char * ACE_thread_t; typedef int ACE_hthread_t; -# endif /* ACE_HAS_PACE */ // Key type: the ACE TSS emulation requires the key type be unsigned, // for efficiency. (Current POSIX and Solaris TSS implementations also // use u_int, so the ACE TSS emulation is compatible with them.) @@ -1982,9 +1903,6 @@ typedef u_int ACE_thread_key_t; typedef CRITICAL_SECTION ACE_thread_mutex_t; -# if defined (ACE_HAS_PACE) -typedef pace_pthread_mutex_t ACE_mutex_t; -# else typedef struct { /// Either USYNC_THREAD or USYNC_PROCESS @@ -1995,15 +1913,11 @@ typedef struct CRITICAL_SECTION thr_mutex_; }; } ACE_mutex_t; -# endif /* ACE_HAS_PACE */ // Wrapper for NT Events. typedef HANDLE ACE_event_t; -# if !defined (ACE_HAS_PACE) || defined (ACE_WIN32) -// This can probably get _wider_ as more types are defined in PACE. -// ie: see above ACE_mutex_t - +# if defined (ACE_WIN32) //@@ ACE_USES_WINCE_SEMA_SIMULATION is used to debug // semaphore simulation on WinNT. It should be // changed to ACE_USES_HAS_WINCE at some later point. @@ -2029,7 +1943,7 @@ public: }; # endif /* ACE_USES_WINCE_SEMA_SIMULATION */ -# endif /* !ACE_HAS_PACE || defined (ACE_WIN32) */ +# endif /* defined (ACE_WIN32) */ // These need to be different values, neither of which can be 0... # define USYNC_THREAD 1 @@ -2056,7 +1970,7 @@ public: // If we're using PACE then we don't want this class (since PACE // takes care of it) unless we're on Windows. Win32 mutexes, semaphores, // and condition variables are not yet supported in PACE. -# if defined (ACE_LACKS_COND_T) && (!defined (ACE_HAS_PACE) || defined (ACE_WIN32)) +# if defined (ACE_LACKS_COND_T) /** * @class ACE_cond_t * @@ -2112,14 +2026,10 @@ struct ACE_OS_Export ACE_condattr_t int type; }; -# if defined (ACE_HAS_PACE) -typedef pace_pthread_mutexattr_t ACE_mutexattr_t; -# else struct ACE_OS_Export ACE_mutexattr_t { int type; }; -# endif /* ACE_HAS_PACE */ # endif /* ACE_LACKS_COND_T */ # if defined (ACE_LACKS_RWLOCK_T) && !defined (ACE_HAS_PTHREADS_UNIX98_EXT) @@ -2614,15 +2524,7 @@ struct msghdr {}; typedef int sig_atomic_t; # endif /* !ACE_HAS_SIG_ATOMIC_T */ -# if defined (ACE_HAS_PACE) -# if defined (ACE_HAS_LYNXOS_SIGNALS) -typedef void (*ACE_SignalHandler)(...); -typedef void (*ACE_SignalHandlerV)(...); -# else -typedef pace_sig_pf ACE_SignalHandler; -typedef pace_sig_pf ACE_SignalHandlerV; -# endif /* ACE_HAS_LYNXOS_SIGNALS */ -# elif defined (ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES) +# if defined (ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES) // Prototypes for both signal() and struct sigaction are consistent.. # if defined (ACE_HAS_SIG_C_FUNC) extern "C" { @@ -2670,7 +2572,7 @@ typedef void (*ACE_SignalHandlerV)(...); typedef void (*ACE_SignalHandler)(int); # endif /* SIG_PF */ typedef void (*ACE_SignalHandlerV)(...); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES */ # if defined (BUFSIZ) # define ACE_STREAMBUF_SIZE BUFSIZ @@ -2950,19 +2852,12 @@ typedef ACE_UINT64 ACE_hrtime_t; // Win32 dummies to help compilation. # if !defined (__BORLANDC__) -# if defined (ACE_HAS_PACE) -typedef pace_nlink_t nlink_t; -typedef pace_mode_t mode_t; -typedef pace_uid_t uid_t; -typedef pace_gid_t gid_t; -# else /* !ACE_HAS_PACE */ typedef DWORD nlink_t; # if !defined(__MINGW32__) typedef u_short mode_t; # endif /* !__MINGW32__ */ typedef long uid_t; typedef long gid_t; -# endif /* ACE_HAS_PACE */ # endif /* __BORLANDC__ */ typedef char *caddr_t; @@ -3751,11 +3646,9 @@ typedef fd_set ACE_FD_SET_TYPE; #endif # if defined (ACE_LACKS_SIGSET) -# if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) -typedef pace_sigset_t sigset_t; -# elif !defined(__MINGW32__) +# if !defined(__MINGW32__) typedef u_int sigset_t; -# endif /* !ACE_HAS_PACE && !__MINGW32__*/ +# endif /* !__MINGW32__*/ # endif /* ACE_LACKS_SIGSET */ # if defined (ACE_LACKS_SIGACTION) @@ -4091,9 +3984,6 @@ typedef const ACE_TCHAR * ACE_DL_TYPE; # endif /* ACE_HAS_CHARPTR_DL */ # if !defined (ACE_HAS_SIGINFO_T) -# if defined (ACE_HAS_PACE) -typedef pace_siginfo_t siginfo_t; -# else struct ACE_OS_Export siginfo_t { siginfo_t (ACE_HANDLE handle); @@ -4105,7 +3995,6 @@ struct ACE_OS_Export siginfo_t /// Array of Win32 HANDLEs all of which have become signaled. ACE_HANDLE *si_handles_; }; -# endif /* ACE_HAS_PACE */ # endif /* ACE_HAS_SIGINFO_T */ // Typedef for the null handler func. @@ -4385,20 +4274,15 @@ typedef double ACE_timer_t; # include /**/ <syslog.h> # endif /* !defined (ACE_WIN32) && !defined (ACE_LACKS_UNIX_SYSLOG) */ -#if defined (ACE_HAS_SYS_FILIO_H) +# if defined (ACE_HAS_SYS_FILIO_H) # include /**/ <sys/filio.h> -#endif /* ACE_HAS_SYS_FILIO_H */ +# endif /* ACE_HAS_SYS_FILIO_H */ -# if defined (ACE_HAS_PACE) - // = typedef for the _stat data structure - typedef pace_stat_s ACE_stat; -# else -# if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined (__BORLANDC__) +# if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined (__BORLANDC__) typedef struct _stat ACE_stat; -# else +# else typedef struct stat ACE_stat; -# endif /* ACE_WIN32 */ -# endif /* ACE_HAS_PACE */ +# endif /* ACE_WIN32 */ // We need this for MVS... extern "C" { @@ -4450,14 +4334,12 @@ inline long ace_timezone() */ inline double ace_difftime(time_t t1, time_t t0) { -# if defined (ACE_HAS_PACE) - return ::pace_difftime (t1, t0); -# elif defined (ACE_PSOS) && ! defined (ACE_PSOS_HAS_TIME) +# if defined (ACE_PSOS) && ! defined (ACE_PSOS_HAS_TIME) // simulate difftime ; just subtracting ; ACE_PSOS case return ((double)t1) - ((double)t0); # else return difftime (t1, t0); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_PSOS !ACE_PSOS_HAS_TIME */ } #endif /* !ACE_LACKS_DIFFTIME */ @@ -6621,10 +6503,7 @@ private: # define ACE_NOOP(x) -#if defined (ACE_HAS_PACE) -# define ACE_PTHREAD_CLEANUP_PUSH(A) pace_pthread_cleanup_push (ACE_OS::mutex_lock_cleanup, (void *) A); -# define ACE_PTHREAD_CLEANUP_POP(A) pace_pthread_cleanup_pop(A) -# elif defined (ACE_HAS_THR_C_FUNC) +# if defined (ACE_HAS_THR_C_FUNC) // This is necessary to work around nasty problems with MVS C++. extern "C" ACE_OS_Export void ace_mutex_lock_cleanup_adapter (void *args); # define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ace_mutex_lock_cleanup_adapter, (void *) A); @@ -6640,7 +6519,7 @@ extern "C" ACE_OS_Export void ace_mutex_lock_cleanup_adapter (void *args); # else # define ACE_PTHREAD_CLEANUP_PUSH(A) # define ACE_PTHREAD_CLEANUP_POP(A) -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_THR_C_FUNC */ # if !defined (ACE_DEFAULT_MUTEX_A) # define ACE_DEFAULT_MUTEX_A "ACE_MUTEX" @@ -144,16 +144,14 @@ ACE_INLINE int ACE_OS::fcntl (ACE_HANDLE handle, int cmd, long arg) { ACE_OS_TRACE ("ACE_OS::fcntl"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_fcntl (handle, cmd, arg), int, -1); -# elif defined (ACE_LACKS_FCNTL) +# if defined (ACE_LACKS_FCNTL) ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (cmd); ACE_UNUSED_ARG (arg); ACE_NOTSUP_RETURN (-1); # else ACE_OSCALL_RETURN (::fcntl (handle, cmd, arg), int, -1); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_LACKS_FCNTL */ } #if !defined (ACE_LACKS_CHDIR) @@ -161,9 +159,7 @@ ACE_INLINE int ACE_OS::chdir (const char *path) { ACE_OS_TRACE ("ACE_OS::chdir"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_chdir (path), int, -1); -#elif defined (VXWORKS) +#if defined (VXWORKS) ACE_OSCALL_RETURN (::chdir (ACE_const_cast (char *, path)), int, -1); #elif defined (ACE_PSOS_LACKS_PHILE) @@ -185,7 +181,7 @@ ACE_OS::chdir (const char *path) #else ACE_OSCALL_RETURN (::chdir (path), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* VXWORKS */ } #if defined (ACE_HAS_WCHAR) @@ -227,15 +223,13 @@ ACE_INLINE int ACE_OS::mkfifo (const ACE_TCHAR *file, mode_t mode) { ACE_OS_TRACE ("ACE_OS::mkfifo"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_mkfifo (file, mode), int, -1); -#elif defined (ACE_LACKS_MKFIFO) +#if defined (ACE_LACKS_MKFIFO) ACE_UNUSED_ARG (file); ACE_UNUSED_ARG (mode); ACE_NOTSUP_RETURN (-1); #else ACE_OSCALL_RETURN (::mkfifo (file, mode), int, -1); -# endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_MKFIFO */ } #if !defined (ACE_WIN32) @@ -307,9 +301,7 @@ ACE_INLINE int ACE_OS::fstat (ACE_HANDLE handle, ACE_stat *stp) { ACE_OS_TRACE ("ACE_OS::fstat"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_fstat (handle, stp), int, -1); -#elif defined (ACE_PSOS_LACKS_PHILE) +#if defined (ACE_PSOS_LACKS_PHILE) ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (stp); ACE_NOTSUP_RETURN (-1); @@ -326,7 +318,7 @@ ACE_OS::fstat (ACE_HANDLE handle, ACE_stat *stp) # else ACE_OSCALL_RETURN (::fstat (handle, stp), int, -1); # endif /* !ACE_HAS_X86_STAT_MACROS */ -#endif /* defined (ACE_HAS_PACE) */ +#endif /* ACE_PSOS_LACKS_PHILE */ } ACE_INLINE int @@ -338,31 +330,29 @@ ACE_OS::lstat (const char *file, ACE_stat *stp) ACE_UNUSED_ARG (file); ACE_UNUSED_ARG (stp); ACE_NOTSUP_RETURN (-1); -#else -# if defined (ACE_HAS_X86_STAT_MACROS) +# else +# if defined (ACE_HAS_X86_STAT_MACROS) // Solaris for intel uses an macro for lstat(), this macro is a // wrapper for _lxstat(). ACE_OSCALL_RETURN (::_lxstat (_STAT_VER, file, stp), int, -1); -# elif defined (ACE_WIN32) +# elif defined (ACE_WIN32) ACE_OSCALL_RETURN (::_lstat (file, stp), int, -1); -# else /* !ACE_HAS_X86_STAT_MACROS */ +# else /* !ACE_HAS_X86_STAT_MACROS */ ACE_OSCALL_RETURN (::lstat (file, stp), int, -1); -#endif /* !ACE_HAS_X86_STAT_MACROS */ -# endif /* VXWORKS */ +# endif /* !ACE_HAS_X86_STAT_MACROS */ +# endif /* ACE_LACKS_LSTAT */ } ACE_INLINE int ACE_OS::fsync (ACE_HANDLE handle) { ACE_OS_TRACE ("ACE_OS::fsync"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_fsync (handle), int, -1); -# elif defined (ACE_LACKS_FSYNC) +# if defined (ACE_LACKS_FSYNC) ACE_UNUSED_ARG (handle); ACE_NOTSUP_RETURN (-1); # else ACE_OSCALL_RETURN (::fsync (handle), int, -1); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_LACKS_FSYNC */ } ACE_INLINE int @@ -387,14 +377,12 @@ ACE_INLINE int ACE_OS::pipe (ACE_HANDLE fds[]) { ACE_OS_TRACE ("ACE_OS::pipe"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_pipe (fds), int, -1); -#elif defined (VXWORKS) || defined (ACE_PSOS) +# if defined (VXWORKS) || defined (ACE_PSOS) ACE_UNUSED_ARG (fds); ACE_NOTSUP_RETURN (-1); # else ACE_OSCALL_RETURN (::pipe (fds), int, -1); -# endif /* ACE_HAS_PACE */ +# endif /* VXWORKS || ACE_PSOS */ } # if defined (DIGITAL_UNIX) @@ -422,9 +410,7 @@ ACE_INLINE int ACE_OS::rand_r (ACE_RANDR_TYPE &seed) { ACE_OS_TRACE ("ACE_OS::rand_r"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_rand_r (&seed), int, -1); -# elif defined (ACE_HAS_REENTRANT_FUNCTIONS) && \ +# if defined (ACE_HAS_REENTRANT_FUNCTIONS) && \ !defined (ACE_LACKS_RAND_REENTRANT_FUNCTIONS) # if defined (DIGITAL_UNIX) ACE_OSCALL_RETURN (::_Prand_r (&seed), int, -1); @@ -443,34 +429,30 @@ ACE_OS::rand_r (ACE_RANDR_TYPE &seed) # else ACE_UNUSED_ARG (seed); ACE_OSCALL_RETURN (::rand (), int, -1); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_REENTRANT_FUNCTIONS */ } ACE_INLINE pid_t ACE_OS::setsid (void) { ACE_OS_TRACE ("ACE_OS::setsid"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_setsid (), int , -1); -#elif defined (VXWORKS) || defined (CHORUS) || defined (ACE_PSOS) +# if defined (VXWORKS) || defined (CHORUS) || defined (ACE_PSOS) ACE_NOTSUP_RETURN (-1); # else ACE_OSCALL_RETURN (::setsid (), int, -1); -# endif /* ACE_HAS_PACE */ +# endif /* VXWORKS || CHORUS || ACE_PSOS */ } ACE_INLINE mode_t ACE_OS::umask (mode_t cmask) { ACE_OS_TRACE ("ACE_OS::umask"); -#if defined (ACE_HAS_PACE) - return ::pace_umask (cmask); -#elif defined (VXWORKS) || defined (ACE_PSOS) +# if defined (VXWORKS) || defined (ACE_PSOS) ACE_UNUSED_ARG (cmask); ACE_NOTSUP_RETURN (-1); # else return ::umask (cmask); // This call shouldn't fail... -# endif /* ACE_HAS_PACE */ +# endif /* VXWORKS || ACE_PSOS */ } #else /* ACE_WIN32 */ @@ -525,16 +507,14 @@ ACE_OS::getopt (int argc, char *const *argv, const char *optstring) ACE_INLINE int ACE_OS::pipe (ACE_HANDLE fds[]) { -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_pipe (fds), int, -1); -# elif !defined (ACE_HAS_WINCE) && !defined (__IBMCPP__) +# if !defined (ACE_HAS_WINCE) && !defined (__IBMCPP__) ACE_OS_TRACE ("ACE_OS::pipe"); ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CreatePipe (&fds[0], &fds[1], 0, 0), ace_result_), int, -1); # else ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_WINCE && !__IBMCPP__ */ } ACE_INLINE int @@ -556,23 +536,19 @@ ACE_OS::setsid (void) ACE_INLINE mode_t ACE_OS::umask (mode_t cmask) { -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_umask (cmask), mode_t, -1); -# elif !defined (ACE_HAS_WINCE) +#if !defined (ACE_HAS_WINCE) ACE_OS_TRACE ("ACE_OS::umask"); ACE_OSCALL_RETURN (::_umask (cmask), mode_t, -1); # else ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_WINCE */ } ACE_INLINE int ACE_OS::fstat (ACE_HANDLE handle, ACE_stat *stp) { ACE_OS_TRACE ("ACE_OS::fstat"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_fstat (handle, stp), int, -1); -# elif 1 +# if 1 BY_HANDLE_FILE_INFORMATION fdata; if (::GetFileInformationByHandle (handle, &fdata) == FALSE) @@ -607,7 +583,7 @@ ACE_OS::fstat (ACE_HANDLE handle, ACE_stat *stp) ::_close (fd); // Remember to close the file handle. return retval; -# endif /* ACE_HAS_PACE */ +# endif /* 1 */ } #endif /* WIN32 */ @@ -616,9 +592,7 @@ ACE_INLINE int ACE_OS::clock_gettime (clockid_t clockid, struct timespec *ts) { ACE_OS_TRACE ("ACE_OS::clock_gettime"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_clock_gettime (clockid, ts), int, -1); -#elif defined (ACE_HAS_CLOCK_GETTIME) +#if defined (ACE_HAS_CLOCK_GETTIME) ACE_OSCALL_RETURN (::clock_gettime (clockid, ts), int, -1); # elif defined (ACE_PSOS) && ! defined (ACE_PSOS_DIAB_MIPS) ACE_UNUSED_ARG (clockid); @@ -630,7 +604,7 @@ ACE_OS::clock_gettime (clockid_t clockid, struct timespec *ts) ACE_UNUSED_ARG (clockid); ACE_UNUSED_ARG (ts); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_CLOCK_GETTIME */ } ACE_INLINE ACE_Time_Value @@ -704,9 +678,7 @@ ACE_INLINE int ACE_OS::stat (const ACE_TCHAR *file, ACE_stat *stp) { ACE_OS_TRACE ("ACE_OS::stat"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_stat (file, stp), int, -1); -#elif defined (VXWORKS) +#if defined (VXWORKS) ACE_OSCALL_RETURN (::stat ((char *) file, stp), int, -1); #elif defined (ACE_PSOS_LACKS_PHILE) ACE_UNUSED_ARG (file); @@ -751,15 +723,13 @@ ACE_OS::stat (const ACE_TCHAR *file, ACE_stat *stp) # endif /* ACE_USES_WCHAR */ #else /* VXWORKS */ ACE_OSCALL_RETURN (::stat (file, stp), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* VXWORKS */ } ACE_INLINE time_t ACE_OS::time (time_t *tloc) { -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_time (tloc), time_t, (time_t) -1); -#elif !defined (ACE_HAS_WINCE) +#if !defined (ACE_HAS_WINCE) ACE_OS_TRACE ("ACE_OS::time"); # if defined (ACE_PSOS) && ! defined (ACE_PSOS_HAS_TIME) unsigned long d_date, d_time, d_tick; @@ -775,38 +745,28 @@ ACE_OS::time (time_t *tloc) if (tloc) *tloc = retv; return retv; -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_WINCE */ } ACE_INLINE void ACE_OS::srand (u_int seed) { ACE_OS_TRACE ("ACE_OS::srand"); -#if defined (ACE_HAS_PACE) - ::pace_srand (seed); -#else ::srand (seed); -#endif /* ACE_HAS_PACE */ } ACE_INLINE int ACE_OS::rand (void) { ACE_OS_TRACE ("ACE_OS::rand"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_rand (), int, -1); -#else ACE_OSCALL_RETURN (::rand (), int, -1); -#endif /* ACE_HAS_PACE */ } ACE_INLINE int ACE_OS::unlink (const ACE_TCHAR *path) { ACE_OS_TRACE ("ACE_OS::unlink"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_unlink (path), int, -1); -# elif defined (VXWORKS) +# if defined (VXWORKS) ACE_OSCALL_RETURN (::unlink (ACE_const_cast (char *, path)), int, -1); # elif defined (ACE_PSOS) && ! defined (ACE_PSOS_LACKS_PHILE) ACE_OSCALL_RETURN (::remove_f ((char *) path), int , -1); @@ -825,7 +785,7 @@ ACE_OS::unlink (const ACE_TCHAR *path) ACE_OSCALL_RETURN (::_wunlink (path), int, -1); # else ACE_OSCALL_RETURN (::unlink (path), int, -1); -# endif /* ACE_HAS_PACE */ +# endif /* VXWORKS */ } ACE_INLINE int @@ -833,10 +793,7 @@ ACE_OS::rename (const ACE_TCHAR *old_name, const ACE_TCHAR *new_name, int flags) { -#if defined (ACE_HAS_PACE) - ACE_UNUSED_ARG (flags); - ACE_OSCALL_RETURN (::pace_rename (old_name, new_name), int, -1); -# elif (ACE_LACKS_RENAME) +# if defined (ACE_LACKS_RENAME) ACE_UNUSED_ARG (old_name); ACE_UNUSED_ARG (new_name); ACE_UNUSED_ARG (flags); @@ -862,7 +819,7 @@ ACE_OS::rename (const ACE_TCHAR *old_name, # else /* ACE_LACKS_RENAME */ ACE_UNUSED_ARG (flags); ACE_OSCALL_RETURN (::rename (old_name, new_name), int, -1); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_LACKS_RENAME */ } ACE_INLINE ACE_TCHAR * @@ -895,30 +852,25 @@ ACE_OS::shm_open (const ACE_TCHAR *filename, LPSECURITY_ATTRIBUTES sa) { ACE_OS_TRACE ("ACE_OS::shm_open"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_UNUSED_ARG (sa); - ACE_OSCALL_RETURN (::pace_shm_open (filename, mode, perms), ACE_HANDLE, -1); -# elif defined (ACE_HAS_SHM_OPEN) +# if defined (ACE_HAS_SHM_OPEN) ACE_UNUSED_ARG (sa); ACE_OSCALL_RETURN (::shm_open (filename, mode, perms), ACE_HANDLE, -1); # else /* ! ACE_HAS_SHM_OPEN */ // Just use ::open. return ACE_OS::open (filename, mode, perms, sa); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_SHM_OPEN */ } ACE_INLINE int ACE_OS::shm_unlink (const ACE_TCHAR *path) { ACE_OS_TRACE ("ACE_OS::shm_unlink"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (::pace_shm_unlink (path), int, -1); -# elif defined (ACE_HAS_SHM_OPEN) +# if defined (ACE_HAS_SHM_OPEN) ACE_OSCALL_RETURN (::shm_unlink (path), int, -1); # else /* ! ACE_HAS_SHM_OPEN */ // Just use ::unlink. return ACE_OS::unlink (path); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_SHM_OPEN */ } #if !defined (ACE_LACKS_CUSERID) @@ -1062,10 +1014,7 @@ ACE_INLINE void ACE_OS::_exit (int status) { ACE_OS_TRACE ("ACE_OS::_exit"); -#if defined (ACE_HAS_PACE) - // This call should be to something like ::pace__exit() since ::pace_exit() calls exit(), not _exit()! - ::pace_exit (status); -#elif defined (VXWORKS) +#if defined (VXWORKS) ::exit (status); #elif defined (ACE_PSOSIM) ::u_exit (status); @@ -1081,31 +1030,25 @@ ACE_OS::_exit (int status) #else ::TerminateProcess (::GetCurrentProcess (), status); -#endif /* ACE_HAS_PACE */ +#endif /* VXWORKS */ } ACE_INLINE void ACE_OS::abort (void) { -#if defined (ACE_HAS_PACE) - ::pace_abort (); -#elif !defined (ACE_HAS_WINCE) +#if !defined (ACE_HAS_WINCE) ::abort (); #else // @@ CE doesn't support abort? exit (1); -#endif /* ACE_HAS_PACE */ +#endif /* !ACE_HAS_WINCE */ } #if !defined (ACE_HAS_WINCE) ACE_INLINE int ACE_OS::vsprintf (char *buffer, const char *format, va_list argptr) { -# if defined (ACE_HAS_PACE) - return ACE_SPRINTF_ADAPTER (::pace_vsprintf (buffer, format, argptr)); -# else return ACE_SPRINTF_ADAPTER (::vsprintf (buffer, format, argptr)); -# endif /* ACE_HAS_PACE */ } #endif /* ACE_HAS_WINCE */ @@ -1131,14 +1074,12 @@ ACE_INLINE long ACE_OS::sysconf (int name) { ACE_OS_TRACE ("ACE_OS::sysconf"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_sysconf (name), long, -1); -#elif defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_PSOS) +#if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_PSOS) ACE_UNUSED_ARG (name); ACE_NOTSUP_RETURN (-1); #else ACE_OSCALL_RETURN (::sysconf (name), long, -1); -#endif /* ACE_HAS_PACE*/ +#endif /* ACE_WIN32 || VXWORKS || ACE_PSOS */ } ACE_INLINE int @@ -1149,46 +1090,7 @@ ACE_OS::mutex_init (ACE_mutex_t *m, LPSECURITY_ATTRIBUTES sa) { // ACE_OS_TRACE ("ACE_OS::mutex_init"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - pace_pthread_mutexattr_t l_attributes; - if (attributes == 0) - attributes = &l_attributes; - int result = 0; - - // Only do these initializations if the <attributes> parameter - // wasn't originally set. - if (attributes == &l_attributes) - { - if (::pace_pthread_mutexattr_init (attributes) == 0) - result = 0; - else - result = -1; // ACE_ADAPT_RETVAL used it for intermediate status - } - - if (result == 0) - { - if ( -# if defined (_POSIX_THREAD_PROCESS_SHARED) - ::pace_pthread_mutexattr_setpshared (attributes, type) == 0 && -# endif /* _POSIX_THREAD_PROCESS_SHARED */ - ::pace_pthread_mutex_init (m, attributes) == 0) - result = 0; - else - result = -1; // ACE_ADAPT_RETVAL used it for intermediate status - - // Only do the deletions if the <attributes> parameter wasn't - // originally set and we successfully created the attributes. - if (attributes == &l_attributes) - ::pace_pthread_mutexattr_destroy (&l_attributes); - } - - ACE_UNUSED_ARG (sa); - ACE_UNUSED_ARG (name); - ACE_UNUSED_ARG (type); - - return result; - -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) ACE_UNUSED_ARG (name); ACE_UNUSED_ARG (attributes); @@ -1374,7 +1276,7 @@ ACE_OS::mutex_init (ACE_mutex_t *m, ACE_UNUSED_ARG (attributes); ACE_UNUSED_ARG (sa); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } #if defined (ACE_HAS_WCHAR) @@ -1420,11 +1322,7 @@ ACE_INLINE int ACE_OS::mutex_destroy (ACE_mutex_t *m) { ACE_OS_TRACE ("ACE_OS::mutex_destroy"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - int dummy_retval = 0; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_mutex_destroy (m), - dummy_retval), int, -1); -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) # if (defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)) ACE_OSCALL_RETURN (::pthread_mutex_destroy (m), int, -1); @@ -1462,18 +1360,14 @@ ACE_OS::mutex_destroy (ACE_mutex_t *m) #else ACE_UNUSED_ARG (m); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } ACE_INLINE int ACE_OS::mutex_lock (ACE_mutex_t *m) { // ACE_OS_TRACE ("ACE_OS::mutex_lock"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - int dummy_retval = 0; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_mutex_lock (m), - dummy_retval), int, -1); -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) // Note, don't use "::" here since the following call is often a macro. # if (defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)) @@ -1526,7 +1420,7 @@ ACE_OS::mutex_lock (ACE_mutex_t *m) #else ACE_UNUSED_ARG (m); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } ACE_INLINE int @@ -1572,11 +1466,7 @@ ACE_INLINE int ACE_OS::mutex_trylock (ACE_mutex_t *m) { ACE_OS_TRACE ("ACE_OS::mutex_trylock"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - int dummy_retval = 0; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_mutex_trylock (m), - dummy_retval), int, -1); -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) // Note, don't use "::" here since the following call is often a macro. # if (defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)) @@ -1659,7 +1549,7 @@ ACE_OS::mutex_trylock (ACE_mutex_t *m) #else ACE_UNUSED_ARG (m); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } ACE_INLINE int @@ -1815,11 +1705,7 @@ ACE_INLINE int ACE_OS::mutex_unlock (ACE_mutex_t *m) { ACE_OS_TRACE ("ACE_OS::mutex_unlock"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - int dummy_retval = 0; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_mutex_unlock (m), - dummy_retval), int, -1); -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) // Note, don't use "::" here since the following call is often a macro. # if (defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)) @@ -1858,7 +1744,7 @@ ACE_OS::mutex_unlock (ACE_mutex_t *m) #else ACE_UNUSED_ARG (m); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } ACE_INLINE int @@ -1876,7 +1762,7 @@ ACE_OS::thread_mutex_init (ACE_thread_mutex_t *m, ::InitializeCriticalSection (m); return 0; -# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) || defined (ACE_HAS_PACE) +# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) ACE_UNUSED_ARG (type); // Force the use of USYNC_THREAD! return ACE_OS::mutex_init (m, USYNC_THREAD, name, arg); @@ -1912,7 +1798,7 @@ ACE_OS::thread_mutex_init (ACE_thread_mutex_t *m, ::InitializeCriticalSection (m); return 0; -# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) || defined (ACE_HAS_PACE) +# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) ACE_UNUSED_ARG (type); // Force the use of USYNC_THREAD! return ACE_OS::mutex_init (m, USYNC_THREAD, name, arg); @@ -1942,7 +1828,7 @@ ACE_OS::thread_mutex_destroy (ACE_thread_mutex_t *m) ::DeleteCriticalSection (m); return 0; -# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) || defined (ACE_HAS_PACE) +# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) return ACE_OS::mutex_destroy (m); # elif defined (VXWORKS) || defined (ACE_PSOS) @@ -1965,11 +1851,11 @@ ACE_OS::thread_mutex_lock (ACE_thread_mutex_t *m) # if defined (ACE_HAS_WTHREADS) ::EnterCriticalSection (m); return 0; -# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) || defined (ACE_HAS_PACE) +# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) return ACE_OS::mutex_lock (m); -#elif defined (VXWORKS) || defined (ACE_PSOS) +# elif defined (VXWORKS) || defined (ACE_PSOS) return mutex_lock (m); -#endif /* ACE_HAS_STHREADS || ACE_HAS_PTHREADS || ACE_HAS_PACE */ +# endif /* ACE_HAS_STHREADS || ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (m); ACE_NOTSUP_RETURN (-1); @@ -1991,11 +1877,11 @@ ACE_OS::thread_mutex_lock (ACE_thread_mutex_t *m, // Windows synchronization mechanism. #if defined (ACE_HAS_THREADS) && !defined (ACE_HAS_WTHREADS) -# if defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) || defined (ACE_HAS_PACE) +# if defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) return ACE_OS::mutex_lock (m, timeout); #elif defined (VXWORKS) || defined (ACE_PSOS) return mutex_lock (m, timeout); -#endif /* ACE_HAS_STHREADS || ACE_HAS_PTHREADS || ACE_HAS_PACE */ +#endif /* ACE_HAS_STHREADS || ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (m); ACE_UNUSED_ARG (timeout); @@ -2032,7 +1918,7 @@ ACE_OS::thread_mutex_trylock (ACE_thread_mutex_t *m) ACE_UNUSED_ARG (m); ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_WIN32_TRYLOCK */ -# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) || defined (ACE_HAS_PACE) +# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) return ACE_OS::mutex_trylock (m); # elif defined (VXWORKS) || defined (ACE_PSOS) return ACE_OS::mutex_trylock (m); @@ -2052,7 +1938,7 @@ ACE_OS::thread_mutex_unlock (ACE_thread_mutex_t *m) # if defined (ACE_HAS_WTHREADS) ::LeaveCriticalSection (m); return 0; -# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) || defined (ACE_HAS_PACE) +# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) return ACE_OS::mutex_unlock (m); # elif defined (VXWORKS) || defined (ACE_PSOS) return ACE_OS::mutex_unlock (m); @@ -2063,10 +1949,7 @@ ACE_OS::thread_mutex_unlock (ACE_thread_mutex_t *m) #endif /* ACE_HAS_THREADS */ } -// If we're using PACE then we want this method unless we're on Windows. -// Win32 mutexes, semaphores, and condition variables are not yet -// supported in PACE. -#if !defined (ACE_LACKS_COND_T) || (defined (ACE_HAS_PACE) && !defined (ACE_WIN32)) +#if !defined (ACE_LACKS_COND_T) // NOTE: The ACE_OS::cond_* functions for Unix platforms are defined // here because the ACE_OS::sema_* functions below need them. // However, ACE_WIN32 and VXWORKS define the ACE_OS::cond_* functions @@ -2076,10 +1959,7 @@ ACE_INLINE int ACE_OS::cond_destroy (ACE_cond_t *cv) { ACE_OS_TRACE ("ACE_OS::cond_destroy"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_cond_destroy (cv), - ace_result_), int, -1); -# elif defined (ACE_HAS_THREADS) +# if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) # if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6) ACE_OSCALL_RETURN (::pthread_cond_destroy (cv), int, -1); @@ -2095,7 +1975,7 @@ ACE_OS::cond_destroy (ACE_cond_t *cv) # else ACE_UNUSED_ARG (cv); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_THREADS */ } ACE_INLINE int @@ -2103,21 +1983,7 @@ ACE_OS::condattr_init (ACE_condattr_t &attributes, int type) { ACE_UNUSED_ARG (type); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - int result = -1; - - if (::pace_pthread_condattr_init (&attributes) == 0 -# if defined (_POSIX_THREAD_PROCESS_SHARED) - && ::pace_pthread_condattr_setpshared(&attributes, type) == 0 -# endif /* _POSIX_THREAD_PROCESS_SHARED */ - ) - result = 0; - else - result = -1; // ACE_ADAPT_RETVAL used it for intermediate status - - return result; - -# elif defined (ACE_HAS_THREADS) && ! defined (__MACOSX__) +# if defined (ACE_HAS_THREADS) && ! defined (__MACOSX__) # if defined (ACE_HAS_PTHREADS) int result = -1; @@ -2170,19 +2036,17 @@ ACE_OS::condattr_init (ACE_condattr_t &attributes, ACE_UNUSED_ARG (type); return 0; -#else +# else ACE_UNUSED_ARG (attributes); ACE_UNUSED_ARG (type); ACE_NOTSUP_RETURN (-1); -# endif /* */ +# endif /* ACE_HAS_THREADS && !__MACOSX__ */ } ACE_INLINE int ACE_OS::condattr_destroy (ACE_condattr_t &attributes) { -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - return ::pace_pthread_condattr_destroy (&attributes); -# elif defined (ACE_HAS_THREADS) && ! defined (__MACOSX__) +#if defined (ACE_HAS_THREADS) && ! defined (__MACOSX__) # if defined (ACE_HAS_PTHREADS) # if defined (ACE_HAS_PTHREADS_DRAFT4) @@ -2202,7 +2066,7 @@ ACE_OS::condattr_destroy (ACE_condattr_t &attributes) # else ACE_UNUSED_ARG (attributes); return 0; -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_THREADS && !__MACOSX__ */ } ACE_INLINE int @@ -2214,10 +2078,7 @@ ACE_OS::cond_init (ACE_cond_t *cv, // ACE_OS_TRACE ("ACE_OS::cond_init"); ACE_UNUSED_ARG (name); ACE_UNUSED_ARG (arg); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_cond_init (cv, &attributes), - ace_result_), int, -1); -# elif defined (ACE_HAS_THREADS) +# if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) int result = -1; @@ -2254,7 +2115,7 @@ ACE_OS::cond_init (ACE_cond_t *cv, ACE_UNUSED_ARG (name); ACE_UNUSED_ARG (arg); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_THREADS */ } #if defined (ACE_HAS_WCHAR) @@ -2293,9 +2154,7 @@ ACE_INLINE int ACE_OS::cond_signal (ACE_cond_t *cv) { ACE_OS_TRACE ("ACE_OS::cond_signal"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (::pace_pthread_cond_signal (cv), int, -1); -# elif defined (ACE_HAS_THREADS) +# if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) # if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6) ACE_OSCALL_RETURN (::pthread_cond_signal (cv), int, -1); @@ -2312,16 +2171,14 @@ ACE_OS::cond_signal (ACE_cond_t *cv) # else ACE_UNUSED_ARG (cv); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_THREADS */ } ACE_INLINE int ACE_OS::cond_broadcast (ACE_cond_t *cv) { ACE_OS_TRACE ("ACE_OS::cond_broadcast"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (::pace_pthread_cond_broadcast (cv), int, -1); -# elif defined (ACE_HAS_THREADS) +# if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) # if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6) ACE_OSCALL_RETURN (::pthread_cond_broadcast (cv), int, -1); @@ -2341,7 +2198,7 @@ ACE_OS::cond_broadcast (ACE_cond_t *cv) # else ACE_UNUSED_ARG (cv); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_THREADS */ } ACE_INLINE int @@ -2349,9 +2206,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv, ACE_mutex_t *external_mutex) { ACE_OS_TRACE ("ACE_OS::cond_wait"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (::pace_pthread_cond_wait (cv, external_mutex), int, -1); -# elif defined (ACE_HAS_THREADS) +# if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) # if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6) ACE_OSCALL_RETURN (::pthread_cond_wait (cv, external_mutex), int, -1); @@ -2371,7 +2226,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv, ACE_UNUSED_ARG (cv); ACE_UNUSED_ARG (external_mutex); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_THREADS */ } ACE_INLINE int @@ -2380,31 +2235,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, ACE_Time_Value *timeout) { ACE_OS_TRACE ("ACE_OS::cond_timedwait"); - //#if defined (ACE_HAS_PACE) -#if 0 - int result; - timespec_t ts; - - if (timeout != 0) - ts = *timeout; // Calls ACE_Time_Value::operator timespec_t(). - ACE_OSCALL (ACE_ADAPT_RETVAL (timeout == 0 - ? (::pace_pthread_cond_wait (cv, external_mutex)) - : (::pace_pthread_cond_timedwait (cv, external_mutex, (ACE_TIMESPEC_PTR) &ts), - int, -1, result))); - - // We need to adjust this to make the POSIX and Solaris return - // values consistent. EAGAIN is from Pthreads DRAFT4 (HP-UX 10.20 and - // down); EINTR is from LynxOS. - if (result == -1 && - (errno == ETIMEDOUT || errno == EAGAIN || errno == EINTR)) - errno = ETIME; - - if (timeout != 0) - timeout->set (ts); // Update the time value before returning. - - return result; - -# elif defined (ACE_HAS_THREADS) +# if defined (ACE_HAS_THREADS) int result; timespec_t ts; @@ -2504,16 +2335,14 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, ACE_UNUSED_ARG (external_mutex); ACE_UNUSED_ARG (timeout); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_THREADS */ } #endif /* !ACE_LACKS_COND_T */ ACE_INLINE int ACE_OS::thr_equal (ACE_thread_t t1, ACE_thread_t t2) { -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - return ::pace_pthread_equal (t1, t2); -#elif defined (ACE_HAS_PTHREADS) +#if defined (ACE_HAS_PTHREADS) # if defined (pthread_equal) // If it's a macro we can't say "::pthread_equal"... return pthread_equal (t1, t2); @@ -2526,16 +2355,14 @@ ACE_OS::thr_equal (ACE_thread_t t1, ACE_thread_t t2) // Hum, Do we need to treat WTHREAD differently? // levine 13 oct 98 % I don't think so, ACE_thread_t is a DWORD. return t1 == t2; -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_PTHREADS */ } ACE_INLINE void ACE_OS::thr_self (ACE_hthread_t &self) { ACE_OS_TRACE ("ACE_OS::thr_self"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - self = ::pace_pthread_self (); -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) // Note, don't use "::" here since the following call is often a macro. self = pthread_self (); @@ -2552,16 +2379,14 @@ ACE_OS::thr_self (ACE_hthread_t &self) # endif /* ACE_HAS_STHREADS */ #else self = 1; // Might as well make it the main thread ;-) -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } ACE_INLINE ACE_thread_t ACE_OS::thr_self (void) { // ACE_OS_TRACE ("ACE_OS::thr_self"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - return ::pace_pthread_self (); -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) // Note, don't use "::" here since the following call is often a macro. ACE_OSCALL_RETURN (pthread_self (), int, -1); @@ -2578,7 +2403,7 @@ ACE_OS::thr_self (void) # endif /* ACE_HAS_STHREADS */ #else return 1; // Might as well make it the first thread ;-) -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } ACE_INLINE int @@ -2788,22 +2613,7 @@ ACE_INLINE int ACE_OS::sema_destroy (ACE_sema_t *s) { ACE_OS_TRACE ("ACE_OS::sema_destroy"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - int result; - if (s->name_) - { - result = ::pace_sem_unlink (s->name_); - pace_free ((void *) s->name_); - return pace_sem_close (s->sema_); - } - else - { - result = ::pace_sem_destroy (s->sema_); - delete s->sema_; - s->sema_ = 0; - return result; - } -# elif defined (ACE_HAS_POSIX_SEM) +# if defined (ACE_HAS_POSIX_SEM) int result; # if defined (ACE_LACKS_NAMED_POSIX_SEM) if (s->name_) @@ -2863,7 +2673,7 @@ ACE_OS::sema_destroy (ACE_sema_t *s) # else ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_POSIX_SEM */ } // NOTE: The following four function definitions must appear before @@ -2873,9 +2683,7 @@ ACE_INLINE int ACE_OS::close (ACE_HANDLE handle) { ACE_OS_TRACE ("ACE_OS::close"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_close (handle), int, -1); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CloseHandle (handle), ace_result_), int, -1); #elif defined (ACE_PSOS) && ! defined (ACE_PSOS_LACKS_PHILE) u_long result = ::close_f (handle); @@ -2887,7 +2695,7 @@ ACE_OS::close (ACE_HANDLE handle) return ACE_static_cast (int, 0); #else ACE_OSCALL_RETURN (::close (handle), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 */ } // This function returns the number of bytes in the file referenced by @@ -2909,9 +2717,7 @@ ACE_INLINE int ACE_OS::ftruncate (ACE_HANDLE handle, off_t offset) { ACE_OS_TRACE ("ACE_OS::ftruncate"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_ftruncate (handle, offset), int, -1); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) if (::SetFilePointer (handle, offset, 0, FILE_BEGIN) != (unsigned) -1) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::SetEndOfFile (handle), ace_result_), int, -1); else @@ -2925,7 +2731,7 @@ ACE_OS::ftruncate (ACE_HANDLE handle, off_t offset) ACE_OSCALL_RETURN (::ftruncate_f (handle, offset), int, -1); #else ACE_OSCALL_RETURN (::ftruncate (handle, offset), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 */ } ACE_INLINE void * @@ -2944,18 +2750,7 @@ ACE_OS::mmap (void *addr, ACE_UNUSED_ARG (file_mapping_name); #endif /* !defined (ACE_WIN32) || defined (ACE_HAS_PHARLAP) */ -#if defined (ACE_HAS_PACE) && !defined (__Lynx__) && !defined (ACE_WIN32) - ACE_UNUSED_ARG (file_mapping); - ACE_UNUSED_ARG (sa); - ACE_OSCALL_RETURN ((void *) ::pace_mmap (addr, - len, - prot, - flags, - file_handle, - off), - void *, MAP_FAILED); - -#elif defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) int nt_flags = 0; ACE_HANDLE local_handle = ACE_INVALID_HANDLE; @@ -2965,9 +2760,9 @@ ACE_OS::mmap (void *addr, if (ACE_BIT_ENABLED (flags, MAP_PRIVATE)) { -#if !defined(ACE_HAS_WINCE) +# if !defined(ACE_HAS_WINCE) prot = PAGE_WRITECOPY; -#endif // ACE_HAS_WINCE +# endif // ACE_HAS_WINCE nt_flags = FILE_MAP_COPY; } else if (ACE_BIT_ENABLED (flags, MAP_SHARED)) @@ -2981,7 +2776,7 @@ ACE_OS::mmap (void *addr, // Only create a new handle if we didn't have a valid one passed in. if (*file_mapping == ACE_INVALID_HANDLE) { -#if !defined(ACE_HAS_WINCE) && (!defined (ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0)) +# if !defined(ACE_HAS_WINCE) && (!defined (ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0)) int try_create = 1; if ((file_mapping_name != 0) && (*file_mapping_name != 0)) { @@ -3000,7 +2795,7 @@ ACE_OS::mmap (void *addr, } if (try_create) -#endif /* !ACE_HAS_WINCE && (ACE_HAS_WINNT4 || ACE_HAS_WINNT4 == 0) */ +# endif /* !ACE_HAS_WINCE && (ACE_HAS_WINNT4 || ACE_HAS_WINNT4 == 0) */ { const LPSECURITY_ATTRIBUTES attr = ACE_OS::default_win32_security_attributes (sa); @@ -3017,18 +2812,18 @@ ACE_OS::mmap (void *addr, if (*file_mapping == 0) ACE_FAIL_RETURN (MAP_FAILED); -# if defined (ACE_OS_EXTRA_MMAP_FLAGS) +# if defined (ACE_OS_EXTRA_MMAP_FLAGS) nt_flags |= ACE_OS_EXTRA_MMAP_FLAGS; -# endif /* ACE_OS_EXTRA_MMAP_FLAGS */ +# endif /* ACE_OS_EXTRA_MMAP_FLAGS */ -# if !defined (ACE_HAS_WINCE) +# if !defined (ACE_HAS_WINCE) void *addr_mapping = ::MapViewOfFileEx (*file_mapping, nt_flags, 0, off, len, addr); -# else +# else ACE_UNUSED_ARG (addr); // WinCE doesn't allow specifying <addr>. void *addr_mapping = ::MapViewOfFile (*file_mapping, nt_flags, @@ -3040,7 +2835,7 @@ ACE_OS::mmap (void *addr, addr = addr_mapping; } -# endif /* ! ACE_HAS_WINCE */ +# endif /* ! ACE_HAS_WINCE */ // Only close this down if we used the temporary. if (file_mapping == &local_handle) @@ -3084,9 +2879,9 @@ ACE_OS::mmap (void *addr, return MAP_FAILED; else { -# if defined (ACE_OS_EXTRA_MMAP_FLAGS) +# if defined (ACE_OS_EXTRA_MMAP_FLAGS) flags |= ACE_OS_EXTRA_MMAP_FLAGS; -# endif /* ACE_OS_EXTRA_MMAP_FLAGS */ +# endif /* ACE_OS_EXTRA_MMAP_FLAGS */ char *map = (char *) ::mmap ((ACE_MMAP_TYPE) addr, len, prot, @@ -3105,9 +2900,9 @@ ACE_OS::mmap (void *addr, #elif !defined (ACE_LACKS_MMAP) ACE_UNUSED_ARG (sa); -# if defined (ACE_OS_EXTRA_MMAP_FLAGS) +# if defined (ACE_OS_EXTRA_MMAP_FLAGS) flags |= ACE_OS_EXTRA_MMAP_FLAGS; -# endif /* ACE_OS_EXTRA_MMAP_FLAGS */ +# endif /* ACE_OS_EXTRA_MMAP_FLAGS */ ACE_UNUSED_ARG (file_mapping); ACE_OSCALL_RETURN ((void *) ::mmap ((ACE_MMAP_TYPE) addr, len, @@ -3126,7 +2921,7 @@ ACE_OS::mmap (void *addr, ACE_UNUSED_ARG (file_mapping); ACE_UNUSED_ARG (sa); ACE_NOTSUP_RETURN (MAP_FAILED); -#endif /*ACE_HAS_PACE */ +#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ } // NOTE: The previous four function definitions must appear before @@ -3142,40 +2937,14 @@ ACE_OS::sema_init (ACE_sema_t *s, LPSECURITY_ATTRIBUTES sa) { ACE_OS_TRACE ("ACE_OS::sema_init"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_UNUSED_ARG (arg); - ACE_UNUSED_ARG (max); - ACE_UNUSED_ARG (sa); - s->name_ = 0; - if (name) - { - ACE_ALLOCATOR_RETURN (s->name_, - ACE_OS::strdup (name), - -1); - s->sema_ = ::pace_sem_open (s->name_, - O_CREAT, - ACE_DEFAULT_FILE_PERMS, - count); - if (s->sema_ == (pace_sem_t *) SEM_FAILED) - return -1; - else - return 0; - } - else - { - ACE_NEW_RETURN (s->sema_, pace_sem_t, -1); - ACE_OSCALL_RETURN (::pace_sem_init (s->sema_, - type != USYNC_THREAD, - count), int, -1); - } -# elif defined (ACE_HAS_POSIX_SEM) +#if defined (ACE_HAS_POSIX_SEM) ACE_UNUSED_ARG (arg); ACE_UNUSED_ARG (max); ACE_UNUSED_ARG (sa); s->name_ = 0; -# if defined (ACE_LACKS_NAMED_POSIX_SEM) +# if defined (ACE_LACKS_NAMED_POSIX_SEM) s->new_sema_ = 0; if (type == USYNC_PROCESS) { @@ -3228,10 +2997,10 @@ ACE_OS::sema_init (ACE_sema_t *s, return -1; return 0; } -#else +# else if (name) { -#if defined (sun) || defined (HPUX) +# if defined (sun) || defined (HPUX) // Solaris and HP-UX require the name to start with a slash. Solaris // further requires that there be no other slashes than the first. const char *last_slash = ACE_OS::strrchr (name, '/'); @@ -3242,11 +3011,11 @@ ACE_OS::sema_init (ACE_sema_t *s, ACE_OS::strcat (name2, name); name = name2; } -# if defined (sun) +# if defined (sun) else name = last_slash; // Chop off chars preceding last slash -# endif /* sun */ -#endif /* sun || HPUX */ +# endif /* sun */ +# endif /* sun || HPUX */ ACE_ALLOCATOR_RETURN (s->name_, ACE_OS::strdup (name), @@ -3260,27 +3029,27 @@ ACE_OS::sema_init (ACE_sema_t *s, else return 0; } -# endif /* ACE_LACKS_NAMED_POSIX_SEM */ +# endif /* ACE_LACKS_NAMED_POSIX_SEM */ else { ACE_NEW_RETURN (s->sema_, sem_t, -1); -# if defined (ACE_LACKS_NAMED_POSIX_SEM) +# if defined (ACE_LACKS_NAMED_POSIX_SEM) s->new_sema_ = 1; -# endif /* ACE_LACKS_NAMED_POSIX_SEM */ +# endif /* ACE_LACKS_NAMED_POSIX_SEM */ ACE_OSCALL_RETURN (::sem_init (s->sema_, type != USYNC_THREAD, count), int, -1); } -# elif defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) +#elif defined (ACE_HAS_THREADS) +# if defined (ACE_HAS_STHREADS) ACE_UNUSED_ARG (name); ACE_UNUSED_ARG (max); ACE_UNUSED_ARG (sa); ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_init (s, count, type, arg), ace_result_), int, -1); -# elif defined (ACE_HAS_PTHREADS) +# elif defined (ACE_HAS_PTHREADS) ACE_UNUSED_ARG (max); ACE_UNUSED_ARG (sa); int result = -1; @@ -3303,8 +3072,8 @@ ACE_OS::sema_init (ACE_sema_t *s, ACE_OS::cond_destroy (&s->count_nonzero_); } return result; -# elif defined (ACE_HAS_WTHREADS) -# if ! defined (ACE_USES_WINCE_SEMA_SIMULATION) +# elif defined (ACE_HAS_WTHREADS) +# if ! defined (ACE_USES_WINCE_SEMA_SIMULATION) ACE_UNUSED_ARG (type); ACE_UNUSED_ARG (arg); // Create the semaphore with its value initialized to <count> and @@ -3320,7 +3089,7 @@ ACE_OS::sema_init (ACE_sema_t *s, /* NOTREACHED */ else return 0; -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ +# else /* ACE_USES_WINCE_SEMA_SIMULATION */ int result = -1; // Initialize internal object for semaphore simulation. @@ -3353,8 +3122,8 @@ ACE_OS::sema_init (ACE_sema_t *s, ACE_OS::event_destroy (&s->count_nonzero_); } return result; -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ -# elif defined (ACE_PSOS) +# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ +# elif defined (ACE_PSOS) u_long result; ACE_OS::memcpy (s->name_, name, sizeof (s->name_)); // default semaphore creation flags to priority based, global across nodes @@ -3363,7 +3132,7 @@ ACE_OS::sema_init (ACE_sema_t *s, flags |= (type & SM_FIFO) ? SM_FIFO : SM_PRIOR; result = ::sm_create (s->name_, count, flags, &(s->sema_)); return (result == 0) ? 0 : -1; -# elif defined (VXWORKS) +# elif defined (VXWORKS) ACE_UNUSED_ARG (name); ACE_UNUSED_ARG (arg); ACE_UNUSED_ARG (max); @@ -3371,8 +3140,8 @@ ACE_OS::sema_init (ACE_sema_t *s, s->name_ = 0; s->sema_ = ::semCCreate (type, count); return s->sema_ ? 0 : -1; -# endif /* ACE_HAS_STHREADS */ -# else +# endif /* ACE_HAS_STHREADS */ +#else ACE_UNUSED_ARG (s); ACE_UNUSED_ARG (count); ACE_UNUSED_ARG (type); @@ -3381,7 +3150,7 @@ ACE_OS::sema_init (ACE_sema_t *s, ACE_UNUSED_ARG (max); ACE_UNUSED_ARG (sa); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_POSIX_SEM */ } #if defined (ACE_HAS_WCHAR) @@ -3448,7 +3217,7 @@ ACE_OS::sema_init (ACE_sema_t *s, # else /* ACE_HAS_WTHREADS */ // Just call the normal char version. return ACE_OS::sema_init (s, count, type, ACE_Wide_To_Ascii (name).char_rep (), arg, max, sa); -# endif /* ACE_HAS_PACE && ACE_HAS_WTHREADS */ +# endif /* ACE_HAS_WTHREADS */ } #endif /* ACE_HAS_WCHAR */ @@ -3456,9 +3225,7 @@ ACE_INLINE int ACE_OS::sema_post (ACE_sema_t *s) { ACE_OS_TRACE ("ACE_OS::sema_post"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (::pace_sem_post (s->sema_), int, -1); -# elif defined (ACE_HAS_POSIX_SEM) +# if defined (ACE_HAS_POSIX_SEM) ACE_OSCALL_RETURN (::sem_post (s->sema_), int, -1); # elif defined (ACE_HAS_THREADS) # if defined (ACE_HAS_STHREADS) @@ -3512,7 +3279,7 @@ ACE_OS::sema_post (ACE_sema_t *s) # else ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_POSIX_SEM */ } ACE_INLINE int @@ -3520,14 +3287,8 @@ ACE_OS::sema_post (ACE_sema_t *s, size_t release_count) { #if defined (ACE_WIN32) && !defined (ACE_USES_WINCE_SEMA_SIMULATION) // Win32 supports this natively. -# if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::ReleaseSemaphore (*(s->sema_), - release_count, 0), ace_result_), - int, -1); -# else ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::ReleaseSemaphore (*s, release_count, 0), ace_result_), int, -1); -# endif /* ACE_HAS_PACE */ #else // On POSIX platforms we need to emulate this ourselves. // @@ We can optimize on this implementation. However, @@ -3548,9 +3309,7 @@ ACE_INLINE int ACE_OS::sema_trywait (ACE_sema_t *s) { ACE_OS_TRACE ("ACE_OS::sema_trywait"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (::pace_sem_trywait (s->sema_), int, -1); -# elif defined (ACE_HAS_POSIX_SEM) +# if defined (ACE_HAS_POSIX_SEM) // POSIX semaphores set errno to EAGAIN if trywait fails ACE_OSCALL_RETURN (::sem_trywait (s->sema_), int, -1); # elif defined (ACE_HAS_THREADS) @@ -3655,16 +3414,14 @@ ACE_OS::sema_trywait (ACE_sema_t *s) # else ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_POSIX_SEM */ } ACE_INLINE int ACE_OS::sema_wait (ACE_sema_t *s) { ACE_OS_TRACE ("ACE_OS::sema_wait"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (::pace_sem_wait (s->sema_), int, -1); -# elif defined (ACE_HAS_POSIX_SEM) +# if defined (ACE_HAS_POSIX_SEM) ACE_OSCALL_RETURN (::sem_wait (s->sema_), int, -1); # elif defined (ACE_HAS_THREADS) # if defined (ACE_HAS_STHREADS) @@ -3765,7 +3522,7 @@ ACE_OS::sema_wait (ACE_sema_t *s) # else ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_POSIX_SEM */ } ACE_INLINE int @@ -5610,11 +5367,7 @@ ACE_OS::socket (int domain, ACE_INLINE int ACE_OS::atoi (const char *s) { -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_atoi (s), int, -1); -#else /* ACE_HAS_PACE */ ACE_OSCALL_RETURN (::atoi (s), int, -1); -#endif /* ACE_HAS_PACE */ } #if defined (ACE_HAS_WCHAR) @@ -5727,21 +5480,15 @@ ACE_OS::sendmsg (ACE_HANDLE handle, ACE_INLINE int ACE_OS::fclose (FILE *fp) { -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_fclose (fp), int, -1); -#else ACE_OS_TRACE ("ACE_OS::fclose"); ACE_OSCALL_RETURN (::fclose (fp), int, -1); -#endif /* ACE_HAS_PACE */ } ACE_INLINE ACE_TCHAR * ACE_OS::fgets (ACE_TCHAR *buf, int size, FILE *fp) { ACE_OS_TRACE ("ACE_OS::fgets"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_fgets (buf, size, fp), char*, 0); -#elif defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_WINCE) ACE_UNUSED_ARG (buf); ACE_UNUSED_ARG (size); ACE_UNUSED_ARG (fp); @@ -5750,7 +5497,7 @@ ACE_OS::fgets (ACE_TCHAR *buf, int size, FILE *fp) ACE_OSCALL_RETURN (::fgetws (buf, size, fp), wchar_t *, 0); #else /* ACE_WIN32 */ ACE_OSCALL_RETURN (::fgets (buf, size, fp), char *, 0); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_WINCE */ } #if !defined (ACE_WIN32) @@ -5759,12 +5506,8 @@ ACE_OS::fgets (ACE_TCHAR *buf, int size, FILE *fp) ACE_INLINE FILE * ACE_OS::fopen (const ACE_TCHAR *filename, const ACE_TCHAR *mode) { -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_fopen (filename, mode), FILE*, 0); -#else ACE_OS_TRACE ("ACE_OS::fopen"); ACE_OSCALL_RETURN (::fopen (filename, mode), FILE *, 0); -#endif /* ACE_HAS_PACE */ } #endif /* ACE_WIN32 */ @@ -5772,21 +5515,17 @@ ACE_INLINE FILE * ACE_OS::freopen (const ACE_TCHAR *filename, const ACE_TCHAR *mode, FILE* stream) { ACE_OS_TRACE ("ACE_OS::freopen"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_freopen (filename, mode, stream), FILE*, 0); -#elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) +#if defined (ACE_WIN32) && defined (ACE_USES_WCHAR) ACE_OSCALL_RETURN (::_wfreopen (filename, mode, stream), FILE *, 0); #else ACE_OSCALL_RETURN (::freopen (filename, mode, stream), FILE *, 0); -#endif /* defined (ACE_HAS_PACE) */ +#endif /* ACE_WIN32 && ACE_USES_WCHAR */ } ACE_INLINE int ACE_OS::fflush (FILE *fp) { -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_fflush (fp), int, -1); -#elif !defined (ACE_HAS_WINCE) +#if !defined (ACE_HAS_WINCE) ACE_OS_TRACE ("ACE_OS::fflush"); #if defined (VXWORKS) if (fp == 0) @@ -5801,33 +5540,29 @@ ACE_OS::fflush (FILE *fp) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL(::FlushFileBuffers (fp), ace_result_), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* !ACE_HAS_WINCE */ } ACE_INLINE size_t ACE_OS::fread (void *ptr, size_t size, size_t nelems, FILE *fp) { ACE_OS_TRACE ("ACE_OS::fread"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_fread (ptr, size, nelems, fp), int, 0); -#elif defined (ACE_LACKS_POSIX_PROTOTYPES) +#if defined (ACE_LACKS_POSIX_PROTOTYPES) ACE_OSCALL_RETURN (::fread ((char *) ptr, size, nelems, fp), int, 0); #else ACE_OSCALL_RETURN (::fread (ptr, size, nelems, fp), int, 0); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_POSIX_PROTOTYPES */ } ACE_INLINE size_t ACE_OS::fwrite (const void *ptr, size_t size, size_t nitems, FILE *fp) { ACE_OS_TRACE ("ACE_OS::fwrite"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_fwrite (ptr, size, nitems, fp), int, 0); -#elif defined (ACE_LACKS_POSIX_PROTOTYPES) +#if defined (ACE_LACKS_POSIX_PROTOTYPES) ACE_OSCALL_RETURN (::fwrite ((const char *) ptr, size, nitems, fp), int, 0); #else ACE_OSCALL_RETURN (::fwrite (ptr, size, nitems, fp), int, 0); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_POSIX_PROTOTYPES */ } ACE_INLINE int @@ -5835,15 +5570,7 @@ ACE_OS::truncate (const ACE_TCHAR *filename, off_t offset) { ACE_OS_TRACE ("ACE_OS::truncate"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - int fd = ::pace_open (filename, O_RDWR, ACE_DEFAULT_FILE_PERMS); - int result = 0; - if (fd == -1) - return -1; - ACE_OSCALL (::pace_ftruncate (fd, offset), int, -1, result); - pace_close (fd); - return result; -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) ACE_HANDLE handle = ACE_OS::open (filename, O_WRONLY, ACE_DEFAULT_FILE_PERMS); @@ -5870,7 +5597,7 @@ ACE_OS::truncate (const ACE_TCHAR *filename, ACE_UNUSED_ARG (filename); ACE_UNUSED_ARG (offset); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 */ } // Accessors to PWD file. @@ -5878,9 +5605,7 @@ ACE_OS::truncate (const ACE_TCHAR *filename, ACE_INLINE struct passwd * ACE_OS::getpwnam (const char *name) { -#if defined (ACE_HAS_PACE) - return ::pace_getpwnam (name); -#elif !defined (ACE_LACKS_PWD_FUNCTIONS) +#if !defined (ACE_LACKS_PWD_FUNCTIONS) # if !defined (ACE_WIN32) return ::getpwnam (name); # else @@ -5890,7 +5615,7 @@ ACE_OS::getpwnam (const char *name) #else ACE_UNUSED_ARG (name); ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_PWD_FUNCTIONS */ } ACE_INLINE void @@ -5935,15 +5660,11 @@ ACE_INLINE struct passwd * ACE_OS::getpwnam_r (const char *name, struct passwd *pwent, char *buffer, int buflen) { -#if defined (ACE_HAS_PACE) || defined (ACE_HAS_POSIX_GETPWNAM_R) +#if defined (ACE_HAS_POSIX_GETPWNAM_R) struct passwd *result; int status; -# if defined (ACE_HAS_PACE) - status = ::pace_getpwnam_r (name, pwent, buffer, buflen, &result); -# else status = ::getpwnam_r (name, pwent, buffer, buflen, &result); -# endif /* ACE_HAS_PACE */ if (status != 0) { @@ -6005,7 +5726,7 @@ ACE_OS::getpwnam_r (const char *name, struct passwd *pwent, ACE_UNUSED_ARG (buffer); ACE_UNUSED_ARG (buflen); ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_POSIX_GETPWNAM_R */ } // DNS accessors. @@ -6432,42 +6153,36 @@ ACE_INLINE void ACE_OS::perror (const ACE_TCHAR *s) { ACE_OS_TRACE ("ACE_OS::perror"); -#if defined (ACE_HAS_PACE) - ::pace_perror (s); -#elif defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_WINCE) // @@ WINCE: How should this be handled ACE_UNUSED_ARG (s); #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) ::_wperror (s); #else ::perror (s); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_WINCE */ } ACE_INLINE int ACE_OS::puts (const ACE_TCHAR *s) { ACE_OS_TRACE ("ACE_OS::puts"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_puts (s), int, -1); -#elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) +#if defined (ACE_WIN32) && defined (ACE_USES_WCHAR) ACE_OSCALL_RETURN (::_putws (s), int, -1); #else /* ACE_WIN32 */ ACE_OSCALL_RETURN (::puts (s), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 && ACE_USES_WCHAR */ } ACE_INLINE int ACE_OS::fputs (const ACE_TCHAR *s, FILE *stream) { ACE_OS_TRACE ("ACE_OS::fputs"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_fputs (s, stream), int, -1); -#elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) +#if defined (ACE_WIN32) && defined (ACE_USES_WCHAR) ACE_OSCALL_RETURN (::fputws (s, stream), int, -1); #else /* ACE_WIN32 */ ACE_OSCALL_RETURN (::fputs (s, stream), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 && ACE_USES_WCHAR */ } ACE_INLINE ACE_SignalHandler @@ -6476,13 +6191,7 @@ ACE_OS::signal (int signum, ACE_SignalHandler func) if (signum == 0) return 0; else -#if defined (ACE_HAS_PACE) -# if defined (ACE_HAS_LYNXOS_SIGNALS) - return (void (*)(...))::pace_signal (signum, (void (*)(int)) func); -# else - return ::pace_signal (signum, func); -# endif /* ACE_HAS_LYNXOS_SIGNALS */ -#elif defined (ACE_PSOS) && !defined (ACE_PSOS_TM) && !defined (ACE_PSOS_DIAB_MIPS) && !defined (ACE_PSOS_DIAB_PPC) +#if defined (ACE_PSOS) && !defined (ACE_PSOS_TM) && !defined (ACE_PSOS_DIAB_MIPS) && !defined (ACE_PSOS_DIAB_PPC) return (ACE_SignalHandler) ::signal (signum, (void (*)(void)) func); #elif defined (ACE_PSOS_DIAB_MIPS) || defined (ACE_PSOS_DIAB_PPC) return 0; @@ -6502,7 +6211,7 @@ ACE_OS::signal (int signum, ACE_SignalHandler func) ACE_UNUSED_ARG (signum); ACE_UNUSED_ARG (func); ACE_NOTSUP_RETURN (0); // Should return SIG_ERR but it is not defined on WinCE. -#endif /* ACE_HAS_PACE */ +#endif /* ACE_PSOS && !ACE_PSOS_TM && !ACE_PSOS_DIAB_MIPS && !ACE_PSOS_DIAB_PPC */ } ACE_INLINE int @@ -6544,14 +6253,7 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread) # elif defined (ACE_PSOS) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::t_resume (target_thread), ace_result_), int, -1); # elif defined (VXWORKS) -# if defined (ACE_HAS_PACE) - // pthread_continue (like pthread_suspend) is not an official POSIX - // function. We get this for free with ACE. So use the thread ID from - // the pace_pthread_t structure. - ACE_OSCALL_RETURN (::taskResume (target_thread->tid), int, -1); -# else ACE_OSCALL_RETURN (::taskResume (target_thread), int, -1); -# endif /* ACE_HAS_PACE */ # endif /* ACE_HAS_STHREADS */ #else ACE_UNUSED_ARG (target_thread); @@ -6562,9 +6264,7 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread) ACE_INLINE int ACE_OS::thr_cmp (ACE_hthread_t t1, ACE_hthread_t t2) { -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - return ::pace_pthread_equal (t1, t2); -#elif defined (ACE_HAS_PTHREADS) +#if defined (ACE_HAS_PTHREADS) # if defined (pthread_equal) // If it's a macro we can't say "::pthread_equal"... return pthread_equal (t1, t2); @@ -6575,7 +6275,7 @@ ACE_OS::thr_cmp (ACE_hthread_t t1, ACE_hthread_t t2) // Hum, Do we need to treat WTHREAD differently? // levine 13 oct 98 % Probably, ACE_hthread_t is a HANDLE. return t1 == t2; -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_PTHREADS */ } ACE_INLINE int @@ -6599,16 +6299,7 @@ ACE_INLINE int ACE_OS::thr_getprio (ACE_hthread_t thr_id, int &prio) { ACE_OS_TRACE ("ACE_OS::thr_getprio"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - struct sched_param param; - int result; - int policy = 0; - - result = ::pace_pthread_getschedparam (thr_id, &policy, ¶m); - - prio = param.sched_priority; - return result; -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if (defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_SETSCHED)) # if defined (ACE_HAS_PTHREADS_DRAFT4) @@ -6664,7 +6355,7 @@ ACE_OS::thr_getprio (ACE_hthread_t thr_id, int &prio) ACE_UNUSED_ARG (thr_id); ACE_UNUSED_ARG (prio); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } #if defined (ACE_HAS_TSS_EMULATION) @@ -6674,12 +6365,6 @@ ACE_INLINE int ACE_OS::thr_getspecific (ACE_OS_thread_key_t key, void **data) { ACE_OS_TRACE ("ACE_OS::thr_getspecific"); -// If we are using TSS emulation then we shuld use ACE's implementation -// of it and not make any PACE calls. -//# if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) -// *data = ::pace_pthread_getspecific (key); -// return 0; -//# elif defined (ACE_HAS_THREADS) # if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) # if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6) @@ -6729,7 +6414,6 @@ ACE_OS::thr_getspecific (ACE_OS_thread_key_t key, void **data) ACE_UNUSED_ARG (key); ACE_UNUSED_ARG (data); ACE_NOTSUP_RETURN (-1); -//# endif /* ACE_HAS_PACE */ # endif /* ACE_HAS_THREADS */ } # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */ @@ -6811,12 +6495,7 @@ ACE_INLINE int ACE_OS::thr_getspecific (ACE_thread_key_t key, void **data) { // ACE_OS_TRACE ("ACE_OS::thr_getspecific"); - // If we are using TSS emulation then we shuld use ACE's implementation - // of it and not make any PACE calls. -#if defined (ACE_HAS_PACE) && !defined (ACE_HAS_TSS_EMULATION) && !defined (ACE_WIN32) - *data = ::pace_pthread_getspecific (key); - return 0; -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_TSS_EMULATION) ACE_KEY_INDEX (key_index, key); if (key_index >= ACE_TSS_Emulation::total_keys ()) @@ -6880,7 +6559,7 @@ ACE_OS::thr_getspecific (ACE_thread_key_t key, void **data) ACE_UNUSED_ARG (key); ACE_UNUSED_ARG (data); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE && !ACE_HAS_TSS_EMULATION */ +#endif /* ACE_HAS_THREADS */ } ACE_INLINE int @@ -6888,11 +6567,7 @@ ACE_OS::thr_join (ACE_hthread_t thr_handle, ACE_THR_FUNC_RETURN *status) { ACE_OS_TRACE ("ACE_OS::thr_join"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN ( ACE_ADAPT_RETVAL (::pace_pthread_join - (thr_handle, status), - ace_result_), int, -1); -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_STHREADS) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_join (thr_handle, 0, status), ace_result_), int, -1); @@ -6956,7 +6631,7 @@ ACE_OS::thr_join (ACE_hthread_t thr_handle, ACE_UNUSED_ARG (thr_handle); ACE_UNUSED_ARG (status); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } ACE_INLINE int @@ -6965,12 +6640,7 @@ ACE_OS::thr_join (ACE_thread_t waiter_id, ACE_THR_FUNC_RETURN *status) { ACE_OS_TRACE ("ACE_OS::thr_join"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_UNUSED_ARG (thr_id); - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_join - (waiter_id, status), - ace_result_), int, -1); -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_STHREADS) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_join (waiter_id, thr_id, status), ace_result_), int, -1); @@ -7007,18 +6677,14 @@ ACE_OS::thr_join (ACE_thread_t waiter_id, ACE_UNUSED_ARG (thr_id); ACE_UNUSED_ARG (status); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } ACE_INLINE int ACE_OS::thr_setcancelstate (int new_state, int *old_state) { ACE_OS_TRACE ("ACE_OS::thr_setcancelstate"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_setcancelstate - (new_state, old_state), - ace_result_), int, -1); -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL) # if defined (ACE_HAS_PTHREADS_DRAFT4) int old; @@ -7053,18 +6719,14 @@ ACE_OS::thr_setcancelstate (int new_state, int *old_state) ACE_UNUSED_ARG (new_state); ACE_UNUSED_ARG (old_state); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } ACE_INLINE int ACE_OS::thr_setcanceltype (int new_type, int *old_type) { ACE_OS_TRACE ("ACE_OS::thr_setcanceltype"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_setcanceltype - (new_type, old_type), - ace_result_), int, -1); -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL) # if defined (ACE_HAS_PTHREADS_DRAFT4) int old; @@ -7091,17 +6753,14 @@ ACE_OS::thr_setcanceltype (int new_type, int *old_type) ACE_UNUSED_ARG (new_type); ACE_UNUSED_ARG (old_type); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } ACE_INLINE int ACE_OS::thr_cancel (ACE_thread_t thr_id) { ACE_OS_TRACE ("ACE_OS::thr_cancel"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_cancel (thr_id), - ace_result_), int, -1); -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL) # if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6) ACE_OSCALL_RETURN (::pthread_cancel (thr_id), int, -1); @@ -7117,7 +6776,7 @@ ACE_OS::thr_cancel (ACE_thread_t thr_id) #else ACE_UNUSED_ARG (thr_id); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } ACE_INLINE int @@ -7127,10 +6786,7 @@ ACE_OS::sigwait (sigset_t *sset, int *sig) int local_sig; if (sig == 0) sig = &local_sig; -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - errno = ::pace_sigwait (sset, sig); - return errno == 0 ? *sig : -1; -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if (defined (__FreeBSD__) && (__FreeBSD__ < 3)) || defined (CHORUS) || defined (ACE_PSOS) || defined (__MACOSX__) ACE_UNUSED_ARG (sset); ACE_NOTSUP_RETURN (-1); @@ -7180,7 +6836,7 @@ ACE_OS::sigwait (sigset_t *sset, int *sig) ACE_UNUSED_ARG (sset); ACE_UNUSED_ARG (sig); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } ACE_INLINE int @@ -7189,19 +6845,7 @@ ACE_OS::sigtimedwait (const sigset_t *sset, const ACE_Time_Value *timeout) { ACE_OS_TRACE ("ACE_OS::sigtimedwait"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - timespec ts; - timespec *tsp; - if (timeout !=0) - { - ts = *timeout; - tsp = &ts; - } - else - tsp = 0; - ACE_OSCALL_RETURN (::pace_sigtimedwait (sset, info, tsp), - int, -1); -#elif defined (ACE_HAS_SIGTIMEDWAIT) +#if defined (ACE_HAS_SIGTIMEDWAIT) timespec_t ts; timespec_t *tsp; @@ -7220,7 +6864,7 @@ ACE_OS::sigtimedwait (const sigset_t *sset, ACE_UNUSED_ARG (info); ACE_UNUSED_ARG (timeout); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_SIGTIMEDWAIT */ } ACE_INLINE void @@ -7250,11 +6894,7 @@ ACE_OS::thr_sigsetmask (int how, sigset_t *osm) { ACE_OS_TRACE ("ACE_OS::thr_sigsetmask"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_sigmask - (how, nsm, osm), - ace_result_), int, -1); -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_LACKS_PTHREAD_THR_SIGSETMASK) // DCE threads and Solaris 2.4 have no such function. ACE_UNUSED_ARG (osm); @@ -7328,17 +6968,14 @@ ACE_OS::thr_sigsetmask (int how, ACE_UNUSED_ARG (nsm); ACE_UNUSED_ARG (osm); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } ACE_INLINE int ACE_OS::thr_kill (ACE_thread_t thr_id, int signum) { ACE_OS_TRACE ("ACE_OS::thr_kill"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_kill (thr_id, signum), - ace_result_), int, -1); -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) # if defined (ACE_HAS_PTHREADS_DRAFT4) || defined(ACE_LACKS_PTHREAD_KILL) ACE_UNUSED_ARG (signum); @@ -7376,7 +7013,7 @@ ACE_OS::thr_kill (ACE_thread_t thr_id, int signum) ACE_UNUSED_ARG (thr_id); ACE_UNUSED_ARG (signum); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } ACE_INLINE size_t @@ -7416,17 +7053,9 @@ ACE_OS::thr_min_stack (void) ACE_hthread_t tid; ACE_OS::thr_self (tid); -# if defined (ACE_HAS_PACE) - // pthread_min_stack is not a POSIX function. So use the thread ID from - // the pace_pthread_t structure. - ACE_OSCALL (ACE_ADAPT_RETVAL (::taskInfoGet (tid->tid, &taskDesc), - status), - STATUS, -1, status); -# else ACE_OSCALL (ACE_ADAPT_RETVAL (::taskInfoGet (tid, &taskDesc), status), STATUS, -1, status); -# endif /* ACE_HAS_PACE */ return status == OK ? taskDesc.td_stackSize : 0; # else /* Should not happen... */ ACE_NOTSUP_RETURN (0); @@ -7466,24 +7095,7 @@ ACE_INLINE int ACE_OS::thr_setprio (ACE_hthread_t thr_id, int prio) { ACE_OS_TRACE ("ACE_OS::thr_setprio"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - struct sched_param param; - int policy = 0; - int result; - ACE_OSCALL (ACE_ADAPT_RETVAL (::pace_pthread_getschedparam - (thr_id, &policy, ¶m), - result), int, -1, result); - - if (result == -1) - return result; // error in pthread_getschedparam - param.sched_priority = prio; -# if defined (ACE_WIN32) - int ace_result_ = 0; -# endif /* ACE_WIN32 */ - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_setschedparam - (thr_id, policy, ¶m), - ace_result_), int, -1); -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if (defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_SETSCHED)) # if defined (ACE_HAS_PTHREADS_DRAFT4) @@ -7537,7 +7149,7 @@ ACE_OS::thr_setprio (ACE_hthread_t thr_id, int prio) ACE_UNUSED_ARG (thr_id); ACE_UNUSED_ARG (prio); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } ACE_INLINE int @@ -7565,14 +7177,7 @@ ACE_OS::thr_suspend (ACE_hthread_t target_thread) # elif defined (ACE_PSOS) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::t_suspend (target_thread), ace_result_), int, -1); # elif defined (VXWORKS) -# if defined (ACE_HAS_PACE) - // pthread_suspend (like pthread_continue) is not an official POSIX - // function. We get this for free with ACE. So use the thread ID from - // the pace_pthread_t structure. - ACE_OSCALL_RETURN (::taskSuspend (target_thread->tid), int, -1); -# else ACE_OSCALL_RETURN (::taskSuspend (target_thread), int, -1); -# endif /* ACE_HAS_PACE */ # endif /* ACE_HAS_STHREADS */ #else ACE_UNUSED_ARG (target_thread); @@ -7584,9 +7189,7 @@ ACE_INLINE void ACE_OS::thr_yield (void) { ACE_OS_TRACE ("ACE_OS::thr_yield"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ::pace_sched_yield (); -#elif defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) # if defined (ACE_HAS_PTHREADS_STD) // Note - this is a POSIX.4 function - not a POSIX.1c function... @@ -7609,7 +7212,7 @@ ACE_OS::thr_yield (void) # endif /* ACE_HAS_STHREADS */ #else ; -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_THREADS */ } ACE_INLINE int @@ -7631,15 +7234,13 @@ ACE_OS::priority_control (ACE_idtype_t idtype, ACE_id_t id, int cmd, void *arg) ACE_INLINE void ACE_OS::rewind (FILE *fp) { -#if defined (ACE_HAS_PACE) - ::pace_rewind (fp); -#elif !defined (ACE_HAS_WINCE) +#if !defined (ACE_HAS_WINCE) ACE_OS_TRACE ("ACE_OS::rewind"); ::rewind (fp); #else // In WinCE, "FILE *" is actually a HANDLE. ::SetFilePointer (fp, 0L, 0L, FILE_BEGIN); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_WINCE */ } ACE_INLINE ssize_t @@ -7859,9 +7460,7 @@ ACE_INLINE int ACE_OS::access (const char *path, int amode) { ACE_OS_TRACE ("ACE_OS::access"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_access (path, amode), int, -1); -#elif defined (ACE_LACKS_ACCESS) +#if defined (ACE_LACKS_ACCESS) # if defined (ACE_HAS_WINCE) // @@ WINCE: There should be a Win32 API that can do this. // Hard coded read access here. @@ -7877,7 +7476,7 @@ ACE_OS::access (const char *path, int amode) # endif // ACE_HAS_WINCE #else ACE_OSCALL_RETURN (::access (path, amode), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_ACCESS */ } @@ -7897,10 +7496,7 @@ ACE_INLINE ACE_HANDLE ACE_OS::creat (const ACE_TCHAR *filename, mode_t mode) { ACE_OS_TRACE ("ACE_OS::creat"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_creat (filename, mode), - ACE_HANDLE, ACE_INVALID_HANDLE); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) return ACE_OS::open (filename, O_CREAT|O_TRUNC|O_WRONLY, mode); #elif defined(ACE_PSOS) ACE_OSCALL_RETURN(::create_f((char *)filename, 1024, @@ -7917,7 +7513,7 @@ ACE_OS::creat (const ACE_TCHAR *filename, mode_t mode) #else ACE_OSCALL_RETURN (::creat (filename, mode), ACE_HANDLE, ACE_INVALID_HANDLE); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 */ } #if !defined (ACE_WIN32) && !defined (VXWORKS) && !defined (CHORUS) && !defined (ACE_PSOS) @@ -7928,11 +7524,7 @@ ACE_INLINE int ACE_OS::uname (ACE_utsname *name) { ACE_OS_TRACE ("ACE_OS::uname"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_uname (name), int, -1); -#else ACE_OSCALL_RETURN (::uname (name), int, -1); -#endif /* ACE_HAS_PACE */ } #endif /* ! ACE_WIN32 && ! VXWORKS && ! CHORUS */ @@ -8088,15 +7680,13 @@ ACE_INLINE u_int ACE_OS::alarm (u_int secs) { ACE_OS_TRACE ("ACE_OS::alarm"); -#if defined (ACE_HAS_PACE) - return ::pace_alarm (secs); -#elif defined (ACE_WIN32) || defined (VXWORKS) || defined (CHORUS) || defined (ACE_PSOS) +#if defined (ACE_WIN32) || defined (VXWORKS) || defined (CHORUS) || defined (ACE_PSOS) ACE_UNUSED_ARG (secs); ACE_NOTSUP_RETURN (0); #else return ::alarm (secs); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 || VXWORKS || CHORUS || ACE_PSOS */ } ACE_INLINE u_int @@ -8363,9 +7953,7 @@ ACE_INLINE ssize_t ACE_OS::write (ACE_HANDLE handle, const void *buf, size_t nbyte) { ACE_OS_TRACE ("ACE_OS::write"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_write (handle, buf, nbyte), ssize_t, -1); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) DWORD bytes_written; // This is set to 0 byte WriteFile. if (::WriteFile (handle, buf, nbyte, &bytes_written, 0)) @@ -8394,7 +7982,7 @@ ACE_OS::write (ACE_HANDLE handle, const void *buf, size_t nbyte) # else ACE_OSCALL_RETURN (::write (handle, buf, nbyte), ssize_t, -1); # endif /* ACE_LACKS_POSIX_PROTOTYPES */ -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 */ } ACE_INLINE ssize_t @@ -8419,13 +8007,7 @@ ACE_INLINE ssize_t ACE_OS::read (ACE_HANDLE handle, void *buf, size_t len) { ACE_OS_TRACE ("ACE_OS::read"); -#if defined (ACE_HAS_PACE) - int result; - ACE_OSCALL (::pace_read (handle, buf, len), ssize_t, -1, result); - if (result == -1 && errno == EAGAIN) - errno = EWOULDBLOCK; - return result; -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) DWORD ok_len; if (::ReadFile (handle, buf, len, &ok_len, 0)) return (ssize_t) ok_len; @@ -8457,7 +8039,7 @@ ACE_OS::read (ACE_HANDLE handle, void *buf, size_t len) if (result == -1 && errno == EAGAIN) errno = EWOULDBLOCK; return result; -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 */ } ACE_INLINE ssize_t @@ -8592,9 +8174,7 @@ ACE_INLINE int ACE_OS::mprotect (void *addr, size_t len, int prot) { ACE_OS_TRACE ("ACE_OS::mprotect"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_mprotect (addr, len, prot), int, -1); -#elif defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) DWORD dummy; // Sigh! return ::VirtualProtect(addr, len, prot, &dummy) ? 0 : -1; #elif !defined (ACE_LACKS_MPROTECT) @@ -8604,16 +8184,14 @@ ACE_OS::mprotect (void *addr, size_t len, int prot) ACE_UNUSED_ARG (len); ACE_UNUSED_ARG (prot); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ } ACE_INLINE int ACE_OS::msync (void *addr, size_t len, int sync) { ACE_OS_TRACE ("ACE_OS::msync"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_msync (addr, len, sync), int, -1); -#elif defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) ACE_UNUSED_ARG (sync); ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::FlushViewOfFile (addr, len), ace_result_), int, -1); @@ -8629,16 +8207,14 @@ ACE_OS::msync (void *addr, size_t len, int sync) ACE_UNUSED_ARG (len); ACE_UNUSED_ARG (sync); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ } ACE_INLINE int ACE_OS::munmap (void *addr, size_t len) { ACE_OS_TRACE ("ACE_OS::munmap"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (::pace_munmap (addr, len), int, -1); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) ACE_UNUSED_ARG (len); ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::UnmapViewOfFile (addr), ace_result_), int, -1); @@ -8648,7 +8224,7 @@ ACE_OS::munmap (void *addr, size_t len) ACE_UNUSED_ARG (addr); ACE_UNUSED_ARG (len); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 */ } ACE_INLINE int @@ -8838,9 +8414,7 @@ ACE_OS::shmget (key_t key, int size, int flags) ACE_INLINE void ACE_OS::tzset (void) { -#if defined (ACE_HAS_PACE) - ::pace_tzset (); -# elif !defined (ACE_HAS_WINCE) && !defined (VXWORKS) && !defined (ACE_PSOS) && ! defined(__rtems__) +#if !defined (ACE_HAS_WINCE) && !defined (VXWORKS) && !defined (ACE_PSOS) && ! defined(__rtems__) # if defined (ACE_WIN32) ::_tzset (); // For Win32. # else @@ -8848,7 +8422,7 @@ ACE_OS::tzset (void) # endif /* ACE_WIN32 */ # else errno = ENOTSUP; -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_WINCE && !VXWORKS && !ACE_PSOS && !__rtems__ */ } ACE_INLINE long @@ -8869,9 +8443,7 @@ ACE_INLINE ACE_TCHAR * ACE_OS::ctime (const time_t *t) { ACE_OS_TRACE ("ACE_OS::ctime"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_ctime (t), char*, 0); -#elif defined (ACE_HAS_BROKEN_CTIME) +#if defined (ACE_HAS_BROKEN_CTIME) ACE_OSCALL_RETURN (::asctime (::localtime (t)), char *, 0); #elif defined(ACE_PSOS) && ! defined (ACE_PSOS_HAS_TIME) return "ctime-return"; @@ -8882,7 +8454,7 @@ ACE_OS::ctime (const time_t *t) ACE_OSCALL_RETURN (::_wctime (t), wchar_t *, 0); #else ACE_OSCALL_RETURN (::ctime (t), char *, 0); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_BROKEN_CTIME */ } #if !defined (ACE_HAS_WINCE) /* CE version in OS.cpp */ @@ -8890,10 +8462,7 @@ ACE_INLINE ACE_TCHAR * ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) { ACE_OS_TRACE ("ACE_OS::ctime_r"); -#if defined (ACE_HAS_PACE) - ACE_UNUSED_ARG (buflen); - ACE_OSCALL_RETURN (::pace_ctime_r (t, buf), ACE_TCHAR*, 0); -#elif defined (ACE_HAS_REENTRANT_FUNCTIONS) +#if defined (ACE_HAS_REENTRANT_FUNCTIONS) # if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) ACE_TCHAR *result; # if defined (DIGITAL_UNIX) @@ -8933,16 +8502,14 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) ACE_OS::strncpy (buf, result, buflen); return buf; # endif /* ACE_PSOS && !ACE_PSOS_HAS_TIME */ -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_REENTRANT_FUNCTIONS */ } #endif /* !ACE_HAS_WINCE */ ACE_INLINE struct tm * ACE_OS::localtime (const time_t *t) { -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_localtime (t), pace_tm*, 0); -#elif !defined (ACE_HAS_WINCE) && !defined(ACE_PSOS) || defined (ACE_PSOS_HAS_TIME) +#if !defined (ACE_HAS_WINCE) && !defined(ACE_PSOS) || defined (ACE_PSOS_HAS_TIME) ACE_OS_TRACE ("ACE_OS::localtime"); ACE_OSCALL_RETURN (::localtime (t), struct tm *, 0); #else @@ -8950,31 +8517,27 @@ ACE_OS::localtime (const time_t *t) // does WinCE really support? ACE_UNUSED_ARG (t); ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_WINCE && !ACE_PSOS || ACE_PSOS_HAS_TIME */ } ACE_INLINE struct tm * ACE_OS::gmtime (const time_t *t) { -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_gmtime (t), pace_tm*, 0); -#elif !defined (ACE_HAS_WINCE) && !defined (ACE_PSOS) || defined (ACE_PSOS_HAS_TIME) +#if !defined (ACE_HAS_WINCE) && !defined (ACE_PSOS) || defined (ACE_PSOS_HAS_TIME) ACE_OS_TRACE ("ACE_OS::gmtime"); ACE_OSCALL_RETURN (::gmtime (t), struct tm *, 0); #else // @@ WinCE doesn't have gmtime also. ACE_UNUSED_ARG (t); ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_WINCE && !ACE_PSOS || ACE_PSOS_HAS_TIME */ } ACE_INLINE struct tm * ACE_OS::gmtime_r (const time_t *t, struct tm *res) { ACE_OS_TRACE ("ACE_OS::gmtime_r"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_gmtime_r (t, res), pace_tm*, 0); -#elif defined (ACE_HAS_REENTRANT_FUNCTIONS) +#if defined (ACE_HAS_REENTRANT_FUNCTIONS) # if defined (DIGITAL_UNIX) ACE_OSCALL_RETURN (::_Pgmtime_r (t, res), struct tm *, 0); # elif defined (HPUX_10) @@ -8994,32 +8557,27 @@ ACE_OS::gmtime_r (const time_t *t, struct tm *res) ACE_UNUSED_ARG (t); ACE_UNUSED_ARG (res); ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_REENTRANT_FUNCTIONS */ } ACE_INLINE char * ACE_OS::asctime (const struct tm *t) { -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_asctime (t), char*, 0); -#elif !defined (ACE_HAS_WINCE) && !defined(ACE_PSOS) || defined (ACE_PSOS_HAS_TIME) +#if !defined (ACE_HAS_WINCE) && !defined(ACE_PSOS) || defined (ACE_PSOS_HAS_TIME) ACE_OS_TRACE ("ACE_OS::asctime"); ACE_OSCALL_RETURN (::asctime (t), char *, 0); #else // @@ WinCE doesn't have gmtime also. ACE_UNUSED_ARG (t); ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_PACE */ +#endif /* !ACE_HAS_WINCE && !ACE_PSOS || ACE_PSOS_HAS_TIME */ } ACE_INLINE char * ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen) { ACE_OS_TRACE ("ACE_OS::asctime_r"); -#if defined (ACE_HAS_PACE) - ACE_UNUSED_ARG (buflen); - ACE_OSCALL_RETURN (::pace_asctime_r (t, buf), char*, 0); -#elif defined (ACE_HAS_REENTRANT_FUNCTIONS) +#if defined (ACE_HAS_REENTRANT_FUNCTIONS) # if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) char *result; # if defined (DIGITAL_UNIX) @@ -9048,16 +8606,14 @@ ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen) ACE_UNUSED_ARG (buf); ACE_UNUSED_ARG (buflen); ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_REENTRANT_FUNCTIONS */ } ACE_INLINE size_t ACE_OS::strftime (char *s, size_t maxsize, const char *format, const struct tm *timeptr) { -#if defined (ACE_HAS_PACE) - return ::pace_strftime (s, maxsize, format, timeptr); -#elif !defined (ACE_HAS_WINCE) && !defined(ACE_PSOS) || defined (ACE_PSOS_HAS_TIME) +#if !defined (ACE_HAS_WINCE) && !defined(ACE_PSOS) || defined (ACE_PSOS_HAS_TIME) return ::strftime (s, maxsize, format, timeptr); #else ACE_UNUSED_ARG (s); @@ -9065,7 +8621,7 @@ ACE_OS::strftime (char *s, size_t maxsize, const char *format, ACE_UNUSED_ARG (format); ACE_UNUSED_ARG (timeptr); ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_PACE */ +#endif /* !ACE_HAS_WINCE && !ACE_PSOS || ACE_PSOS_HAS_TIME */ } ACE_INLINE int @@ -9470,9 +9026,7 @@ ACE_OS::execv (const char *path, char *const argv[]) { ACE_OS_TRACE ("ACE_OS::execv"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_execv (path, argv), int, -1); -#elif defined (ACE_LACKS_EXEC) +#if defined (ACE_LACKS_EXEC) ACE_UNUSED_ARG (path); ACE_UNUSED_ARG (argv); @@ -9495,7 +9049,7 @@ ACE_OS::execv (const char *path, ACE_OSCALL_RETURN (::execv (path, (const char **) argv), int, -1); #else ACE_OSCALL_RETURN (::execv (path, argv), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_EXEC */ } ACE_INLINE int @@ -9504,9 +9058,7 @@ ACE_OS::execve (const char *path, char *const envp[]) { ACE_OS_TRACE ("ACE_OS::execve"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_execve (path, argv, envp), int, -1); -#elif defined (ACE_LACKS_EXEC) +#if defined (ACE_LACKS_EXEC) ACE_UNUSED_ARG (path); ACE_UNUSED_ARG (argv); ACE_UNUSED_ARG (envp); @@ -9530,7 +9082,7 @@ ACE_OS::execve (const char *path, ACE_OSCALL_RETURN (::execve (path, (const char **) argv, (char **) envp), int, -1); #else ACE_OSCALL_RETURN (::execve (path, argv, envp), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_EXEC */ } ACE_INLINE int @@ -9538,9 +9090,7 @@ ACE_OS::execvp (const char *file, char *const argv[]) { ACE_OS_TRACE ("ACE_OS::execvp"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_execvp (file, argv), int, -1); -#elif defined (ACE_LACKS_EXEC) +#if defined (ACE_LACKS_EXEC) ACE_UNUSED_ARG (file); ACE_UNUSED_ARG (argv); @@ -9563,16 +9113,14 @@ ACE_OS::execvp (const char *file, ACE_OSCALL_RETURN (::execvp (file, (const char **) argv), int, -1); #else ACE_OSCALL_RETURN (::execvp (file, argv), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_EXEC */ } ACE_INLINE FILE * ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode) { ACE_OS_TRACE ("ACE_OS::fdopen"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (::pace_fdopen (handle, mode), FILE*, 0); -# elif defined (ACE_HAS_WINCE) +# if defined (ACE_HAS_WINCE) ACE_OSCALL_RETURN (::_wfdopen (handle, mode), FILE*, 0); # elif defined (ACE_WIN32) // kernel file handle -> FILE* conversion... @@ -9612,7 +9160,7 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode) ACE_NOTSUP_RETURN (0); # else ACE_OSCALL_RETURN (::fdopen (handle, mode), FILE *, 0); -# endif /* ACE_HAS_PACE */ +# endif /* ACE_HAS_WINCE */ } ACE_INLINE int @@ -9675,9 +9223,7 @@ ACE_INLINE ACE_HANDLE ACE_OS::dup (ACE_HANDLE handle) { ACE_OS_TRACE ("ACE_OS::dup"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_dup (handle), ACE_HANDLE, ACE_INVALID_HANDLE); -#elif defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) ACE_HANDLE new_fd; if (::DuplicateHandle(::GetCurrentProcess (), handle, @@ -9698,16 +9244,14 @@ ACE_OS::dup (ACE_HANDLE handle) ACE_NOTSUP_RETURN (0); #else ACE_OSCALL_RETURN (::dup (handle), ACE_HANDLE, ACE_INVALID_HANDLE); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ } ACE_INLINE int ACE_OS::dup2 (ACE_HANDLE oldhandle, ACE_HANDLE newhandle) { ACE_OS_TRACE ("ACE_OS::dup2"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_dup2 (oldhandle, newhandle), int, -1); -#elif defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_PSOS) +#if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_PSOS) // msvcrt has _dup2 ?! ACE_UNUSED_ARG (oldhandle); ACE_UNUSED_ARG (newhandle); @@ -9715,7 +9259,7 @@ ACE_OS::dup2 (ACE_HANDLE oldhandle, ACE_HANDLE newhandle) ACE_NOTSUP_RETURN (-1); #else ACE_OSCALL_RETURN (::dup2 (oldhandle, newhandle), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 || VXWORKS || ACE_PSOS */ } #if defined (ghs) && defined (ACE_HAS_PENTIUM) && !defined (ACE_WIN32) @@ -9895,13 +9439,11 @@ ACE_INLINE pid_t ACE_OS::fork (void) { ACE_OS_TRACE ("ACE_OS::fork"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_fork (), pid_t, -1); -#elif defined (ACE_LACKS_FORK) +#if defined (ACE_LACKS_FORK) ACE_NOTSUP_RETURN (pid_t (-1)); #else ACE_OSCALL_RETURN (::fork (), pid_t, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_FORK */ } ACE_INLINE int @@ -9938,9 +9480,7 @@ ACE_INLINE pid_t ACE_OS::getpid (void) { // ACE_OS_TRACE ("ACE_OS::getpid"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_getpid (), int , -1); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) return ::GetCurrentProcessId (); #elif defined (VXWORKS) || defined (ACE_PSOS) // getpid() is not supported: just one process anyways @@ -9949,7 +9489,7 @@ ACE_OS::getpid (void) return (pid_t) (::agetId ()); #else ACE_OSCALL_RETURN (::getpid (), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 */ } ACE_INLINE pid_t @@ -9978,25 +9518,21 @@ ACE_INLINE pid_t ACE_OS::getppid (void) { ACE_OS_TRACE ("ACE_OS::getppid"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_getppid (), pid_t, -1); -#elif defined (ACE_LACKS_GETPPID) +#if defined (ACE_LACKS_GETPPID) ACE_NOTSUP_RETURN (-1); #elif defined (VXWORKS) || defined (ACE_PSOS) // getppid() is not supported, only one process anyway. return 0; #else ACE_OSCALL_RETURN (::getppid (), pid_t, -1); -#endif /* ACE_WIN32 */ +#endif /* ACE_LACKS_GETPPID */ } ACE_INLINE int ACE_OS::setpgid (pid_t pid, pid_t pgid) { ACE_OS_TRACE ("ACE_OS::setpgid"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_setpgid (pid, pgid), int, -1); -#elif defined (ACE_LACKS_SETPGID) +#if defined (ACE_LACKS_SETPGID) ACE_UNUSED_ARG (pid); ACE_UNUSED_ARG (pgid); ACE_NOTSUP_RETURN (-1); @@ -10007,7 +9543,7 @@ ACE_OS::setpgid (pid_t pid, pid_t pgid) return 0; #else ACE_OSCALL_RETURN (::setpgid (pid, pgid), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_SETPGID */ } ACE_INLINE int @@ -10050,9 +9586,7 @@ ACE_INLINE off_t ACE_OS::lseek (ACE_HANDLE handle, off_t offset, int whence) { ACE_OS_TRACE ("ACE_OS::lseek"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_lseek (handle, offset, whence), pace_off_t, -1); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) # if SEEK_SET != FILE_BEGIN || SEEK_CUR != FILE_CURRENT || SEEK_END != FILE_END //#error Windows NT is evil AND rude! switch (whence) @@ -10102,7 +9636,7 @@ ACE_OS::lseek (ACE_HANDLE handle, off_t offset, int whence) # endif /* defined (ACE_PSOS_LACKS_PHILE */ #else ACE_OSCALL_RETURN (::lseek (handle, offset, whence), off_t, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 */ } #if defined (ACE_HAS_LLSEEK) || defined (ACE_HAS_LSEEK64) @@ -10136,9 +9670,6 @@ ACE_OS::llseek (ACE_HANDLE handle, ACE_LOFF_T offset, int whence) ACE_INLINE int ACE_OS::fseek (FILE *fp, long offset, int whence) { -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_fseek (fp, offset, whence), int, -1); -#else # if defined (ACE_WIN32) # if SEEK_SET != FILE_BEGIN || SEEK_CUR != FILE_CURRENT || SEEK_END != FILE_END //#error Windows NT is evil AND rude! @@ -10160,7 +9691,6 @@ ACE_OS::fseek (FILE *fp, long offset, int whence) # endif /* SEEK_SET != FILE_BEGIN || SEEK_CUR != FILE_CURRENT || SEEK_END != FILE_END */ # endif /* ACE_WIN32 */ ACE_OSCALL_RETURN (::fseek (fp, offset, whence), int, -1); -#endif /* ACE_HAS_PACE */ } ACE_INLINE long @@ -10188,10 +9718,7 @@ ACE_OS::waitpid (pid_t pid, ACE_HANDLE handle) { ACE_OS_TRACE ("ACE_OS::waitpid"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_UNUSED_ARG (handle); - ACE_OSCALL_RETURN (::pace_waitpid (pid, status, wait_options), int, -1); -#elif defined (VXWORKS) || defined (ACE_PSOS) +#if defined (VXWORKS) || defined (ACE_PSOS) ACE_UNUSED_ARG (pid); ACE_UNUSED_ARG (status); ACE_UNUSED_ARG (wait_options); @@ -10253,7 +9780,7 @@ ACE_OS::waitpid (pid_t pid, ACE_UNUSED_ARG (handle); ACE_OSCALL_RETURN (::waitpid (pid, status, wait_options), pid_t, -1); -#endif /* ACE_HAS_PACE */ +#endif /* VXWORKS || ACE_PSOS */ } ACE_INLINE pid_t @@ -10273,9 +9800,7 @@ ACE_INLINE pid_t ACE_OS::wait (int *status) { ACE_OS_TRACE ("ACE_OS::wait"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_wait (status), pace_pid_t, -1); -#elif defined (ACE_WIN32) || defined (VXWORKS) || defined(CHORUS) || defined (ACE_PSOS) +#if defined (ACE_WIN32) || defined (VXWORKS) || defined(CHORUS) || defined (ACE_PSOS) ACE_UNUSED_ARG (status); ACE_NOTSUP_RETURN (0); @@ -10285,7 +9810,7 @@ ACE_OS::wait (int *status) # else ACE_OSCALL_RETURN (::wait (status), pid_t, -1); # endif /* ACE_HAS_UNION_WAIT */ -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 || VXWORKS || CHORUS || ACE_PSOS */ } ACE_INLINE int @@ -10317,15 +9842,13 @@ ACE_INLINE int ACE_OS::kill (pid_t pid, int signum) { ACE_OS_TRACE ("ACE_OS::kill"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_kill (pid, signum), int, -1); -#elif defined (ACE_WIN32) || defined (CHORUS) || defined (ACE_PSOS) +#if defined (ACE_WIN32) || defined (CHORUS) || defined (ACE_PSOS) ACE_UNUSED_ARG (pid); ACE_UNUSED_ARG (signum); ACE_NOTSUP_RETURN (-1); #else ACE_OSCALL_RETURN (::kill (pid, signum), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 || CHORUS || ACE_PSOS */ } ACE_INLINE int @@ -10336,9 +9859,7 @@ ACE_OS::sigaction (int signum, ACE_OS_TRACE ("ACE_OS::sigaction"); if (signum == 0) return 0; -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (::pace_sigaction (signum, nsa, osa), int, -1); -#elif defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) struct sigaction sa; if (osa == 0) @@ -10361,16 +9882,14 @@ ACE_OS::sigaction (int signum, ACE_OSCALL_RETURN (::sigaction (signum, (struct sigaction*) nsa, osa), int, -1); #else ACE_OSCALL_RETURN (::sigaction (signum, nsa, osa), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_WIN32 !ACE_HAS_WINCE */ } ACE_INLINE ACE_TCHAR * ACE_OS::getcwd (ACE_TCHAR *buf, size_t size) { ACE_OS_TRACE ("ACE_OS::getcwd"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_getcwd (buf, size), char*, 0); -#elif defined (ACE_PSOS_LACKS_PHILE) +#if defined (ACE_PSOS_LACKS_PHILE) ACE_UNUSED_ARG (buf); ACE_UNUSED_ARG (size); ACE_NOTSUP_RETURN ( (char*)-1); @@ -10462,16 +9981,14 @@ ACE_OS::getcwd (ACE_TCHAR *buf, size_t size) return ::_wgetcwd (buf, size); #else ACE_OSCALL_RETURN (::getcwd (buf, size), char *, 0); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_PSOS_LACKS_PHILE */ } ACE_INLINE int ACE_OS::sleep (u_int seconds) { ACE_OS_TRACE ("ACE_OS::sleep"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_sleep (seconds), int, -1); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) ::Sleep (seconds * ACE_ONE_SECOND_IN_MSECS); return 0; #if 0 @@ -10525,9 +10042,7 @@ ACE_OS::nanosleep (const struct timespec *requested, struct timespec *remaining) { ACE_OS_TRACE ("ACE_OS::nanosleep"); -#if defined (ACE_HAS_PACE) - return ::pace_nanosleep (requested, remaining); -#elif defined (ACE_HAS_CLOCK_GETTIME) +#if defined (ACE_HAS_CLOCK_GETTIME) // ::nanosleep () is POSIX 1003.1b. So is ::clock_gettime (). So, // if ACE_HAS_CLOCK_GETTIME is defined, then ::nanosleep () should // be available on the platform. On Solaris 2.x, both functions @@ -10586,9 +10101,7 @@ ACE_OS::nanosleep (const struct timespec *requested, ACE_INLINE int ACE_OS::mkdir (const ACE_TCHAR *path, mode_t mode) { -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_mkdir (path, mode), int, -1); -#elif defined (ACE_PSOS_LACKS_PHILE) +#if defined (ACE_PSOS_LACKS_PHILE) ACE_UNUSED_ARG (path); ACE_UNUSED_ARG (mode); ACE_NOTSUP_RETURN (-1); @@ -10646,7 +10159,7 @@ ACE_OS::mkdir (const ACE_TCHAR *path, mode_t mode) ACE_OSCALL_RETURN (::mkdir (path), int, -1); #else ACE_OSCALL_RETURN (::mkdir (path, mode), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_PSOS_LACKS_PHILE */ } ACE_INLINE char * @@ -10656,14 +10169,12 @@ ACE_OS::getenv (const char *symbol) #if defined (ACE_LACKS_ENV) ACE_UNUSED_ARG (symbol); ACE_NOTSUP_RETURN (0); -#elif defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_getenv (symbol), char*, 0); #elif defined (ACE_PSOS) ACE_UNUSED_ARG (symbol); ACE_NOTSUP_RETURN (0); #else /* ACE_PSOS */ ACE_OSCALL_RETURN (::getenv (symbol), char *, 0); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_ENV */ } #if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32) @@ -10767,13 +10278,13 @@ ACE_OS::wsncmp (const WChar *s, const WChar *t, size_t len) return len == 0 ? 0 : *scan1 - *scan2; } -#if defined (ACE_LACKS_COND_T) && defined (ACE_HAS_THREADS) && (!defined (ACE_HAS_PACE) || defined (ACE_WIN32)) +#if defined (ACE_LACKS_COND_T) && defined (ACE_HAS_THREADS) ACE_INLINE long ACE_cond_t::waiters (void) const { return this->waiters_; } -#endif /* ACE_LACKS_COND_T && ACE_HAS_THREADS && ! ACE_HAS_PACE */ +#endif /* ACE_LACKS_COND_T && ACE_HAS_THREADS */ #if 0 ACE_INLINE int @@ -10867,9 +10378,7 @@ ACE_INLINE int ACE_OS::sigaddset (sigset_t *s, int signum) { ACE_OS_TRACE ("ACE_OS::sigaddset"); -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (::pace_sigaddset (s, signum), int, -1); -#elif defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) +#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) if (s == 0) { errno = EFAULT; @@ -10893,15 +10402,13 @@ ACE_OS::sigaddset (sigset_t *s, int signum) return 0 ; #else ACE_OSCALL_RETURN (::sigaddset (s, signum), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */ } ACE_INLINE int ACE_OS::sigdelset (sigset_t *s, int signum) { -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (::pace_sigdelset (s, signum), int, -1); -#elif defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) +#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) if (s == 0) { errno = EFAULT; @@ -10925,15 +10432,13 @@ ACE_OS::sigdelset (sigset_t *s, int signum) return 0; #else ACE_OSCALL_RETURN (::sigdelset (s, signum), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */ } ACE_INLINE int ACE_OS::sigemptyset (sigset_t *s) { -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (::pace_sigemptyset (s), int, -1); -#elif defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) +#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) if (s == 0) { errno = EFAULT; @@ -10948,15 +10453,13 @@ ACE_OS::sigemptyset (sigset_t *s) return 0 ; #else ACE_OSCALL_RETURN (::sigemptyset (s), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */ } ACE_INLINE int ACE_OS::sigfillset (sigset_t *s) { -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (::pace_sigfillset (s), int, -1); -#elif defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) +#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) if (s == 0) { errno = EFAULT; @@ -10971,15 +10474,13 @@ ACE_OS::sigfillset (sigset_t *s) return 0 ; #else ACE_OSCALL_RETURN (::sigfillset (s), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */ } ACE_INLINE int ACE_OS::sigismember (sigset_t *s, int signum) { -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (::pace_sigismember (s, signum), int, -1); -#elif defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) +#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) if (s == 0) { errno = EFAULT; @@ -11009,15 +10510,13 @@ ACE_OS::sigismember (sigset_t *s, int signum) } # endif /* ACE_HAS_SIGISMEMBER_BUG */ ACE_OSCALL_RETURN (::sigismember (s, signum), int, -1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */ } ACE_INLINE int ACE_OS::sigsuspend (const sigset_t *sigset) { -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (::pace_sigsuspend (sigset), int, -1); -#elif defined (ACE_HAS_SIGSUSPEND) +#if defined (ACE_HAS_SIGSUSPEND) sigset_t s; if (sigset == 0) @@ -11029,15 +10528,13 @@ ACE_OS::sigsuspend (const sigset_t *sigset) #else ACE_UNUSED_ARG (sigset); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_SIGSUSPEND */ } ACE_INLINE int ACE_OS::sigprocmask (int how, const sigset_t *nsp, sigset_t *osp) { -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (::pace_sigprocmask (how, nsp, osp), int, -1); -#elif defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) +#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) ACE_UNUSED_ARG (how); ACE_UNUSED_ARG (nsp); ACE_UNUSED_ARG (osp); @@ -11048,26 +10545,23 @@ ACE_OS::sigprocmask (int how, const sigset_t *nsp, sigset_t *osp) # else ACE_OSCALL_RETURN (::sigprocmask (how, nsp, osp), int, -1); # endif /* ACE_LACKS_POSIX_PROTOTYPES */ -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */ } ACE_INLINE int ACE_OS::pthread_sigmask (int how, const sigset_t *nsp, sigset_t *osp) { -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pace_pthread_sigmask (how, nsp, osp), - ace_result_), int, -1); -#elif defined (ACE_HAS_PTHREADS_STD) && !defined (ACE_LACKS_PTHREAD_SIGMASK) +#if defined (ACE_HAS_PTHREADS_STD) && !defined (ACE_LACKS_PTHREAD_SIGMASK) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, nsp, osp), ace_result_), int, -1); -#else /* !ACE_HAS_PTHREADS_STD */ +#else /* !ACE_HAS_PTHREADS_STD && !ACE_LACKS_PTHREAD_SIGMASK */ ACE_UNUSED_ARG (how); ACE_UNUSED_ARG (nsp); ACE_UNUSED_ARG (osp); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_PTHREADS_STD && !ACE_LACKS_PTHREAD_SIGMASK */ } // **************************************************************** @@ -11100,9 +10594,7 @@ ACE_OS::bsearch (const void *key, size_t size, ACE_COMPARE_FUNC compar) { -#if defined (ACE_HAS_PACE) - return ::pace_bsearch (key, base, nel, size, compar); -#elif !defined (ACE_LACKS_BSEARCH) +#if !defined (ACE_LACKS_BSEARCH) return ::bsearch (key, base, nel, size, compar); #else ACE_UNUSED_ARG (key); @@ -11111,7 +10603,7 @@ ACE_OS::bsearch (const void *key, ACE_UNUSED_ARG (size); ACE_UNUSED_ARG (compar); ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_BSEARCH */ } ACE_INLINE void @@ -11120,25 +10612,21 @@ ACE_OS::qsort (void *base, size_t width, ACE_COMPARE_FUNC compar) { -#if defined (ACE_HAS_PACE) - ::pace_qsort (base, nel, width, compar); -#elif !defined (ACE_LACKS_QSORT) +#if !defined (ACE_LACKS_QSORT) ::qsort (base, nel, width, compar); #else ACE_UNUSED_ARG (base); ACE_UNUSED_ARG (nel); ACE_UNUSED_ARG (width); ACE_UNUSED_ARG (compar); -#endif /* ACE_HAS_PACE */ +#endif /* !ACE_LACKS_QSORT */ } ACE_INLINE int ACE_OS::setuid (uid_t uid) { ACE_OS_TRACE ("ACE_OS::setuid"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_setuid (uid), int, -1); -# elif defined (VXWORKS) || defined (ACE_PSOS) +#if defined (VXWORKS) || defined (ACE_PSOS) // setuid() is not supported: just one user anyways ACE_UNUSED_ARG (uid); return 0; @@ -11147,57 +10635,51 @@ ACE_OS::setuid (uid_t uid) ACE_NOTSUP_RETURN (-1); # else ACE_OSCALL_RETURN (::setuid (uid), int, -1); -# endif /* ACE_HAS_PACE */ +# endif /* VXWORKS || ACE_PSOS */ } ACE_INLINE uid_t ACE_OS::getuid (void) { ACE_OS_TRACE ("ACE_OS::getuid"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_getuid (), pace_uid_t, (pace_uid_t) -1); -# elif defined (VXWORKS) || defined (ACE_PSOS) +#if defined (VXWORKS) || defined (ACE_PSOS) // getuid() is not supported: just one user anyways return 0; -# elif defined (ACE_WIN32) || defined(CHORUS) +# elif defined (ACE_WIN32) || defined (CHORUS) ACE_NOTSUP_RETURN (ACE_static_cast (uid_t, -1)); # else ACE_OSCALL_RETURN (::getuid (), uid_t, (uid_t) -1); -# endif /* ACE_HAS_PACE */ +# endif /* VXWORKS || ACE_PSOS */ } ACE_INLINE int ACE_OS::setgid (gid_t gid) { ACE_OS_TRACE ("ACE_OS::setgid"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_setgid (gid), int, -1); -# elif defined (VXWORKS) || defined (ACE_PSOS) +#if defined (VXWORKS) || defined (ACE_PSOS) // setgid() is not supported: just one user anyways ACE_UNUSED_ARG (gid); return 0; -# elif defined (ACE_WIN32) || defined(CHORUS) +# elif defined (ACE_WIN32) || defined (CHORUS) ACE_UNUSED_ARG (gid); ACE_NOTSUP_RETURN (-1); # else ACE_OSCALL_RETURN (::setgid (gid), int, -1); -# endif /* ACE_HAS_PACE */ +# endif /* VXWORKS || ACE_PSOS */ } ACE_INLINE gid_t ACE_OS::getgid (void) { ACE_OS_TRACE ("ACE_OS::getgid"); -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_getgid (), pace_gid_t, (pace_gid_t) -1); -# elif defined (VXWORKS) || defined (ACE_PSOS) +#if defined (VXWORKS) || defined (ACE_PSOS) // getgid() is not supported: just one user anyways return 0; -# elif defined (ACE_WIN32) || defined(CHORUS) +# elif defined (ACE_WIN32) || defined (CHORUS) ACE_NOTSUP_RETURN (ACE_static_cast (gid_t, -1)); # else ACE_OSCALL_RETURN (::getgid (), gid_t, (gid_t) -1); -# endif /* ACE_HAS_PACE */ +# endif /* VXWORKS || ACE_PSOS */ } ACE_INLINE ACE_EXIT_HOOK @@ -11211,9 +10693,7 @@ ACE_OS::set_exit_hook (ACE_EXIT_HOOK exit_hook) ACE_INLINE int ACE_OS::isatty (int handle) { -#if defined (ACE_HAS_PACE) - ACE_OSCALL_RETURN (::pace_isatty (handle), int, -1); -# elif defined (ACE_LACKS_ISATTY) +#if defined (ACE_LACKS_ISATTY) ACE_UNUSED_ARG (handle); return 0; # elif defined (ACE_WIN32) diff --git a/ace/OS_Dirent.inl b/ace/OS_Dirent.inl index e6ab9dc82e1..1fede13caaf 100644 --- a/ace/OS_Dirent.inl +++ b/ace/OS_Dirent.inl @@ -1,15 +1,10 @@ // -*- C++ -*- // $Id$ -#if defined (ACE_HAS_PACE) -#include /**/ "pace/dirent.h" -#endif /* ACE_HAS_PACE */ ACE_INLINE ACE_DIR * ACE_OS_Dirent::opendir (const ACE_TCHAR *filename) { -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - return pace_opendir (filename); -#elif defined (ACE_HAS_DIRENT) +#if defined (ACE_HAS_DIRENT) # if defined (ACE_PSOS) // The pointer to the <ACE_DIR> buffer *must* be passed to // <ACE_OS_Dirent::closedir> to free it and avoid a memory leak. @@ -37,15 +32,13 @@ ACE_OS_Dirent::opendir (const ACE_TCHAR *filename) #else ACE_UNUSED_ARG (filename); ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_DIRENT */ } ACE_INLINE void ACE_OS_Dirent::closedir (ACE_DIR *d) { -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - pace_closedir (d); -#elif defined (ACE_HAS_DIRENT) +#if defined (ACE_HAS_DIRENT) # if defined (ACE_PSOS) u_long result = ::close_dir (&(d->xdir)); @@ -66,15 +59,13 @@ ACE_OS_Dirent::closedir (ACE_DIR *d) # endif /* ACE_PSOS */ #else /* ACE_HAS_DIRENT */ ACE_UNUSED_ARG (d); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_DIRENT */ } ACE_INLINE struct dirent * ACE_OS_Dirent::readdir (ACE_DIR *d) { -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - return pace_readdir (d); -#elif defined (ACE_HAS_DIRENT) +#if defined (ACE_HAS_DIRENT) # if defined (ACE_PSOS) u_long result = ::read_dir (&d->xdir, &d->dirent); @@ -96,7 +87,7 @@ ACE_OS_Dirent::readdir (ACE_DIR *d) #else ACE_UNUSED_ARG (d); ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_DIRENT */ } ACE_INLINE int @@ -104,42 +95,40 @@ ACE_OS_Dirent::readdir_r (ACE_DIR *dirp, struct dirent *entry, struct dirent **result) { -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - return pace_readdir_r (dirp, entry, result); -# elif !defined (ACE_HAS_REENTRANT_FUNCTIONS) +#if !defined (ACE_HAS_REENTRANT_FUNCTIONS) ACE_UNUSED_ARG (entry); // <result> has better not be 0! *result = ACE_OS_Dirent::readdir (dirp); return 0; -# elif defined (ACE_HAS_DIRENT) && !defined (ACE_LACKS_READDIR_R) -# if (defined (sun) && (defined (_POSIX_PTHREAD_SEMANTICS) || \ +#elif defined (ACE_HAS_DIRENT) && !defined (ACE_LACKS_READDIR_R) +# if (defined (sun) && (defined (_POSIX_PTHREAD_SEMANTICS) || \ (_FILE_OFFSET_BITS == 64))) || \ (!defined (sun) && (defined (ACE_HAS_PTHREADS_STD) || \ defined (ACE_HAS_PTHREADS_DRAFT7) || \ defined (__USE_POSIX) || \ defined (HPUX_11))) -# if defined (__GNUG__) && defined (DIGITAL_UNIX) +# if defined (__GNUG__) && defined (DIGITAL_UNIX) return readdir_r (dirp, entry, result); -# else +# else return ::readdir_r (dirp, entry, result); -# endif /* defined (__GNUG__) && defined (DIGITAL_UNIX) */ -# else /* ! POSIX.1c - this is draft 4 or draft 6 */ -# if defined (HPUX_10) /* But HP 10.x doesn't follow the draft either */ +# endif /* defined (__GNUG__) && defined (DIGITAL_UNIX) */ +# else /* ! POSIX.1c - this is draft 4 or draft 6 */ +# if defined (HPUX_10) /* But HP 10.x doesn't follow the draft either */ *result = entry; return ::readdir_r (dirp, entry); -# else +# else // <result> had better not be 0! *result = ::readdir_r (dirp, entry); return 0; -# endif /* HPUX_10 */ -# endif /* ! POSIX.1c */ +# endif /* HPUX_10 */ +# endif /* ! POSIX.1c */ #else /* ! ACE_HAS_DIRENT || ACE_LACKS_READDIR_R */ ACE_UNUSED_ARG (dirp); ACE_UNUSED_ARG (entry); ACE_UNUSED_ARG (result); ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_REENTRANT_FUNCTIONS */ } ACE_INLINE long @@ -167,9 +156,7 @@ ACE_OS_Dirent::seekdir (ACE_DIR *d, long loc) ACE_INLINE void ACE_OS_Dirent::rewinddir (ACE_DIR *d) { -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) - pace_rewinddir (d); -#elif defined (ACE_HAS_DIRENT) +#if defined (ACE_HAS_DIRENT) # if defined (ACE_LACKS_SEEKDIR) # if defined (ACE_LACKS_REWINDDIR) ACE_UNUSED_ARG (d); diff --git a/ace/OS_Memory.h b/ace/OS_Memory.h index 0e53f1f7981..54e94d9031c 100644 --- a/ace/OS_Memory.h +++ b/ace/OS_Memory.h @@ -24,10 +24,6 @@ #include "ace/OS_Errno.h" -#if defined (ACE_HAS_PACE) -# include /**/ "pace/stdlib.h" -#endif /* ACE_HAS_PACE */ - #ifndef ACE_HAS_WINCE #include <stddef.h> #endif // ACE_HAS_WINCE @@ -52,47 +48,24 @@ // too, so that you guarantee that strdup() calls your desired mallocator // and not the system mallocator. // -# if defined (ACE_HAS_PACE) -# if !defined (ACE_MALLOC_FUNC) -# define ACE_MALLOC_FUNC pace_malloc -# endif -# if !defined (ACE_CALLOC_FUNC) -# define ACE_CALLOC_FUNC pace_calloc -# endif -# if !defined (ACE_FREE_FUNC) -# define ACE_FREE_FUNC pace_free -# endif -# if !defined (ACE_REALLOC_FUNC) -# define ACE_REALLOC_FUNC pace_realloc -# endif - -# if defined (ACE_HAS_OLD_MALLOC) -typedef char *ACE_MALLOC_T; -# else -typedef void *ACE_MALLOC_T; -# endif /* ACE_HAS_OLD_MALLOC */ - -# else - -# if !defined (ACE_MALLOC_FUNC) -# define ACE_MALLOC_FUNC ::malloc -# endif -# if !defined (ACE_CALLOC_FUNC) -# define ACE_CALLOC_FUNC ::calloc -# endif -# if !defined (ACE_FREE_FUNC) -# define ACE_FREE_FUNC ::free -# endif -# if !defined (ACE_REALLOC_FUNC) -# define ACE_REALLOC_FUNC ::realloc -# endif - -# if defined (ACE_HAS_OLD_MALLOC) +#if !defined (ACE_MALLOC_FUNC) +# define ACE_MALLOC_FUNC ::malloc +#endif +#if !defined (ACE_CALLOC_FUNC) +# define ACE_CALLOC_FUNC ::calloc +#endif +#if !defined (ACE_FREE_FUNC) +# define ACE_FREE_FUNC ::free +#endif +#if !defined (ACE_REALLOC_FUNC) +# define ACE_REALLOC_FUNC ::realloc +#endif + +#if defined (ACE_HAS_OLD_MALLOC) typedef char *ACE_MALLOC_T; -# else +#else typedef void *ACE_MALLOC_T; -# endif /* ACE_HAS_OLD_MALLOC */ -#endif /* ACE_HAS_PACE */ +#endif /* ACE_HAS_OLD_MALLOC */ /** * @class ACE_OS_Memory diff --git a/ace/OS_String.inl b/ace/OS_String.inl index 68ddd37c119..58257902b86 100644 --- a/ace/OS_String.inl +++ b/ace/OS_String.inl @@ -9,12 +9,6 @@ */ //============================================================================= -#if defined (ACE_HAS_PACE) -# include /**/ "pace/string.h" -# include /**/ "pace/ctype.h" -# include /**/ "pace/stdlib.h" -#endif /* ACE_HAS_PACE */ - // Matthew Stevens 7-10-95 Fix GNU GCC 2.7 for memchr() problem. #if defined (ACE_HAS_GNU_CSTRING_H) // Define this file to keep /usr/include/memory.h from being included. @@ -41,9 +35,7 @@ ACE_INLINE const void * ACE_OS_String::memchr (const void *s, int c, size_t len) { -#if defined (ACE_HAS_PACE) - return pace_memchr (s, c, len); -#elif defined (ACE_HAS_MEMCHR) +#if defined (ACE_HAS_MEMCHR) return ::memchr (s, c, len); #else /* ACE_HAS_MEMCHR */ return ACE_OS_String::memchr_emulation (s, c, len); @@ -61,52 +53,32 @@ ACE_OS_String::memchr (void *s, int c, size_t len) ACE_INLINE int ACE_OS_String::memcmp (const void *t, const void *s, size_t len) { -#if defined (ACE_HAS_PACE) - return pace_memcmp (t, s, len); -#else return ::memcmp (t, s, len); -#endif /* ACE_HAS_PACE */ } ACE_INLINE void * ACE_OS_String::memcpy (void *t, const void *s, size_t len) { -#if defined (ACE_HAS_PACE) - return pace_memcpy (t, s, len); -#else return ::memcpy (t, s, len); -#endif /* ACE_HAS_PACE */ } ACE_INLINE void * ACE_OS_String::memmove (void *t, const void *s, size_t len) { -#if defined (ACE_HAS_PACE) - return pace_memmove (t, s, len); -#else return ::memmove (t, s, len); -#endif /* ACE_HAS_PACE */ } ACE_INLINE void * ACE_OS_String::memset (void *s, int c, size_t len) { -#if defined (ACE_HAS_PACE) - return pace_memset (s, c, len); -#else return ::memset (s, c, len); -#endif /* ACE_HAS_PACE */ } ACE_INLINE char * ACE_OS_String::strcat (char *s, const char *t) { -#if defined (ACE_HAS_PACE) - return pace_strcat (s, t); -#else return ::strcat (s, t); -#endif /* ACE_HAS_PACE */ } #if defined (ACE_HAS_WCHAR) @@ -124,13 +96,11 @@ ACE_OS_String::strcat (wchar_t *s, const wchar_t *t) ACE_INLINE const char * ACE_OS_String::strchr (const char *s, int c) { -#if defined (ACE_HAS_PACE) - return pace_strchr (s, c); -#elif defined (ACE_LACKS_STRCHR) +#if defined (ACE_LACKS_STRCHR) return ACE_OS_String::strchr_emulation (s, c); #else /* ! ACE_LACKS_STRCHR */ return (const char *) ::strchr (s, c); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_STRCHR */ } #if defined (ACE_HAS_WCHAR) @@ -148,13 +118,11 @@ ACE_OS_String::strchr (const wchar_t *s, wint_t c) ACE_INLINE char * ACE_OS_String::strchr (char *s, int c) { -#if defined (ACE_HAS_PACE) - return pace_strchr (s, c); -#elif defined (ACE_LACKS_STRCHR) +#if defined (ACE_LACKS_STRCHR) return ACE_OS_String::strchr_emulation (s, c); #else /* ! ACE_LACKS_STRCHR */ return ::strchr (s, c); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_STRCHR */ } #if defined (ACE_HAS_WCHAR) @@ -169,11 +137,7 @@ ACE_OS_String::strchr (wchar_t *s, wint_t c) ACE_INLINE int ACE_OS_String::strcmp (const char *s, const char *t) { -#if defined (ACE_HAS_PACE) - return pace_strcmp (s, t); -#else return ::strcmp (s, t); -#endif /* ACE_HAS_PACE */ } ACE_INLINE int @@ -189,11 +153,7 @@ ACE_OS_String::strcmp (const ACE_WCHAR_T *s, const ACE_WCHAR_T *t) ACE_INLINE char * ACE_OS_String::strcpy (char *s, const char *t) { -#if defined (ACE_HAS_PACE) - return pace_strcpy (s, t); -#else /* ACE_HAS_PACE */ return ::strcpy (s, t); -#endif /* ACE_HAS_PACE */ } #if defined (ACE_HAS_WCHAR) @@ -211,9 +171,7 @@ ACE_OS_String::strcpy (wchar_t *s, const wchar_t *t) ACE_INLINE size_t ACE_OS_String::strcspn (const char *s, const char *reject) { -#if defined (ACE_HAS_PACE) - return pace_strcspn (s, reject); -#elif defined (ACE_LACKS_STRCSPN) +#if defined (ACE_LACKS_STRCSPN) return ACE_OS_String::strcspn_emulation (s, reject); #else /* ACE_LACKS_STRCSPN */ return ::strcspn (s, reject); @@ -245,11 +203,7 @@ ACE_OS_String::strerror (int errnum) ACE_INLINE size_t ACE_OS_String::strlen (const char *s) { -#if defined (ACE_HAS_PACE) - return pace_strlen (s); -#else /* ACE_HAS_PACE */ return ::strlen (s); -#endif /* ACE_HAS_PACE */ } ACE_INLINE size_t @@ -293,11 +247,7 @@ ACE_OS_String::strnlen (const ACE_WCHAR_T *s, size_t maxlen) ACE_INLINE char * ACE_OS_String::strncat (char *s, const char *t, size_t len) { -#if defined (ACE_HAS_PACE) - return pace_strncat (s, t, len); -#else /* ACE_HAS_PACE */ return ::strncat (s, t, len); -#endif /* ACE_HAS_PACE */ } ACE_INLINE ACE_WCHAR_T * @@ -313,11 +263,7 @@ ACE_OS_String::strncat (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len) ACE_INLINE int ACE_OS_String::strncmp (const char *s, const char *t, size_t len) { -#if defined (ACE_HAS_PACE) - return pace_strncmp (s, t, len); -#else /* ACE_HAS_PACE */ return ::strncmp (s, t, len); -#endif /* ACE_HAS_PACE */ } ACE_INLINE int @@ -333,11 +279,7 @@ ACE_OS_String::strncmp (const ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len) ACE_INLINE char * ACE_OS_String::strncpy (char *s, const char *t, size_t len) { -#if defined (ACE_HAS_PACE) - return pace_strncpy (s, t, len); -#else /* ACE_HAS_PACE */ return ::strncpy (s, t, len); -#endif /* ACE_HAS_PACE */ } ACE_INLINE ACE_WCHAR_T * @@ -353,13 +295,11 @@ ACE_OS_String::strncpy (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len) ACE_INLINE const char * ACE_OS_String::strpbrk (const char *s1, const char *s2) { -#if defined (ACE_HAS_PACE) - return (const char*) pace_strpbrk (s1, s2); -#elif defined (ACE_LACKS_STRPBRK) +#if defined (ACE_LACKS_STRPBRK) return ACE_OS_String::strpbrk_emulation (s1, s2); -#else /* ACE_HAS_PACE */ +#else /* ACE_LACKS_STRPBRK */ return (const char *) ::strpbrk (s1, s2); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_STRPBRK */ } #if defined (ACE_HAS_WCHAR) @@ -377,13 +317,11 @@ ACE_OS_String::strpbrk (const wchar_t *s, const wchar_t *t) ACE_INLINE char * ACE_OS_String::strpbrk (char *s1, const char *s2) { -#if defined (ACE_HAS_PACE) - return pace_strpbrk (s1, s2); -#elif defined (ACE_LACKS_STRPBRK) +#if defined (ACE_LACKS_STRPBRK) return ACE_OS_String::strpbrk_emulation (s1, s2); -#else /* ACE_HAS_PACE */ +#else /* ACE_LACKS_STRPBRK */ return ::strpbrk (s1, s2); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_STRPBRK */ } #if defined (ACE_HAS_WCHAR) @@ -398,9 +336,7 @@ ACE_OS_String::strpbrk (wchar_t *s, const wchar_t *t) ACE_INLINE const char * ACE_OS_String::strrchr (const char *s, int c) { -#if defined (ACE_HAS_PACE) - return (const char*) pace_strrchr (s, c); -#elif defined (ACE_LACKS_STRRCHR) +#if defined (ACE_LACKS_STRRCHR) return ACE_OS_String::strrchr_emulation (s, c); #else /* ! ACE_LACKS_STRRCHR */ return (const char *) ::strrchr (s, c); @@ -422,9 +358,7 @@ ACE_OS_String::strrchr (const wchar_t *s, wint_t c) ACE_INLINE char * ACE_OS_String::strrchr (char *s, int c) { -#if defined (ACE_HAS_PACE) - return pace_strrchr (s, c); -#elif defined (ACE_LACKS_STRRCHR) +#if defined (ACE_LACKS_STRRCHR) return ACE_OS_String::strrchr_emulation (s, c); #else /* ! ACE_LACKS_STRRCHR */ return ::strrchr (s, c); @@ -443,13 +377,11 @@ ACE_OS_String::strrchr (wchar_t *s, wint_t c) ACE_INLINE size_t ACE_OS_String::strspn (const char *s, const char *t) { -#if defined (ACE_HAS_PACE) - return pace_strspn (s, t); -#elif defined (ACE_LACKS_STRSPN) +#if defined (ACE_LACKS_STRSPN) return ACE_OS_String::strspn_emulation (s, t); -#else /* ACE_HAS_PACE */ +#else /* ACE_LACKS_STRSPN */ return ::strspn (s, t); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_STRSPN */ } #if defined (ACE_HAS_WCHAR) @@ -467,11 +399,7 @@ ACE_OS_String::strspn (const wchar_t *s, const wchar_t *t) ACE_INLINE const char * ACE_OS_String::strstr (const char *s, const char *t) { -#if defined (ACE_HAS_PACE) - return pace_strstr (s, t); -#else /* ACE_HAS_PACE */ return (const char *) ::strstr (s, t); -#endif /* ACE_HAS_PACE */ } #if defined (ACE_HAS_WCHAR) @@ -491,11 +419,7 @@ ACE_OS_String::strstr (const wchar_t *s, const wchar_t *t) ACE_INLINE char * ACE_OS_String::strstr (char *s, const char *t) { -#if defined (ACE_HAS_PACE) - return pace_strstr (s, t); -#else /* ACE_HAS_PACE */ return ::strstr (s, t); -#endif /* ACE_HAS_PACE */ } #if defined (ACE_HAS_WCHAR) @@ -515,11 +439,7 @@ ACE_OS_String::strstr (wchar_t *s, const wchar_t *t) ACE_INLINE char * ACE_OS_String::strtok (char *s, const char *tokens) { -#if defined (ACE_HAS_PACE) - return pace_strtok (s, tokens); -#else /* ACE_HAS_PACE */ return ::strtok (s, tokens); -#endif /* ACE_HAS_PACE */ } #if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOK) @@ -540,8 +460,6 @@ ACE_OS_String::ace_isprint (const ACE_TCHAR c) { #if defined (ACE_USES_WCHAR) return iswprint (c); -#elif defined (ACE_HAS_PACE) - return pace_isprint (c); #else /* ACE_USES_WCHAR */ return isprint (c); #endif /* ACE_USES_WCHAR */ @@ -552,21 +470,15 @@ ACE_OS_String::ace_isspace (const ACE_TCHAR c) { #if defined (ACE_USES_WCHAR) return iswspace (c); -#elif defined (ACE_HAS_PACE) - return pace_isspace (c); -#else /* ACE_HAS_PACE */ +#else /* ACE_USES_WCHAR */ return isspace (c); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_USES_WCHAR */ } ACE_INLINE int ACE_OS_String::to_lower (int c) { -#if defined (ACE_HAS_PACE) - return pace_tolower (c); -#else /* ACE_HAS_PACE */ return tolower (c); -#endif /* ACE_HAS_PACE */ } #if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_TOWLOWER) @@ -690,9 +602,7 @@ ACE_OS_String::strnstr (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len) ACE_INLINE char * ACE_OS_String::strtok_r (char *s, const char *tokens, char **lasts) { -#if defined (ACE_HAS_PACE) - return pace_strtok_r (s, tokens, lasts); -#elif defined (ACE_HAS_REENTRANT_FUNCTIONS) +#if defined (ACE_HAS_REENTRANT_FUNCTIONS) return ::strtok_r (s, tokens, lasts); #else return ACE_OS_String::strtok_r_emulation (s, tokens, lasts); @@ -720,11 +630,7 @@ ACE_OS_String::strtok_r (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T ACE_INLINE double ACE_OS_String::strtod (const char *s, char **endptr) { -#if defined (ACE_HAS_PACE) - return pace_strtod (s, endptr); -#else /* ACE_HAS_PACE */ return ::strtod (s, endptr); -#endif /* ACE_HAS_PACE */ } #endif /* !ACE_LACKS_STRTOD */ @@ -739,13 +645,11 @@ ACE_OS_String::strtod (const wchar_t *s, wchar_t **endptr) ACE_INLINE long ACE_OS_String::strtol (const char *s, char **ptr, int base) { -#if defined (ACE_HAS_PACE) - return pace_strtol (s, ptr, base); -#elif defined (ACE_LACKS_STRTOL) +#if defined (ACE_LACKS_STRTOL) return ACE_OS_String::strtol_emulation (s, ptr, base); -#else /* ACE_HAS_PACE */ +#else /* ACE_LACKS_STRTOL */ return ::strtol (s, ptr, base); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_STRTOL */ } #if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOL) @@ -759,13 +663,11 @@ ACE_OS_String::strtol (const wchar_t *s, wchar_t **ptr, int base) ACE_INLINE unsigned long ACE_OS_String::strtoul (const char *s, char **ptr, int base) { -#if defined (ACE_HAS_PACE) - return pace_strtoul (s, ptr, base); -#elif defined (ACE_LACKS_STRTOUL) +#if defined (ACE_LACKS_STRTOUL) return ACE_OS_String::strtoul_emulation (s, ptr, base); -#else /* ACE_HAS_PACE */ +#else /* ACE_LACKS_STRTOUL */ return ::strtoul (s, ptr, base); -#endif /* ACE_HAS_PACE */ +#endif /* ACE_LACKS_STRTOUL */ } #if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOUL) diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp index 331e3c5b036..569fdb59ffc 100644 --- a/ace/Thread_Manager.cpp +++ b/ace/Thread_Manager.cpp @@ -538,7 +538,7 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func, ACE_TRACE ("ACE_Thread_Manager::spawn_i"); ACE_hthread_t thr_handle; -#if defined (VXWORKS) && ! defined (ACE_HAS_PACE) +#if defined (VXWORKS) // On VxWorks, ACE_thread_t is char *. If t_id is 0, allocate space // for ACE_OS::thr_create () to store the task name. If t_id is not // 0, and it doesn't point to a 0 char *, then the non-zero char * @@ -880,7 +880,7 @@ ACE_Thread_Manager::remove_thr (ACE_Thread_Descriptor *td, #endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ this->thr_list_.remove (td); -#if defined (VXWORKS) && ! defined (ACE_HAS_PACE) +#if defined (VXWORKS) // Delete the thread ID, if the ACE_Thread_Manager allocated it. if (tid && tid[0] == ACE_THR_ID_ALLOCATED) { @@ -948,9 +948,6 @@ int ACE_Thread_Manager::join_thr (ACE_Thread_Descriptor *td, int) { ACE_TRACE ("ACE_Thread_Manager::join_thr"); -#if defined (ACE_HAS_PACE) - return ACE_Thread::join (td->thr_handle_); -#else int result = ACE_Thread::join (td->thr_handle_); if (result != 0) { @@ -963,7 +960,6 @@ ACE_Thread_Manager::join_thr (ACE_Thread_Descriptor *td, int) } return 0; -#endif /* ACE_HAS_PACE */ } int @@ -1022,7 +1018,7 @@ ACE_Thread_Manager::kill_thr (ACE_Thread_Descriptor *td, int signum) ACE_TRACE ("ACE_Thread_Manager::kill_thr"); ACE_thread_t tid = td->thr_id_; -#if defined (VXWORKS) && ! defined (ACE_HAS_PACE) +#if defined (VXWORKS) // Skip over the ID-allocated marker, if present. tid += tid[0] == ACE_THR_ID_ALLOCATED ? 1 : 0; #endif /* VXWORKS */ diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp index 4105763137a..f5b203fd2f6 100644 --- a/ace/WFMO_Reactor.cpp +++ b/ace/WFMO_Reactor.cpp @@ -1912,15 +1912,8 @@ ACE_WFMO_Reactor::simple_dispatch_handler (int slot, // This dispatch is used for non-I/O entires // Assign the ``signaled'' HANDLE so that callers can get it. -#if defined (ACE_HAS_PACE) - // siginfo_t is typedef'd to a pace_siginfo_t where there - // exists no constructor. - siginfo_t sig; - sig.si_handle_ = event_handle; -#else // siginfo_t is an ACE - specific fabrication. Constructor exists. siginfo_t sig (event_handle); -#endif // ACE_HAS_PACE ACE_Event_Handler *eh = this->handler_rep_.current_info ()[slot].event_handler_; diff --git a/ace/config-all.h b/ace/config-all.h index 8c69aa6ee60..eebffb9a9e7 100644 --- a/ace/config-all.h +++ b/ace/config-all.h @@ -661,13 +661,6 @@ typedef ACE_THR_FUNC_RETURN (*ACE_THR_C_FUNC)(void *); } // ============================================================================ -// PACE macros -// ============================================================================ -#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) -# define ACE_HAS_POSIX_SEM -#endif /* ACE_HAS_PACE */ - -// ============================================================================ // Macros for controlling the lifetimes of dlls loaded by ACE_DLL--including // all dlls loaded via the ACE Service Config framework. // diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h index bfcef2a7849..0975d3338dd 100644 --- a/ace/config-win32-borland.h +++ b/ace/config-win32-borland.h @@ -11,12 +11,6 @@ #error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ -# if defined (ACE_HAS_PACE) -# ifndef PACE_HAS_ALL_POSIX_FUNCS -# define PACE_HAS_ALL_POSIX_FUNCS 1 -# endif /* PACE_HAS_ALL_POSIX_FUNCS */ -# endif /* ACE_HAS_PACE */ - # if (__BORLANDC__ == 0x540) // The linker in C++Builder 4 has trouble with the large number of DLL // function exports created when you compile without inline functions. diff --git a/ace/config-win32-msvc-5.h b/ace/config-win32-msvc-5.h index 1d0c624a970..2b53bf345e3 100644 --- a/ace/config-win32-msvc-5.h +++ b/ace/config-win32-msvc-5.h @@ -23,12 +23,6 @@ #error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ -# if defined (ACE_HAS_PACE) -# ifndef PACE_HAS_ALL_POSIX_FUNCS -# define PACE_HAS_ALL_POSIX_FUNCS 1 -# endif /* PACE_HAS_ALL_POSIX_FUNCS */ -# endif /* ACE_HAS_PACE */ - # if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) # define ACE_HAS_STANDARD_CPP_LIBRARY 0 # endif diff --git a/ace/config-win32-msvc-6.h b/ace/config-win32-msvc-6.h index a66bd3d330b..cb08afbe7be 100644 --- a/ace/config-win32-msvc-6.h +++ b/ace/config-win32-msvc-6.h @@ -23,12 +23,6 @@ #error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ -# if defined (ACE_HAS_PACE) -# ifndef PACE_HAS_ALL_POSIX_FUNCS -# define PACE_HAS_ALL_POSIX_FUNCS 1 -# endif /* PACE_HAS_ALL_POSIX_FUNCS */ -# endif /* ACE_HAS_PACE */ - # if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) # define ACE_HAS_STANDARD_CPP_LIBRARY 0 # endif |