Gecko [ v99win.today ]

Name	Size	Permission
git-SEM_VALUE_MAX.diff	600 B	-rw-r--r--
git-WAIT.diff	1.44 KB	-rw-r--r--
git-barrier-1.diff	694 B	-rw-r--r--
git-bsd4.3-ioctls.diff	873 B	-rw-r--r--
git-clock-cputime.diff	2.86 KB	-rw-r--r--
git-cond_destroy.diff	6.02 KB	-rw-r--r--
git-cthreads-symbols.diff	1.03 KB	-rw-r--r--
git-cthreads.diff	21.02 KB	-rw-r--r--
git-fexecve.diff	1.2 KB	-rw-r--r--
git-fix-longjmp.diff	3.03 KB	-rw-r--r--
git-fork-pthread_exit.diff	1.23 KB	-rw-r--r--
git-futex-internal.diff	1.82 KB	-rw-r--r--
git-holes.diff	1.42 KB	-rw-r--r--
git-hurd-version.diff	1.02 KB	-rw-r--r--
git-hurdsig-SA_SIGINFO.diff	20.64 KB	-rw-r--r--
git-intr-msg-unwind.diff	1.23 KB	-rw-r--r--
git-ld-library-path-checks.dif...	3.57 KB	-rw-r--r--
git-libc-open.diff	970 B	-rw-r--r--
git-libpthread-nodelete.diff	771 B	-rw-r--r--
git-libpthread-testcancel.diff	1.21 KB	-rw-r--r--
git-libpthread_plt.diff	1.24 KB	-rw-r--r--
git-libpthread_syms.diff	4.68 KB	-rw-r--r--
git-lll-initializer.diff	3.15 KB	-rw-r--r--
git-lll-private.diff	611 B	-rw-r--r--
git-lll-ptr.diff	19.54 KB	-rw-r--r--
git-lll-wait-intr.diff	5.41 KB	-rw-r--r--
git-longjmp-onstack.diff	9.07 KB	-rw-r--r--
git-mmap-EINVAL.diff	668 B	-rw-r--r--
git-mmap_addr.diff	1.43 KB	-rw-r--r--
git-posix_openpt.diff	2.71 KB	-rw-r--r--
git-pselect.diff	5.72 KB	-rw-r--r--
git-pthread_atfork-hidden.diff	1.9 KB	-rw-r--r--
git-pthread_get_cleanup_stack....	2.43 KB	-rw-r--r--
git-pthread_link_tests.diff	1.86 KB	-rw-r--r--
git-pthread_self.diff	1.16 KB	-rw-r--r--
git-raise.diff	1.08 KB	-rw-r--r--
git-register-atfork.diff	7.98 KB	-rw-r--r--
git-register-atfork2.diff	1.1 KB	-rw-r--r--
git-sbrk-end.diff	5.13 KB	-rw-r--r--
git-sched_sets.diff	3.13 KB	-rw-r--r--
git-sem-intr.diff	4.85 KB	-rw-r--r--
git-sem-open-init.diff	2.51 KB	-rw-r--r--
git-sem-open.diff	31.92 KB	-rw-r--r--
git-sem-pshared.diff	15.5 KB	-rw-r--r--
git-siginfo_uesp.diff	811 B	-rw-r--r--
git-sigstate_thread_reference....	3.71 KB	-rw-r--r--
git-spin_lock.diff	829 B	-rw-r--r--
git-ss_init.diff	1.15 KB	-rw-r--r--
git-strtol-test.diff	1.47 KB	-rw-r--r--
git-tiocflush.diff	976 B	-rw-r--r--
git-trunc-times.diff	1.13 KB	-rw-r--r--
git-tst-udp.diff	3.43 KB	-rw-r--r--
git-waitid.diff	5.65 KB	-rw-r--r--
local-ED.diff	1.21 KB	-rw-r--r--
local-clock_gettime_MONOTONIC....	3.38 KB	-rw-r--r--
local-disable-ioctls.diff	1.53 KB	-rw-r--r--
local-enable-ldconfig.diff	1.15 KB	-rw-r--r--
local-exec_filename.diff	4.35 KB	-rw-r--r--
local-fix-nss.diff	1.37 KB	-rw-r--r--
local-mach_print.diff	658 B	-rw-r--r--
local-madvise_warn.diff	553 B	-rw-r--r--
local-no-bootstrap-fs-access.d...	786 B	-rw-r--r--
local-no_unsupported_ioctls.di...	2.14 KB	-rw-r--r--
local-tls-ie-align.diff	1.08 KB	-rw-r--r--
local-usr.diff	593 B	-rw-r--r--
submitted-AF_LINK.diff	1.08 KB	-rw-r--r--
submitted-bind_umask2.diff	1.65 KB	-rw-r--r--
submitted-net.diff	81.49 KB	-rw-r--r--
submitted-path_mounted.diff	1.41 KB	-rw-r--r--
sysvshm-lll.diff	532 B	-rw-r--r--
tg-EGREGIOUS-fr.diff	794 B	-rw-r--r--
tg-EIEIO-fr.diff	805 B	-rw-r--r--
tg-bigmem.diff	1.42 KB	-rw-r--r--
tg-bits_atomic.h_multiple_thre...	11.56 KB	-rw-r--r--
tg-bootstrap.diff	775 B	-rw-r--r--
tg-eintr.diff	786 B	-rw-r--r--
tg-glibc-2.24-restore-malloc-h...	548 B	-rw-r--r--
tg-hooks.diff	2.49 KB	-rw-r--r--
tg-ifaddrs_v6.diff	10.71 KB	-rw-r--r--
tg-libc_rwlock_recursive.diff	3.61 KB	-rw-r--r--
tg-mach-hurd-link.diff	987 B	-rw-r--r--
tg-sendmsg-SCM_CREDS.diff	8.03 KB	-rw-r--r--
tg-sysvshm.diff	21.62 KB	-rw-r--r--
tg-thread-cancel.diff	2.81 KB	-rw-r--r--
tg-unlockpt-chroot.diff	741 B	-rw-r--r--
unsubmitted-clock_t_centisecon...	1.79 KB	-rw-r--r--
unsubmitted-getaux_at_secure.d...	637 B	-rw-r--r--
unsubmitted-mremap.diff	838 B	-rw-r--r--
unsubmitted-prof-eintr.diff	668 B	-rw-r--r--

