From ddcbf85eb29fd2d50ce1afa0243be370d4893370 Mon Sep 17 00:00:00 2001 From: jb Date: Sat, 4 Apr 1998 11:33:01 +0000 Subject: Enable static initialisation of mutexes and condition variables. --- lib/libpthread/thread/thr_cond.c | 20 ++++++++++++++++---- lib/libpthread/thread/thr_mutex.c | 20 ++++++++++++++++---- 2 files changed, 32 insertions(+), 8 deletions(-) (limited to 'lib/libpthread') diff --git a/lib/libpthread/thread/thr_cond.c b/lib/libpthread/thread/thr_cond.c index 978ad04..e7fcc62 100644 --- a/lib/libpthread/thread/thr_cond.c +++ b/lib/libpthread/thread/thr_cond.c @@ -134,9 +134,15 @@ pthread_cond_wait(pthread_cond_t * cond, pthread_mutex_t * mutex) int rval = 0; int status; - if (cond == NULL || *cond == NULL) { + if (cond == NULL) rval = EINVAL; - } else { + + /* + * If the condition variable is statically initialized, + * perform the dynamic initialization: + */ + else if (*cond != NULL || + (rval = pthread_cond_init(cond,NULL)) == 0) { /* Block signals: */ _thread_kern_sig_block(&status); @@ -189,9 +195,15 @@ pthread_cond_timedwait(pthread_cond_t * cond, pthread_mutex_t * mutex, int rval = 0; int status; - if (cond == NULL || *cond == NULL) { + if (cond == NULL) rval = EINVAL; - } else { + + /* + * If the condition variable is statically initialized, + * perform the dynamic initialization: + */ + else if (*cond != NULL || + (rval = pthread_cond_init(cond,NULL)) == 0) { /* Block signals: */ _thread_kern_sig_block(&status); diff --git a/lib/libpthread/thread/thr_mutex.c b/lib/libpthread/thread/thr_mutex.c index e6be6de..9f92de9 100644 --- a/lib/libpthread/thread/thr_mutex.c +++ b/lib/libpthread/thread/thr_mutex.c @@ -162,9 +162,15 @@ pthread_mutex_trylock(pthread_mutex_t * mutex) int ret = 0; int status; - if (mutex == NULL || *mutex == NULL) { + if (mutex == NULL) ret = EINVAL; - } else { + + /* + * If the mutex is statically initialized, perform the dynamic + * initialization: + */ + else if (*mutex != NULL || + (ret = pthread_mutex_init(mutex,NULL)) == 0) { /* Block signals: */ _thread_kern_sig_block(&status); @@ -224,9 +230,15 @@ pthread_mutex_lock(pthread_mutex_t * mutex) int ret = 0; int status; - if (mutex == NULL || *mutex == NULL) { + if (mutex == NULL) ret = EINVAL; - } else { + + /* + * If the mutex is statically initialized, perform the dynamic + * initialization: + */ + else if (*mutex != NULL || + (ret = pthread_mutex_init(mutex,NULL)) == 0) { /* Block signals: */ _thread_kern_sig_block(&status); -- cgit v1.1