diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-03-31 15:43:25 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-06-09 15:16:45 -0300 |
| commit | 2b5174253155bdace1262ea2ab53d11347ecdefd (patch) | |
| tree | 9992336533dec0f8cd9579e217b7bc7a18d0733e /nptl/cleanup_defer.c | |
| parent | 26cfbb7162ad364d53d69f6d482f2d87b5950524 (diff) | |
| download | glibc-2b5174253155bdace1262ea2ab53d11347ecdefd.tar.gz glibc-2b5174253155bdace1262ea2ab53d11347ecdefd.tar.xz glibc-2b5174253155bdace1262ea2ab53d11347ecdefd.zip | |
nptl: Move cancel state out of cancelhandling
Now that thread cancellation state is not accessed concurrently anymore,
it is possible to move it out the 'cancelhandling'.
The code is also simplified: CANCELLATION_P is replaced with a
internal pthread_testcancel call and the CANCELSTATE_BIT{MASK} is
removed.
With this behavior pthread_setcancelstate does not require to act on
cancellation if cancel type is asynchronous (is already handled either
by pthread_setcanceltype or by the signal handler).
Checked on x86_64-linux-gnu and aarch64-linux-gnu.
Diffstat (limited to 'nptl/cleanup_defer.c')
| -rw-r--r-- | nptl/cleanup_defer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nptl/cleanup_defer.c b/nptl/cleanup_defer.c index 6d85359118..873ab007fd 100644 --- a/nptl/cleanup_defer.c +++ b/nptl/cleanup_defer.c @@ -92,7 +92,7 @@ ___pthread_unregister_cancel_restore (__pthread_unwind_buf_t *buf) cancelhandling = curval; } - CANCELLATION_P (self); + __pthread_testcancel (); } } versioned_symbol (libc, ___pthread_unregister_cancel_restore, |