From 4ae5e811f8d291a0df1418e1aae583161c142952 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Fri, 1 Apr 2011 22:15:03 -0400 Subject: simplify setting result on thread cancellation --- src/thread/pthread_create.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c index 7cd57d8e..d2344f15 100644 --- a/src/thread/pthread_create.c +++ b/src/thread/pthread_create.c @@ -13,7 +13,6 @@ void __pthread_unwind_next(struct __ptcb *cb) if (cb->__next) longjmp((void *)cb->__next->__jb, 1); self = pthread_self(); - if (self->cancel) self->result = PTHREAD_CANCELED; LOCK(&self->exitlock); @@ -226,6 +225,7 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo new->detached = attr->_a_detach; new->attr = *attr; new->unblock_cancel = self->cancel; + new->result = PTHREAD_CANCELED; memcpy(new->tlsdesc, self->tlsdesc, sizeof new->tlsdesc); new->tlsdesc[1] = (uintptr_t)new; stack = (void *)((uintptr_t)new-1 & ~(uintptr_t)15); -- cgit v1.2.1