diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-05 17:15:57 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-05 17:19:32 +0200 |
| commit | ce0b7961ae400e5aeff28d54dc14955199947b74 (patch) | |
| tree | 3e7acb0eb6915c2c3af747dd9d982d4dc3418b78 /nptl/pthreadP.h | |
| parent | 0197c1bc604e1d6357cfa07a75ab73bababa7f0f (diff) | |
| download | glibc-ce0b7961ae400e5aeff28d54dc14955199947b74.tar.gz glibc-ce0b7961ae400e5aeff28d54dc14955199947b74.tar.xz glibc-ce0b7961ae400e5aeff28d54dc14955199947b74.zip | |
nptl: Consolidate async cancel enable/disable implementation in libc
Previously, the source file nptl/cancellation.c was compiled multiple times, for libc, libpthread, librt. This commit switches to a single implementation, with new __pthread_enable_asynccancel@@GLIBC_PRIVATE, __pthread_disable_asynccancel@@GLIBC_PRIVATE exports. The almost-unused CANCEL_ASYNC and CANCEL_RESET macros are replaced by LIBC_CANCEL_ASYNC and LIBC_CANCEL_ASYNC macros. They call the __pthread_* functions unconditionally now. The macros are still needed because shared code uses them; Hurd has different definitions. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl/pthreadP.h')
| -rw-r--r-- | nptl/pthreadP.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index d480639740..6b52ca158e 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -567,8 +567,6 @@ libc_hidden_proto (__pthread_exit) extern int __pthread_join (pthread_t threadid, void **thread_return); extern int __pthread_setcanceltype (int type, int *oldtype); libc_hidden_proto (__pthread_setcanceltype) -extern int __pthread_enable_asynccancel (void) attribute_hidden; -extern void __pthread_disable_asynccancel (int oldtype) attribute_hidden; extern void __pthread_testcancel (void); libc_hidden_proto (__pthread_testcancel) extern int __pthread_clockjoin_ex (pthread_t, void **, clockid_t, |