oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

thread/PosixCond: fix timed_wait

Browse Source 
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.
This commit is contained in:
Christian Körner 2015-10-16 14:25:22 +02:00 committed by Max Kellermann
parent 1e17d5b1cc
commit 8bbfb5cda1
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/thread/PosixCond.hxx
View File

@ -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;
}