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/descr.h | |
| 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/descr.h')
| -rw-r--r-- | nptl/descr.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/nptl/descr.h b/nptl/descr.h index 35f5330e7f..c85778d449 100644 --- a/nptl/descr.h +++ b/nptl/descr.h @@ -277,9 +277,6 @@ struct pthread /* Flags determining processing of cancellation. */ int cancelhandling; - /* Bit set if asynchronous cancellation mode is selected. */ -#define CANCELTYPE_BIT 1 -#define CANCELTYPE_BITMASK (0x01 << CANCELTYPE_BIT) /* Bit set if canceled. */ #define CANCELED_BIT 3 #define CANCELED_BITMASK (0x01 << CANCELED_BIT) @@ -292,13 +289,6 @@ struct pthread /* Bit set if thread is supposed to change XID. */ #define SETXID_BIT 6 #define SETXID_BITMASK (0x01 << SETXID_BIT) - /* Mask for the rest. Helps the compiler to optimize. */ -#define CANCEL_RESTMASK 0xffffff80 - -#define CANCEL_CANCELED_AND_ASYNCHRONOUS(value) \ - (((value) & (CANCELTYPE_BITMASK | CANCELED_BITMASK \ - | EXITING_BITMASK | CANCEL_RESTMASK | TERMINATED_BITMASK)) \ - == (CANCELTYPE_BITMASK | CANCELED_BITMASK)) /* Flags. Including those copied from the thread attribute. */ int flags; @@ -402,6 +392,10 @@ struct pthread PTHREAD_CANCEL_DISABLE). */ unsigned char cancelstate; + /* Thread cancel type (PTHREAD_CANCEL_DEFERRED or + PTHREAD_CANCEL_ASYNCHRONOUS). */ + unsigned char canceltype; + /* Used on strsignal. */ struct tls_internal_t tls_state; |