jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small fix for new pthread cleanup stuff

Browse source 
even if pthread_create/exit code is not linked, run flag needs to be
checked and cleanup function potentially run on pop. thus, move the
code to the module that's always linked when pthread_cleanup_push/pop
is used.
This commit is contained in:
Rich Felker 2012-02-09 21:24:56 -05:00
commit 2230218c28
2 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/thread/cancellation.c
View file

@ -11,6 +11,7 @@ void _pthread_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
void _pthread_cleanup_pop(struct __ptcb *cb, int run) void _pthread_cleanup_pop(struct __ptcb *cb, int run)
{ {
__do_cleanup_pop(cb, run); __do_cleanup_pop(cb, run);
if (run) cb->__f(cb->__x);
} }
static void dummy() static void dummy()

1
src/thread/pthread_create.c
View file

@ -55,7 +55,6 @@ void __do_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
void __do_cleanup_pop(struct __ptcb *cb, int run) void __do_cleanup_pop(struct __ptcb *cb, int run)
{ {
__pthread_self()->cancelbuf = cb->__next; __pthread_self()->cancelbuf = cb->__next;
if (run) cb->__f(cb->__x);
} }
static int start(void *p) static int start(void *p)