Skip to content

M
mpd
Commit 8bbfb5cd authored by Christian Körner's avatar Christian Körner Committed by Max Kellermann
Browse files
Options

thread/PosixCond: fix timed_wait

pthread_cond_timedwait() in PosixCond.hxx:timed_wait(PosixMutex...) returns EINVAL, if ts.tv_nsec >= 1E9. In this case, it returns to early. Find attached a patch which fixes this. I chose a compare-subtraction method to keep ts.tv_nsec below 1E9. Another option would be ts.tv_sec += ts.tv_nsec / 1000000000; ts.tv_nsec %= 1000000000; But I guess this takes more time on some ARM processors, which don't support hardware division.
parent 1e17d5b1
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
src/thread/PosixCond.hxx
View file @ 8bbfb5cd
......@@ -79,6 +79,11 @@ public:
struct timespec ts;
ts.tv_sec = now.tv_sec + timeout_ms / 1000;
ts.tv_nsec = (now.tv_usec + (timeout_ms % 1000) * 1000) * 1000;
// Keep tv_nsec < 1E9 to prevent return of EINVAL
if (ts.tv_nsec >= 1000000000) {
ts.tv_nsec -= 1000000000;
ts.tv_sec++;
}
return pthread_cond_timedwait(&cond, &mutex.mutex, &ts) == 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment