fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

util: macOS support for cnd_monotonic

Browse source 
Reviewed-by: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29900>
This commit is contained in:
Aleksi Sapon 2024-07-09 13:21:10 -04:00 • committed by Marge Bot
parent f12dfd7940
commit 0441c69527
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/util/cnd_monotonic.c
View file

@ -27,6 +27,7 @@
#include "cnd_monotonic.h"
#include "util/os_time.h"
#include "util/timespec.h"
#include <assert.h>
@ -51,7 +52,12 @@ u_cnd_monotonic_init(struct u_cnd_monotonic *cond)
int ret = thrd_error;
pthread_condattr_t condattr;
if (pthread_condattr_init(&condattr) == 0) {
if ((pthread_condattr_setclock(&condattr, CLOCK_MONOTONIC) == 0) &&
if (
// pthread_condattr_setclock is not supported on Apple platforms.
// Instead, they use a relative deadline. See u_cnd_monotonic_timedwait.
#ifndef __APPLE__
(pthread_condattr_setclock(&condattr, CLOCK_MONOTONIC) == 0) &&
#endif
(pthread_cond_init(&cond->cond, &condattr) == 0)) {
ret = thrd_success;
}
@ -117,8 +123,17 @@ u_cnd_monotonic_timedwait(struct u_cnd_monotonic *cond, mtx_t *mtx,
(PCRITICAL_SECTION)mtx, timeout))
return thrd_success;
return (GetLastError() == ERROR_TIMEOUT) ? thrd_timedout : thrd_error;
#else
#ifdef __APPLE__
// Convert to a relative wait as we can't use CLOCK_MONOTONIC deadlines on macOS.
struct timespec now_time;
timespec_get(&now_time, TIME_MONOTONIC);
struct timespec rel_time;
timespec_sub_saturate(&rel_time, abs_time, &now_time);
int rt = pthread_cond_timedwait_relative_np(&cond->cond, mtx, &rel_time);
#else
int rt = pthread_cond_timedwait(&cond->cond, mtx, abs_time);
#endif
if (rt == ETIMEDOUT)
return thrd_timedout;
return (rt == 0) ? thrd_success : thrd_error;