mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-03-03 21:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

os: Adjust how we compute the timeout for a semaphore.

Browse source 
Preparation for overhaul of timing on Windows.
This commit is contained in:
Ryan Pavlik 2021-03-30 11:16:29 -05:00
parent b3772e2710
commit ddc9b00d14
1 changed files with 29 additions and 8 deletions

37
src/xrt/auxiliary/os/os_threading.h
View file

@ -180,6 +180,33 @@ os_semaphore_release(struct os_semaphore *os)
sem_post(&os->sem);
}
/*!
* Set @p ts to the current time, plus the timeout_ns value.
*
* Intended for use by the threading code only: the timestamps are not interchangeable with other sources of time.
*/
static inline int
os_semaphore_get_realtime_clock(struct timespec *ts, uint64_t timeout_ns)
{
#if defined(XRT_OS_WINDOWS)
struct timespec relative;
os_ns_to_timespec(timeout_ns, &relative);
pthread_win32_getabstime_np(ts, &relative);
return 0;
#else
struct timespec now;
if (clock_gettime(CLOCK_REALTIME, &now) < 0) {
assert(false);
return -1;
}
uint64_t now_ns = os_timespec_to_ns(ts);
uint64_t when_ns = timeout_ns + now_ns;
os_ns_to_timespec(when_ns, ts);
return 0;
#endif
}
/*!
* Wait, if @p timeout_ns is zero then waits forever.
*/
@ -191,17 +218,11 @@ os_semaphore_wait(struct os_semaphore *os, uint64_t timeout_ns)
return;
}
struct timespec ts;
if (clock_gettime(CLOCK_REALTIME, &ts) == -1) {
struct timespec abs_timeout;
if (os_semaphore_get_realtime_clock(&abs_timeout, timeout_ns) == -1) {
assert(false);
}
uint64_t now_ns = os_timespec_to_ns(&ts);
uint64_t when_ns = timeout_ns + now_ns;
struct timespec abs_timeout = {0, 0};
os_ns_to_timespec(when_ns, &abs_timeout);
sem_timedwait(&os->sem, &abs_timeout);
}