diff options
| author | Kurt Miller <kurt@cvs.openbsd.org> | 2009-10-28 13:49:11 +0000 |
|---|---|---|
| committer | Kurt Miller <kurt@cvs.openbsd.org> | 2009-10-28 13:49:11 +0000 |
| commit | a8f82bd03d770993bc871cb694bcbd89a872f1aa (patch) | |
| tree | c5624cd8292a2ea70075612a30a7889cbb4c94d1 /lib | |
| parent | 7ee0a5fd0b72f35e6524c1fddc720b9b79fd0f39 (diff) | |
Remove mutext from list of held mutexes in _mutex_reinit(). Corrects
a failure to lock the _atfork_mutex after forking. Tested by ajacoutot@
and myself. okay guenther@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libpthread/uthread/uthread_mutex.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/libpthread/uthread/uthread_mutex.c b/lib/libpthread/uthread/uthread_mutex.c index f45a0f64616..a2f0e97387a 100644 --- a/lib/libpthread/uthread/uthread_mutex.c +++ b/lib/libpthread/uthread/uthread_mutex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uthread_mutex.c,v 1.21 2007/06/05 18:11:49 kurt Exp $ */ +/* $OpenBSD: uthread_mutex.c,v 1.22 2009/10/28 13:49:10 kurt Exp $ */ /* * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>. * All rights reserved. @@ -46,6 +46,11 @@ (m)->m_qe.tqe_prev = NULL; \ (m)->m_qe.tqe_next = NULL; \ } while (0) +#define _MUTEX_REMOVE_IF_OWNED(m) do { \ + if ((m)->m_qe.tqe_prev != NULL) \ + TAILQ_REMOVE(&(m)->m_owner->mutexq, \ + (m), m_qe); \ +} while (0) #define _MUTEX_ASSERT_IS_OWNED(m) do { \ if ((m)->m_qe.tqe_prev == NULL) \ PANIC("mutex is not on list"); \ @@ -57,6 +62,7 @@ } while (0) #else #define _MUTEX_INIT_LINK(m) +#define _MUTEX_REMOVE_IF_OWNED(m) #define _MUTEX_ASSERT_IS_OWNED(m) #define _MUTEX_ASSERT_NOT_OWNED(m) #endif @@ -90,6 +96,8 @@ _mutex_reinit(pthread_mutex_t * mutex) /* * Initialize the mutex structure: */ + _MUTEX_REMOVE_IF_OWNED(*mutex); + _MUTEX_INIT_LINK(*mutex); (*mutex)->m_type = PTHREAD_MUTEX_DEFAULT; (*mutex)->m_protocol = PTHREAD_PRIO_NONE; TAILQ_INIT(&(*mutex)->m_queue); @@ -100,7 +108,6 @@ _mutex_reinit(pthread_mutex_t * mutex) (*mutex)->m_refcount = 0; (*mutex)->m_prio = 0; (*mutex)->m_saved_prio = 0; - _MUTEX_INIT_LINK(*mutex); _SPINLOCK_INIT(&(*mutex)->lock); } return (ret); |