about summary refs log tree commit diff
path: root/nptl/Makefile
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-06-23 22:43:32 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-06-24 01:19:49 +0200
commiteca16db02d660242e709d4b8a11a2c5b94cca540 (patch)
treefda5e40a34d5d16179bff5718f0e80a89825e639 /nptl/Makefile
parent3513d5af3d111f322cf2b64f2c7d415ea923bf25 (diff)
downloadglibc-eca16db02d660242e709d4b8a11a2c5b94cca540.tar.gz
glibc-eca16db02d660242e709d4b8a11a2c5b94cca540.tar.xz
glibc-eca16db02d660242e709d4b8a11a2c5b94cca540.zip
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 'nptl/Makefile')
-rw-r--r--nptl/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index 24ebd07a30..4602824bf1 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -278,7 +278,7 @@ tests = tst-attr2 tst-attr3 tst-default-attr \
 	tst-sem17 \
 	tst-tsd3 tst-tsd4 \
 	tst-cancel4 tst-cancel4_1 tst-cancel4_2 tst-cancel5 \
-	tst-cancel7 tst-cancel13 \
+	tst-cancel7 \
 	tst-cancel16 tst-cancel17 tst-cancel20 tst-cancel24 \
 	tst-cleanup4 \
 	tst-signal3 \
@@ -358,7 +358,6 @@ endif
 LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst
 
 tests += tst-cancelx4 tst-cancelx5 tst-cancelx7 \
-	 tst-cancelx13 \
 	 tst-cancelx16 tst-cancelx17 tst-cancelx20 \
 	 tst-cleanupx4
 
@@ -477,7 +476,6 @@ CFLAGS-tst-cancelx5.c += -Wno-error
 CFLAGS-tst-cancelx4.c += -fexceptions
 CFLAGS-tst-cancelx5.c += -fexceptions
 CFLAGS-tst-cancelx7.c += -fexceptions
-CFLAGS-tst-cancelx13.c += -fexceptions
 CFLAGS-tst-cancelx16.c += -fexceptions
 CFLAGS-tst-cancelx17.c += -fexceptions
 CFLAGS-tst-cancelx20.c += -fexceptions -fasynchronous-unwind-tables