diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-23 22:43:32 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-24 01:19:49 +0200 |
| commit | eca16db02d660242e709d4b8a11a2c5b94cca540 (patch) | |
| tree | fda5e40a34d5d16179bff5718f0e80a89825e639 /sysdeps/pthread/Makefile | |
| parent | 3513d5af3d111f322cf2b64f2c7d415ea923bf25 (diff) | |
| download | glibc-eca16db02d660242e709d4b8a11a2c5b94cca540.zip glibc-eca16db02d660242e709d4b8a11a2c5b94cca540.tar.gz glibc-eca16db02d660242e709d4b8a11a2c5b94cca540.tar.bz2 | |
htl: Make sem_*wait cancellations points
By aligning its implementation on pthread_cond_wait.
* sysdeps/htl/sem-timedwait.c (cancel_ctx): New structure.
(cancel_hook): New function.
(__sem_timedwait_internal): Check for cancellation and register
cancellation hook that wakes the thread up, and check again for
cancellation on exit.
* nptl/tst-cancel13.c, nptl/tst-cancelx13.c: Move to...
* sysdeps/pthread/: ... here.
* nptl/Makefile: Move corresponding references and rules to...
* sysdeps/pthread/Makefile: ... here.
Diffstat (limited to 'sysdeps/pthread/Makefile')
| -rw-r--r-- | sysdeps/pthread/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 01602e6..ed31ae8 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -55,8 +55,8 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ tst-cancel-self-canceltype tst-cancel-self-testcancel \ tst-cancel1 tst-cancel2 tst-cancel3 \ tst-cancel6 tst-cancel8 tst-cancel9 tst-cancel10 tst-cancel11 \ - tst-cancel12 tst-cancel14 tst-cancel15 tst-cancel18 tst-cancel19 \ - tst-cancel21 \ + tst-cancel12 tst-cancel13 tst-cancel14 tst-cancel15 tst-cancel18 \ + tst-cancel19 tst-cancel21 \ tst-cancel22 tst-cancel23 tst-cancel26 tst-cancel27 tst-cancel28 \ tst-cleanup0 tst-cleanup1 tst-cleanup2 tst-cleanup3 \ tst-clock1 \ @@ -117,8 +117,8 @@ CFLAGS-tst-cleanup2.c += -fno-builtin CFLAGS-tst-cleanupx2.c += -fno-builtin tests += tst-cancelx2 tst-cancelx3 tst-cancelx6 tst-cancelx8 tst-cancelx9 \ - tst-cancelx10 tst-cancelx11 tst-cancelx12 tst-cancelx14 tst-cancelx15 \ - tst-cancelx18 tst-cancelx21 \ + tst-cancelx10 tst-cancelx11 tst-cancelx12 tst-cancelx13 tst-cancelx14 \ + tst-cancelx15 tst-cancelx18 tst-cancelx21 \ tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3 ifeq ($(build-shared),yes) @@ -160,6 +160,7 @@ CFLAGS-tst-cancelx9.c += -fexceptions CFLAGS-tst-cancelx10.c += -fexceptions CFLAGS-tst-cancelx11.c += -fexceptions CFLAGS-tst-cancelx12.c += -fexceptions +CFLAGS-tst-cancelx13.c += -fexceptions CFLAGS-tst-cancelx14.c += -fexceptions CFLAGS-tst-cancelx15.c += -fexceptions CFLAGS-tst-cancelx18.c += -fexceptions |