diff options
Diffstat (limited to 'ace/OS.i')
| -rw-r--r-- | ace/OS.i | 1128 |
1 files changed, 304 insertions, 824 deletions
@@ -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) |