diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-03-31 17:24:39 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-06-09 15:16:45 -0300 |
| commit | 8c1c0aae2079039a629b15098d78f3d11aabefb4 (patch) | |
| tree | 72a4a714ee7310810a0d2a5778e6b5c40f18fa85 /nptl/pthread_cancel.c | |
| parent | 2b5174253155bdace1262ea2ab53d11347ecdefd (diff) | |
| download | glibc-8c1c0aae2079039a629b15098d78f3d11aabefb4.tar.gz glibc-8c1c0aae2079039a629b15098d78f3d11aabefb4.tar.xz glibc-8c1c0aae2079039a629b15098d78f3d11aabefb4.zip | |
nptl: Move cancel type out of cancelhandling
Now that the thread cancellation type is not accessed concurrently anymore, it is possible to move it out the cancelhandling. By removing the cancel state out of the internal thread cancel handling state there is no need to check if cancelled bit was set in CAS operation. It allows simplifing the cancellation wrappers and the CANCEL_CANCELED_AND_ASYNCHRONOUS is removed. Checked on x86_64-linux-gnu and aarch64-linux-gnu.
Diffstat (limited to 'nptl/pthread_cancel.c')
| -rw-r--r-- | nptl/pthread_cancel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nptl/pthread_cancel.c b/nptl/pthread_cancel.c index f4f08363cf..de4659a1f0 100644 --- a/nptl/pthread_cancel.c +++ b/nptl/pthread_cancel.c @@ -53,7 +53,7 @@ sigcancel_handler (int sig, siginfo_t *si, void *ctx) /* Set the return value. */ THREAD_SETMEM (self, result, PTHREAD_CANCELED); /* Make sure asynchronous cancellation is still enabled. */ - if ((ch & CANCELTYPE_BITMASK) != 0) + if (self->canceltype == PTHREAD_CANCEL_ASYNCHRONOUS) __do_cancel (); } @@ -104,8 +104,8 @@ __pthread_cancel (pthread_t th) #endif THREAD_SETMEM (pd, result, PTHREAD_CANCELED); - if ((oldch & CANCELSTATE_BITMASK) == 0 - && (oldch & CANCELTYPE_BITMASK) != 0) + if (pd->cancelstate == PTHREAD_CANCEL_ENABLE + && pd->canceltype == PTHREAD_CANCEL_ASYNCHRONOUS) __do_cancel (); return 0; } |