diff options
Diffstat (limited to 'nptl/pthread_setcanceltype.c')
| -rw-r--r-- | nptl/pthread_setcanceltype.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/nptl/pthread_setcanceltype.c b/nptl/pthread_setcanceltype.c index 5a046351b9..bbe87ba64b 100644 --- a/nptl/pthread_setcanceltype.c +++ b/nptl/pthread_setcanceltype.c @@ -34,9 +34,9 @@ __pthread_setcanceltype (type, oldtype) self = THREAD_SELF; + int oldval = THREAD_GETMEM (self, cancelhandling); while (1) { - int oldval = THREAD_GETMEM (self, cancelhandling); int newval = (type == PTHREAD_CANCEL_ASYNCHRONOUS ? oldval | CANCELTYPE_BITMASK : oldval & ~CANCELTYPE_BITMASK); @@ -54,8 +54,9 @@ __pthread_setcanceltype (type, oldtype) /* Update the cancel handling word. This has to be done atomically since other bits could be modified as well. */ - if (! atomic_compare_and_exchange_bool_acq (&self->cancelhandling, - newval, oldval)) + int curval = THREAD_ATOMIC_CMPXCHG_VAL (self, cancelhandling, newval, + oldval); + if (__builtin_expect (curval == oldval, 1)) { if (CANCEL_ENABLED_AND_CANCELED_AND_ASYNCHRONOUS (newval)) { @@ -65,6 +66,9 @@ __pthread_setcanceltype (type, oldtype) break; } + + /* Prepare for the next round. */ + oldval = curval; } return 0; |