From 2230218c283af7fbff08167685f17dad8d748f14 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 9 Feb 2012 21:24:56 -0500 Subject: small fix for new pthread cleanup stuff 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. --- src/thread/cancellation.c | 1 + src/thread/pthread_create.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'src/thread') diff --git a/src/thread/cancellation.c b/src/thread/cancellation.c index 967705a9..23d23d14 100644 --- a/src/thread/cancellation.c +++ b/src/thread/cancellation.c @@ -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) { __do_cleanup_pop(cb, run); + if (run) cb->__f(cb->__x); } static void dummy() diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c index 87bf8166..d84e50a9 100644 --- a/src/thread/pthread_create.c +++ b/src/thread/pthread_create.c @@ -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) { __pthread_self()->cancelbuf = cb->__next; - if (run) cb->__f(cb->__x); } static int start(void *p) -- cgit v1.2.1