Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sem_timedwait: fix errno, return value and NULL behaviour

Browse Source 
* Takes into account remarks from Ingo.

Signed-off-by: Jerome Duval <jerome.duval@gmail.com>
Signed-off-by: Ingo Weinhold <ingo_weinhold@gmx.de>
This commit is contained in:
Sam Toyer 2012-11-30 08:57:10 +10:00 committed by Jerome Duval
parent 154b1dd2bf
commit 3cdae65125
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/system/libroot/posix/semaphore.cpp
View File

@ -112,11 +112,25 @@ sem_post(sem_t* semaphore)
int
sem_timedwait(sem_t* semaphore, const struct timespec* timeout)
{
bigtime_t timeoutMicros = ((bigtime_t)timeout->tv_sec) * 1000000
+ timeout->tv_nsec / 1000;
if (timeout != NULL && (timeout->tv_nsec < 0 ||
timeout->tv_nsec >= 1000000000)) {
status_t err = _kern_realtime_sem_wait(semaphore->id, 0);
if (err == B_WOULD_BLOCK)
err = EINVAL;
// do nothing, return err as it is.
RETURN_AND_SET_ERRNO_TEST_CANCEL(err);
}
RETURN_AND_SET_ERRNO_TEST_CANCEL(
_kern_realtime_sem_wait(semaphore->id, timeoutMicros));
bigtime_t timeoutMicros = B_INFINITE_TIMEOUT;
if (timeout != NULL) {
timeoutMicros = ((bigtime_t)timeout->tv_sec) * 1000000
+ timeout->tv_nsec / 1000;
}
status_t err = _kern_realtime_sem_wait(semaphore->id, timeoutMicros);
if (err == B_WOULD_BLOCK)
err = ETIMEDOUT;
RETURN_AND_SET_ERRNO_TEST_CANCEL(err);
}