oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-11 17:51:04 +00:00
Code Wiki Activity

posix implementation: use correct clock

Browse source
This commit is contained in:
Desour 2024-10-06 17:13:13 +02:00
parent d43cbafc37
commit 75467e3695
2 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/threading/ipc_channel.cpp
View file

@ -126,7 +126,7 @@ static void post(IPCChannelBuffer *buf) noexcept
#elif defined(IPC_CHANNEL_IMPLEMENTATION_POSIX) #elif defined(IPC_CHANNEL_IMPLEMENTATION_POSIX)
// timeout is absolute // timeout is absolute (using cond_clockid)
// returns false on timeout // returns false on timeout
static bool wait(IPCChannelBuffer *buf, const struct timespec *timeout) noexcept static bool wait(IPCChannelBuffer *buf, const struct timespec *timeout) noexcept
{ {
@ -172,18 +172,25 @@ static bool wait_in(IPCChannelEnd::Dir *dir, u64 timeout_ms_abs)
struct timespec timeout; struct timespec timeout;
struct timespec *timeoutp = nullptr; struct timespec *timeoutp = nullptr;
if (timeout_ms_abs > 0) { if (timeout_ms_abs > 0) {
#if defined(IPC_CHANNEL_IMPLEMENTATION_LINUX_FUTEX)
// Relative time // Relative time
u64 tnow = porting::getTimeMs(); u64 tnow = porting::getTimeMs();
if (tnow > timeout_ms_abs) if (tnow > timeout_ms_abs)
return false; return false;
u64 timeout_ms = timeout_ms_abs - tnow; u64 timeout_ms_rel = timeout_ms_abs - tnow;
#if defined(IPC_CHANNEL_IMPLEMENTATION_LINUX_FUTEX)
timeout.tv_sec = 0;
timeout.tv_nsec = 0;
#elif defined(IPC_CHANNEL_IMPLEMENTATION_POSIX) #elif defined(IPC_CHANNEL_IMPLEMENTATION_POSIX)
// Absolute time // Absolute time, relative to cond_clockid
u64 timeout_ms = timeout_ms_abs; FATAL_ERROR_IF(clock_gettime(dir->buf_in->cond_clockid, &timeout) < 0,
"clock_gettime failed");
if (timeout.tv_nsec >= 1000'000'000L) {
timeout.tv_nsec -= 1000'000'000L;
timeout.tv_sec += 1;
}
#endif #endif
timeout.tv_sec = timeout_ms / 1000; timeout.tv_sec += timeout_ms_rel / 1000;
timeout.tv_nsec = timeout_ms % 1000 * 1000000UL; timeout.tv_nsec += timeout_ms_rel % 1000 * 1000'000L;
timeoutp = &timeout; timeoutp = &timeout;
} }
@ -225,6 +232,8 @@ IPCChannelBuffer::IPCChannelBuffer()
goto error_condattr_setpshared; goto error_condattr_setpshared;
if (pthread_mutexattr_setpshared(&mutexattr, PTHREAD_PROCESS_SHARED) != 0) if (pthread_mutexattr_setpshared(&mutexattr, PTHREAD_PROCESS_SHARED) != 0)
goto error_mutexattr_setpshared; goto error_mutexattr_setpshared;
if (pthread_condattr_getclock(&condattr, &cond_clockid) != 0)
goto error_condattr_getclock;
if (pthread_cond_init(&cond, &condattr) != 0) if (pthread_cond_init(&cond, &condattr) != 0)
goto error_cond_init; goto error_cond_init;
if (pthread_mutex_init(&mutex, &mutexattr) != 0) if (pthread_mutex_init(&mutex, &mutexattr) != 0)
@ -236,6 +245,7 @@ IPCChannelBuffer::IPCChannelBuffer()
error_mutex_init: error_mutex_init:
pthread_cond_destroy(&cond); pthread_cond_destroy(&cond);
error_cond_init: error_cond_init:
error_condattr_getclock:
error_mutexattr_setpshared: error_mutexattr_setpshared:
error_condattr_setpshared: error_condattr_setpshared:
pthread_mutexattr_destroy(&mutexattr); pthread_mutexattr_destroy(&mutexattr);

1
src/threading/ipc_channel.h
View file

@ -71,6 +71,7 @@ struct IPCChannelBuffer
#elif defined(IPC_CHANNEL_IMPLEMENTATION_POSIX) #elif defined(IPC_CHANNEL_IMPLEMENTATION_POSIX)
pthread_cond_t cond; pthread_cond_t cond;
clockid_t cond_clockid;
pthread_mutex_t mutex; pthread_mutex_t mutex;
bool posted = false; // protected by mutex bool posted = false; // protected by mutex
#endif #endif