Code Editor : git-sem-intr.diff

Committed for glibc 2.32

commit b2cdf72e5c496153050551f0ce704e9ef08ffeac
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Mon Feb 10 00:52:50 2020 +0000

htl: Make sem_wait/sem_timedwait interruptible

diff --git a/htl/Makefile b/htl/Makefile
index 1b33748934..39294c64d1 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -108,6 +108,8 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate	    \
 									    \
 	pt-block							    \
 	pt-timedblock							    \
+	pt-block-intr							    \
+	pt-timedblock-intr						    \
 	pt-wakeup							    \
 	pt-docancel							    \
 	pt-sysdep							    \
diff --git a/htl/pt-internal.h b/htl/pt-internal.h
index 8ffe1bd970..918c207c3e 100644
--- a/htl/pt-internal.h
+++ b/htl/pt-internal.h
@@ -270,6 +270,14 @@ extern error_t __pthread_timedblock (struct __pthread *__restrict thread,
 				     const struct timespec *__restrict abstime,
 				     clockid_t clock_id);
 
+/* Block THREAD with interrupts.  */
+extern error_t __pthread_block_intr (struct __pthread *thread);
+
+/* Block THREAD until *ABSTIME is reached, with interrupts.  */
+extern error_t __pthread_timedblock_intr (struct __pthread *__restrict thread,
+					  const struct timespec *__restrict abstime,
+					  clockid_t clock_id);
+
 /* Wakeup THREAD.  */
 extern void __pthread_wakeup (struct __pthread *thread);
 
