diff options
author | jb <jb@FreeBSD.org> | 1999-05-23 10:55:33 +0000 |
---|---|---|
committer | jb <jb@FreeBSD.org> | 1999-05-23 10:55:33 +0000 |
commit | 46db87a1e419b1c77d616f221dab956228910cf3 (patch) | |
tree | 02a9057f5b70cc09e45507a055e5fcf4a3ceeb24 /lib/libpthread | |
parent | 3162b42ed3feed4271a715812219251af3da2c0e (diff) | |
download | FreeBSD-src-46db87a1e419b1c77d616f221dab956228910cf3.zip FreeBSD-src-46db87a1e419b1c77d616f221dab956228910cf3.tar.gz |
Fix a problem with static initialisation of mutexes and condition
variables.
Submitted by: Dan Eischen <eischen@vigrid.com>
Diffstat (limited to 'lib/libpthread')
-rw-r--r-- | lib/libpthread/thread/thr_cond.c | 19 | ||||
-rw-r--r-- | lib/libpthread/thread/thr_mutex.c | 18 | ||||
-rw-r--r-- | lib/libpthread/thread/thr_private.h | 5 |
3 files changed, 40 insertions, 2 deletions
diff --git a/lib/libpthread/thread/thr_cond.c b/lib/libpthread/thread/thr_cond.c index c090d79..e0360dd 100644 --- a/lib/libpthread/thread/thr_cond.c +++ b/lib/libpthread/thread/thr_cond.c @@ -146,6 +146,15 @@ pthread_cond_wait(pthread_cond_t * cond, pthread_mutex_t * mutex) */ else if (*cond != NULL || (rval = pthread_cond_init(cond,NULL)) == 0) { + /* + * If the condvar was statically allocated, properly + * initialize the tail queue. + */ + if (((*cond)->c_flags & COND_FLAGS_INITED) == 0) { + TAILQ_INIT(&(*cond)->c_queue); + (*cond)->c_flags |= COND_FLAGS_INITED; + } + /* Lock the condition variable structure: */ _SPINLOCK(&(*cond)->lock); @@ -238,6 +247,16 @@ pthread_cond_timedwait(pthread_cond_t * cond, pthread_mutex_t * mutex, */ else if (*cond != NULL || (rval = pthread_cond_init(cond,NULL)) == 0) { + /* + * If the condvar was statically allocated, properly + * initialize the tail queue. + */ + if (((*cond)->c_flags & COND_FLAGS_INITED) == 0) { + TAILQ_INIT(&(*cond)->c_queue); + (*cond)->c_flags |= COND_FLAGS_INITED; + } + + /* Lock the condition variable structure: */ _SPINLOCK(&(*cond)->lock); diff --git a/lib/libpthread/thread/thr_mutex.c b/lib/libpthread/thread/thr_mutex.c index 0103a6c..fa9c8cf 100644 --- a/lib/libpthread/thread/thr_mutex.c +++ b/lib/libpthread/thread/thr_mutex.c @@ -222,6 +222,15 @@ pthread_mutex_trylock(pthread_mutex_t * mutex) */ else if (*mutex != NULL || (ret = init_static(mutex)) == 0) { /* + * If the mutex was statically allocated, properly + * initialize the tail queue. + */ + if (((*mutex)->m_flags & MUTEX_FLAGS_INITED) == 0) { + TAILQ_INIT(&(*mutex)->m_queue); + (*mutex)->m_flags |= MUTEX_FLAGS_INITED; + } + + /* * Guard against being preempted by a scheduling signal. * To support priority inheritence mutexes, we need to * maintain lists of mutex ownerships for each thread as @@ -352,6 +361,15 @@ pthread_mutex_lock(pthread_mutex_t * mutex) */ else if (*mutex != NULL || (ret = init_static(mutex)) == 0) { /* + * If the mutex was statically allocated, properly + * initialize the tail queue. + */ + if (((*mutex)->m_flags & MUTEX_FLAGS_INITED) == 0) { + TAILQ_INIT(&(*mutex)->m_queue); + (*mutex)->m_flags |= MUTEX_FLAGS_INITED; + } + + /* * Guard against being preempted by a scheduling signal. * To support priority inheritence mutexes, we need to * maintain lists of mutex ownerships for each thread as diff --git a/lib/libpthread/thread/thr_private.h b/lib/libpthread/thread/thr_private.h index bf99a3b..db1c224 100644 --- a/lib/libpthread/thread/thr_private.h +++ b/lib/libpthread/thread/thr_private.h @@ -210,7 +210,8 @@ struct pthread_mutex { */ #define PTHREAD_MUTEX_STATIC_INITIALIZER \ { PTHREAD_MUTEX_DEFAULT, PTHREAD_PRIO_NONE, TAILQ_INITIALIZER, \ - NULL, { NULL }, MUTEX_FLAGS_INITED, 0, 0, 0, TAILQ_INITIALIZER } + NULL, { NULL }, 0, 0, 0, 0, TAILQ_INITIALIZER, \ + _SPINLOCK_INITIALIZER } struct pthread_mutex_attr { enum pthread_mutextype m_type; @@ -257,7 +258,7 @@ struct pthread_cond_attr { */ #define PTHREAD_COND_STATIC_INITIALIZER \ { COND_TYPE_FAST, PTHREAD_QUEUE_INITIALIZER, NULL, NULL \ - COND_FLAGS_INITED } + 0, _SPINLOCK_INITIALIZER } /* * Cleanup definitions. |