d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

After fork(), reinitialize internal locks for pthread_once().

Browse Source
This commit is contained in:
David Xu 2006-02-15 13:41:02 +00:00
parent 1d66a76549
commit c5d2fb8df7
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libthr/thread/thr_init.c
View File

@ -412,6 +412,8 @@ init_private(void)
_thr_umtx_init(&_keytable_lock);
_thr_umtx_init(&_thr_atfork_lock);
_thr_umtx_init(&_thr_event_lock);
_thr_once_lock = PTHREAD_MUTEX_INITIALIZER;
_thr_once_cv = PTHREAD_COND_INITIALIZER;
_thr_spinlock_init();
_thr_list_init();

22
lib/libthr/thread/thr_once.c
View File

@ -40,8 +40,8 @@ __weak_reference(_pthread_once, pthread_once);
#define ONCE_IN_PROGRESS 0x02
#define ONCE_MASK 0x03
static pthread_mutex_t once_lock = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t once_cv = PTHREAD_COND_INITIALIZER;
pthread_mutex_t _thr_once_lock = PTHREAD_MUTEX_INITIALIZER;
pthread_cond_t _thr_once_cv = PTHREAD_COND_INITIALIZER;
/*
* POSIX:
@ -55,10 +55,10 @@ once_cancel_handler(void *arg)
{
pthread_once_t *once_control = arg;
_pthread_mutex_lock(&once_lock);
_pthread_mutex_lock(&_thr_once_lock);
once_control->state = ONCE_NEVER_DONE;
_pthread_mutex_unlock(&once_lock);
_pthread_cond_broadcast(&once_cv);
_pthread_mutex_unlock(&_thr_once_lock);
_pthread_cond_broadcast(&_thr_once_cv);
}
int
@ -68,26 +68,26 @@ _pthread_once(pthread_once_t *once_control, void (*init_routine) (void))
if (once_control->state == ONCE_DONE)
return (0);
_pthread_mutex_lock(&once_lock);
_pthread_mutex_lock(&_thr_once_lock);
while (*(volatile int *)&(once_control->state) == ONCE_IN_PROGRESS)
_pthread_cond_wait(&once_cv, &once_lock);
_pthread_cond_wait(&_thr_once_cv, &_thr_once_lock);
/*
* If previous thread was canceled, then the state still
* could be ONCE_NEVER_DONE, we need to check it again.
*/
if (*(volatile int *)&(once_control->state) == ONCE_NEVER_DONE) {
once_control->state = ONCE_IN_PROGRESS;
_pthread_mutex_unlock(&once_lock);
_pthread_mutex_unlock(&_thr_once_lock);
_pthread_cleanup_push(once_cancel_handler, once_control);
init_routine();
_pthread_cleanup_pop(0);
_pthread_mutex_lock(&once_lock);
_pthread_mutex_lock(&_thr_once_lock);
once_control->state = ONCE_DONE;
wakeup = 1;
}
_pthread_mutex_unlock(&once_lock);
_pthread_mutex_unlock(&_thr_once_lock);
if (wakeup)
_pthread_cond_broadcast(&once_cv);
_pthread_cond_broadcast(&_thr_once_cv);
return (0);
}

2
lib/libthr/thread/thr_private.h
View File

@ -649,6 +649,8 @@ extern umtx_t _rwlock_static_lock __hidden;
extern umtx_t _keytable_lock __hidden;
extern umtx_t _thr_list_lock __hidden;
extern umtx_t _thr_event_lock __hidden;
extern pthread_mutex_t _thr_once_lock __hidden;
extern pthread_cond_t _thr_once_cv __hidden;
/*
* Function prototype definitions.