From 08158a6ba75928955aa3a46fd6b188f164624635 Mon Sep 17 00:00:00 2001 From: deischen Date: Wed, 4 Feb 2004 15:37:48 +0000 Subject: Allow libc's version of sem_trywait() to work for non-pshared mutexes. --- lib/libc/gen/sem.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/libc/gen/sem.c b/lib/libc/gen/sem.c index 5ab7817..a6c0dde 100644 --- a/lib/libc/gen/sem.c +++ b/lib/libc/gen/sem.c @@ -289,17 +289,32 @@ __sem_wait(sem_t *sem) if (sem_check_validity(sem) != 0) return (-1); - return (ksem_wait((*sem)->semid)); + return (ksem_wait((*sem)->semid)); } int __sem_trywait(sem_t *sem) { + int retval; if (sem_check_validity(sem) != 0) return (-1); - return (ksem_trywait((*sem)->semid)); + if ((*sem)->syssem != 0) + retval = ksem_trywait((*sem)->semid); + else { + _pthread_mutex_lock(&(*sem)->lock); + if ((*sem)->count != 0) { + (*sem)->count--; + retval = 0; + } else { + errno = EAGAIN; + retval = -1; + } + (*sem)->count--; + _pthread_mutex_unlock(&(*sem)->lock); + } + return (retval); } int -- cgit v1.1