diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-03-21 08:03:25 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-03-21 08:03:25 +0000 |
| commit | 5a3ab2fc180056cb14eaeae0f571421be81e371b (patch) | |
| tree | af48122e19c238a39db145412a11b1b551d472e6 /nptl/pthread_cancel.c | |
| parent | 18627f615b80b51778a65cf588f2741ad5f9b0a7 (diff) | |
| download | glibc-5a3ab2fc180056cb14eaeae0f571421be81e371b.zip glibc-5a3ab2fc180056cb14eaeae0f571421be81e371b.tar.gz glibc-5a3ab2fc180056cb14eaeae0f571421be81e371b.tar.bz2 | |
Update.
2003-03-21 Ulrich Drepper <drepper@redhat.com>
* cancellation.c: Adjust for new form of compare&exchange macros.
* cleanup_defer.c: Likewise.
* init.c: Likewise.
* libc-cancellation.c: Likewise.
* old_pthread_cond_broadcast.c: Likewise.
* old_pthread_cond_signal.c: Likewise.
* old_pthread_cond_timedwait.c: Likewise.
* old_pthread_cond_wait.c: Likewise.
* pthread_cancel.c: Likewise.
* pthread_create.c: Likewise.
* pthread_detach.c: Likewise.
* pthread_join.c: Likewise.
* pthread_key_delete.c: Likewise.
* pthread_setcancelstate.c: Likewise.
* pthread_setcanceltype.c: Likewise.
* pthread_timedjoin.c: Likewise.
* pthread_tryjoin.c: Likewise.
* sysdeps/pthread/createthread.c: Likewise.
Diffstat (limited to 'nptl/pthread_cancel.c')
| -rw-r--r-- | nptl/pthread_cancel.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nptl/pthread_cancel.c b/nptl/pthread_cancel.c index f11a924..43b65b6 100644 --- a/nptl/pthread_cancel.c +++ b/nptl/pthread_cancel.c @@ -36,10 +36,12 @@ pthread_cancel (th) return ESRCH; int result = 0; - while (1) + int oldval; + int newval; + do { - int oldval = pd->cancelhandling; - int newval = oldval | CANCELING_BITMASK | CANCELED_BITMASK; + oldval = pd->cancelhandling; + newval = oldval | CANCELING_BITMASK | CANCELED_BITMASK; /* Avoid doing unnecessary work. The atomic operation can potentially be expensive if the bug has to be locked and @@ -66,13 +68,11 @@ pthread_cancel (th) break; } - - /* Mark the thread as canceled. This has to be done - atomically since other bits could be modified as well. */ - if (atomic_compare_and_exchange_acq (&pd->cancelhandling, newval, - oldval) == 0) - break; } + /* Mark the thread as canceled. This has to be done + atomically since other bits could be modified as well. */ + while (atomic_compare_and_exchange_bool_acq (&pd->cancelhandling, newval, + oldval)); return result; } |