diff --git a/sysdeps/htl/sem-timedwait.c b/sysdeps/htl/sem-timedwait.c
index 656da41184..a61acfd43f 100644
--- a/sysdeps/htl/sem-timedwait.c
+++ b/sysdeps/htl/sem-timedwait.c
@@ -30,6 +30,7 @@ __sem_timedwait_internal (sem_t *restrict sem,
   error_t err;
   int drain;
   struct __pthread *self;
+  clockid_t clock_id = CLOCK_REALTIME;
 
   __pthread_spin_lock (&sem->__lock);
   if (sem->__value > 0)
@@ -54,12 +55,9 @@ __sem_timedwait_internal (sem_t *restrict sem,
 
   /* Block the thread.  */
   if (timeout != NULL)
-    err = __pthread_timedblock (self, timeout, CLOCK_REALTIME);
+    err = __pthread_timedblock_intr (self, timeout, clock_id);
   else
-    {
-      err = 0;
-      __pthread_block (self);
-    }
+    err = __pthread_block_intr (self);
 
   __pthread_spin_lock (&sem->__lock);
   if (self->prevp == NULL)
@@ -82,7 +80,7 @@ __sem_timedwait_internal (sem_t *restrict sem,
 
   if (err)
     {
-      assert (err == ETIMEDOUT);
+      assert (err == ETIMEDOUT || err == EINTR);
       errno = err;
       return -1;
     }
diff --git a/sysdeps/mach/htl/pt-block-intr.c b/sysdeps/mach/htl/pt-block-intr.c
new file mode 100644
index 0000000000..f15beb3a0f
--- /dev/null
+++ b/sysdeps/mach/htl/pt-block-intr.c
@@ -0,0 +1,6 @@
+#include <pt-internal.h>
+#define RETTYPE error_t
+#define RETURN(val) return val
+#define __pthread_block __pthread_block_intr
+#define MSG_OPTIONS MACH_RCV_INTERRUPT
+#include "pt-block.c"
diff --git a/sysdeps/mach/htl/pt-block.c b/sysdeps/mach/htl/pt-block.c
index e1500dce33..28bae157d1 100644
--- a/sysdeps/mach/htl/pt-block.c
+++ b/sysdeps/mach/htl/pt-block.c
@@ -24,15 +24,30 @@
 
 #include <pt-internal.h>
 
+#ifndef MSG_OPTIONS
+# define MSG_OPTIONS 0
+#endif
+
+#ifndef RETTYPE
+# define RETTYPE void
+#endif
+
+#ifndef RETURN
+# define RETURN(val)
+#endif
+
 /* Block THREAD.  */
-void
+RETTYPE
 __pthread_block (struct __pthread *thread)
 {
   mach_msg_header_t msg;
   error_t err;
 
-  err = __mach_msg (&msg, MACH_RCV_MSG, 0, sizeof msg,
+  err = __mach_msg (&msg, MACH_RCV_MSG | MSG_OPTIONS, 0, sizeof msg,
 		    thread->wakeupmsg.msgh_remote_port,
 		    MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
+  if ((MSG_OPTIONS & MACH_RCV_INTERRUPT) && err == MACH_RCV_INTERRUPTED)
+    RETURN(EINTR);
   assert_perror (err);
+  RETURN(0);
 }
diff --git a/sysdeps/mach/htl/pt-timedblock-intr.c b/sysdeps/mach/htl/pt-timedblock-intr.c
new file mode 100644
index 0000000000..70e132716b
--- /dev/null
+++ b/sysdeps/mach/htl/pt-timedblock-intr.c
@@ -0,0 +1,3 @@
+#define __pthread_timedblock __pthread_timedblock_intr
+#define MSG_OPTIONS MACH_RCV_INTERRUPT
+#include "pt-timedblock.c"
diff --git a/sysdeps/mach/htl/pt-timedblock.c b/sysdeps/mach/htl/pt-timedblock.c
index 63af869c90..ead070e397 100644
--- a/sysdeps/mach/htl/pt-timedblock.c
+++ b/sysdeps/mach/htl/pt-timedblock.c
@@ -26,6 +26,10 @@
 
 #include <pt-internal.h>
 
+#ifndef MSG_OPTIONS
+# define MSG_OPTIONS 0
+#endif
+
 /* Block THREAD.  */
 error_t
 __pthread_timedblock (struct __pthread *thread,
@@ -54,11 +58,13 @@ __pthread_timedblock (struct __pthread *thread,
     /* Need to do a carry.  */
     timeout -= (now.tv_nsec - abstime->tv_nsec + 999999) / 1000000;
 
-  err = __mach_msg (&msg, MACH_RCV_MSG | MACH_RCV_TIMEOUT, 0,
+  err = __mach_msg (&msg, MACH_RCV_MSG | MACH_RCV_TIMEOUT | MSG_OPTIONS, 0,
 		    sizeof msg, thread->wakeupmsg.msgh_remote_port,
 		    timeout, MACH_PORT_NULL);
   if (err == EMACH_RCV_TIMED_OUT)
     return ETIMEDOUT;
+  if ((MSG_OPTIONS & MACH_RCV_INTERRUPT) && err == MACH_RCV_INTERRUPTED)
+    return EINTR;
 
   assert_perror (err);
   return 0;

${this.title}

Code Editor : git-sem-intr.diff