mirror of
https://github.com/pocoproject/poco.git
synced 2025-10-28 03:20:11 +01:00
- prefer clock_getttime() over gettimeofday() if available
- use CLOCK_MONOTONIC for POSIX condition in Poco::Event and Poco::Semaphore if supported
This commit is contained in:
committed by
Guenter Obiltschnig
parent
7b5e974b05
commit
f89bea4411
@@ -19,6 +19,7 @@
|
||||
#include <timers.h>
|
||||
#include <cstring>
|
||||
#else
|
||||
#include <time.h>
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
|
||||
@@ -39,8 +40,34 @@ SemaphoreImpl::SemaphoreImpl(int n, int max): _n(n), _max(max)
|
||||
#endif
|
||||
if (pthread_mutex_init(&_mutex, NULL))
|
||||
throw SystemException("cannot create semaphore (mutex)");
|
||||
if (pthread_cond_init(&_cond, NULL))
|
||||
|
||||
#if defined(__linux__) || defined(__QNX__)
|
||||
pthread_condattr_t attr;
|
||||
if (pthread_condattr_init(&attr))
|
||||
{
|
||||
pthread_mutex_destroy(&_mutex);
|
||||
throw SystemException("cannot create semaphore (condition attribute)");
|
||||
}
|
||||
if (pthread_condattr_setclock(&attr, CLOCK_MONOTONIC))
|
||||
{
|
||||
pthread_condattr_destroy(&attr);
|
||||
pthread_mutex_destroy(&_mutex);
|
||||
throw SystemException("cannot create semaphore (condition attribute clock)");
|
||||
}
|
||||
if (pthread_cond_init(&_cond, &attr))
|
||||
{
|
||||
pthread_condattr_destroy(&attr);
|
||||
pthread_mutex_destroy(&_mutex);
|
||||
throw SystemException("cannot create semaphore (condition)");
|
||||
}
|
||||
pthread_condattr_destroy(&attr);
|
||||
#else
|
||||
if (pthread_cond_init(&_cond, NULL))
|
||||
{
|
||||
pthread_mutex_destroy(&_mutex);
|
||||
throw SystemException("cannot create semaphore (condition)");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -78,7 +105,16 @@ bool SemaphoreImpl::waitImpl(long milliseconds)
|
||||
delta.tv_sec = milliseconds / 1000;
|
||||
delta.tv_nsec = (milliseconds % 1000)*1000000;
|
||||
pthread_get_expiration_np(&delta, &abstime);
|
||||
#elif defined(POCO_VXWORKS)
|
||||
#elif defined(__linux__) || defined(__QNX__)
|
||||
clock_gettime(CLOCK_MONOTONIC, &abstime);
|
||||
abstime.tv_sec += milliseconds / 1000;
|
||||
abstime.tv_nsec += (milliseconds % 1000)*1000000;
|
||||
if (abstime.tv_nsec >= 1000000000)
|
||||
{
|
||||
abstime.tv_nsec -= 1000000000;
|
||||
abstime.tv_sec++;
|
||||
}
|
||||
#elif (defined(_POSIX_TIMERS) && defined(CLOCK_REALTIME)) || defined(POCO_VXWORKS)
|
||||
clock_gettime(CLOCK_REALTIME, &abstime);
|
||||
abstime.tv_sec += milliseconds / 1000;
|
||||
abstime.tv_nsec += (milliseconds % 1000)*1000000;
|
||||
|
||||
Reference in New Issue
Block a user