fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-06-29 22:51:55 +00:00
Code Issues Projects Releases Wiki Activity

fix major breakage in pthread_once (it was always deadlocking)

Browse Source 
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.
This commit is contained in:
Rich Felker
2011-03-08 12:08:40 -05:00
parent 4820f9268d
commit 7e6be42a77
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/thread/pthread_once.c
View File

@ -20,7 +20,13 @@ int pthread_once(pthread_once_t *control, void (*init)(void))
for (;;) switch (a_swap(control, 1)) { for (;;) switch (a_swap(control, 1)) {
case 0: 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: case 1:
__wait(control, &waiters, 1, 0); __wait(control, &waiters, 1, 0);
continue; continue;
@ -28,11 +34,4 @@ int pthread_once(pthread_once_t *control, void (*init)(void))
a_store(control, 2); a_store(control, 2);
return 0; return 0;
} }
pthread_cleanup_push(undo, control);
init();
pthread_cleanup_pop(0);
if (waiters) __wake(control, -1, 0);
return 0;
} }