mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Update.
2003-04-04 Ulrich Drepper <drepper@redhat.com> * sysdeps/pthread/createthread.c (create_thread): Add some more comments explaining when to set multiple_threads and when not. * pthreadP.h: Define THREAD_ATOMIC_CMPXCHG_VAL and THREAD_ATOMIC_BIT_SET if not already defined. * sysdeps/i386/tls.h: Define THREAD_ATOMIC_CMPXCHG_VAL and THREAD_ATOMIC_BIT_SET: * sysdeps/x86_64/tls.h: Likewise. * cleanup_defer.c (_pthread_cleanup_push_defer): Rewrite to use THREAD_ATOMIC_CMPXCHG_VAL. (_pthread_cleanup_pop_restore): Likewise. * cancellation.c (__pthread_enable_asynccancel): Likewise. (__pthread_enable_asynccancel_2): Likewise. (__pthread_disable_asynccancel): Likewise. * libc-cancellation.c (__libc_enable_asynccancel): Likewise. (__libc_disable_asynccancel): Likewise. * init.c (sigcancel_handler): Likewise. * pthread_setcancelstate.c (__pthread_setcancelstate): Likewise. * pthread_setcanceltype.c (__pthread_setcanceltype): Likewise.
This commit is contained in:
@ -135,20 +135,21 @@ sigcancel_handler (int sig __attribute ((unused)))
|
||||
{
|
||||
struct pthread *self = THREAD_SELF;
|
||||
|
||||
int oldval = THREAD_GETMEM (self, cancelhandling);
|
||||
while (1)
|
||||
{
|
||||
/* We are canceled now. When canceled by another thread this flag
|
||||
is already set but if the signal is directly send (internally or
|
||||
from another process) is has to be done here. */
|
||||
int oldval = THREAD_GETMEM (self, cancelhandling);
|
||||
int newval = oldval | CANCELING_BITMASK | CANCELED_BITMASK;
|
||||
|
||||
if (oldval == newval || (oldval & EXITING_BITMASK) != 0)
|
||||
/* Already canceled or exiting. */
|
||||
break;
|
||||
|
||||
if (! atomic_compare_and_exchange_bool_acq (&self->cancelhandling,
|
||||
newval, oldval))
|
||||
int curval = THREAD_ATOMIC_CMPXCHG_VAL (self, cancelhandling, newval,
|
||||
oldval);
|
||||
if (curval == oldval)
|
||||
{
|
||||
/* Set the return value. */
|
||||
THREAD_SETMEM (self, result, PTHREAD_CANCELED);
|
||||
@ -160,6 +161,8 @@ sigcancel_handler (int sig __attribute ((unused)))
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
oldval = curval;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user