diff --git a/src/os/unix/pa_unix_util.c b/src/os/unix/pa_unix_util.c index 459b2be..f234c64 100644 --- a/src/os/unix/pa_unix_util.c +++ b/src/os/unix/pa_unix_util.c @@ -160,7 +160,11 @@ PaTime PaUtil_GetTime( void ) return mach_absolute_time() * machSecondsConversionScaler_; #elif defined(HAVE_CLOCK_GETTIME) struct timespec tp; +#if defined(CLOCK_MONOTONIC) + clock_gettime(CLOCK_MONOTONIC, &tp); +#else clock_gettime(CLOCK_REALTIME, &tp); +#endif return (PaTime)(tp.tv_sec + tp.tv_nsec * 1e-9); #else struct timeval tv; @@ -270,11 +274,16 @@ PaError PaUnixThread_New( PaUnixThread* self, void* (*threadFunc)( void* ), void { PaError result = paNoError; pthread_attr_t attr; + pthread_condattr_t cattr; int started = 0; memset( self, 0, sizeof (PaUnixThread) ); PaUnixMutex_Initialize( &self->mtx ); - PA_ASSERT_CALL( pthread_cond_init( &self->cond, NULL ), 0 ); + PA_ASSERT_CALL( pthread_condattr_init( &cattr ), 0 ); +#if defined(CLOCK_MONOTONIC) && !defined(__APPLE__) + PA_ASSERT_CALL( pthread_condattr_setclock( &cattr, CLOCK_MONOTONIC ), 0 ); +#endif + PA_ASSERT_CALL( pthread_cond_init( &self->cond, &cattr), 0 ); self->parentWaiting = 0 != waitForChild;