Skip to content

Update Semaphore::timed_wait with sem_clockwait and converting domain #797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Flw5469 wants to merge 2 commits into from
Closed

Update Semaphore::timed_wait with sem_clockwait and converting domain #797

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
781bd24
Fix: use if clockwait is available, convert deadline's domain (CLOCK_…
Jan 26, 2025
29d6071
remove log
Jan 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 27 additions & 5 deletions src/internal_modules/roc_core/target_posix_ext/roc_core/semaphore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
#include <errno.h>
#include <time.h>

#ifdef sem_clockwait
#define HAS_SEM_CLOCKWAIT 1
#else
#define HAS_SEM_CLOCKWAIT 0
#endif

namespace roc {
namespace core {

Expand All @@ -34,19 +40,35 @@ Semaphore::~Semaphore() {
}

bool Semaphore::timed_wait(nanoseconds_t deadline) {

if (deadline < 0) {
roc_panic("semaphore: unexpected negative deadline");
}

nanoseconds_t converted_deadline = deadline;

for (;;) {

// WHAT IF CHANGE SYSTEM TIME WHEN -1?
if (!HAS_SEM_CLOCKWAIT) {
converted_deadline = deadline + core::timestamp(core::ClockUnix) - core::timestamp(core::ClockMonotonic);
}

timespec ts;
ts.tv_sec = long(deadline / Second);
ts.tv_nsec = long(deadline % Second);
ts.tv_sec = long(converted_deadline / Second);
ts.tv_nsec = long(converted_deadline % Second);

if (sem_timedwait(&sem_, &ts) == 0) {
return true;
if (HAS_SEM_CLOCKWAIT) {
if (sem_clockwait(&sem_, core::ClockMonotonic ,&ts) == 0) {
return true;
}
} else {
if (sem_timedwait(&sem_, &ts) == 0) {
return true;
}
}


if (errno == ETIMEDOUT) {
return false;
}
Expand All @@ -61,7 +83,7 @@ void Semaphore::wait() {
for (;;) {
if (sem_wait(&sem_) == 0) {
return;
}
}
if (errno != EINTR) {
roc_panic("semaphore: sem_wait(): %s", errno_to_str().c_str());
}
Expand Down