From 7e6be42a77989c01155bdc7333ea58206e1563d4 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 8 Mar 2011 12:08:40 -0500 Subject: fix major breakage in pthread_once (it was always deadlocking) the issue was a break statement that was breaking only from the switch, not the enclosing for loop, and a failure to set the final success state. --- src/thread/pthread_once.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/thread') diff --git a/src/thread/pthread_once.c b/src/thread/pthread_once.c index 72230054..41872f16 100644 --- a/src/thread/pthread_once.c +++ b/src/thread/pthread_once.c @@ -20,7 +20,13 @@ int pthread_once(pthread_once_t *control, void (*init)(void)) for (;;) switch (a_swap(control, 1)) { case 0: - break; + pthread_cleanup_push(undo, control); + init(); + pthread_cleanup_pop(0); + + a_store(control, 2); + if (waiters) __wake(control, -1, 0); + return 0; case 1: __wait(control, &waiters, 1, 0); continue; @@ -28,11 +34,4 @@ int pthread_once(pthread_once_t *control, void (*init)(void)) a_store(control, 2); return 0; } - - pthread_cleanup_push(undo, control); - init(); - pthread_cleanup_pop(0); - - if (waiters) __wake(control, -1, 0); - return 0; } -- cgit v1.2.1