diff options
| author | jb <jb@FreeBSD.org> | 1998-04-04 11:33:01 +0000 |
|---|---|---|
| committer | jb <jb@FreeBSD.org> | 1998-04-04 11:33:01 +0000 |
| commit | ddcbf85eb29fd2d50ce1afa0243be370d4893370 (patch) | |
| tree | 6098bb7060d793dec64ddd28bc6d9cda781d96ed /lib/libpthread/thread/thr_cond.c | |
| parent | 43c228762029d6d4e7c66cfd6c4d1e88d807dba1 (diff) | |
| download | FreeBSD-src-ddcbf85eb29fd2d50ce1afa0243be370d4893370.zip FreeBSD-src-ddcbf85eb29fd2d50ce1afa0243be370d4893370.tar.gz | |
Enable static initialisation of mutexes and condition variables.
Diffstat (limited to 'lib/libpthread/thread/thr_cond.c')
| -rw-r--r-- | lib/libpthread/thread/thr_cond.c | 20 |
1 files changed, 16 insertions, 4 deletions
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); |
