about summary refs log tree commit diff
path: root/sysdeps/mach/sleep.c
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-06-28 22:41:18 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-06-28 22:46:21 +0000
commitf512321130d6c02332d441812ef4780908bb744d (patch)
treedb2c8cc8194b611a69ecc29c4146bfbb478b99c7 /sysdeps/mach/sleep.c
parent1f3413338e31e65f2927aef02c151745d3b899d0 (diff)
downloadglibc-f512321130d6c02332d441812ef4780908bb744d.tar.gz
glibc-f512321130d6c02332d441812ef4780908bb744d.tar.xz
glibc-f512321130d6c02332d441812ef4780908bb744d.zip
hurd: Add remaining cancelation points
* hurd/hurdselect.c: Include <sysdep-cancel.h>.
(_hurd_select): Surround call to __mach_msg with enabling async cancel.
* sysdeps/mach/hurd/accept4.c: Include <sysdep-cancel.h>.
(__libc_accept4): Surround call to __socket_accept with enabling async cancel,
and use HURD_DPORT_USE_CANCEL instead of HURD_DPORT_USE.
* sysdeps/mach/hurd/connect.c: Include <sysdep-cancel.h>.
(__connect): Surround call to __file_name_lookup and __socket_connect
with enabling async cancel, and use HURD_DPORT_USE_CANCEL instead of
HURD_DPORT_USE.
* sysdeps/mach/hurd/fdatasync.c: Include <sysdep-cancel.h>.
(fdatasync): Surround call to __file_sync with enabling async cancel, and use
HURD_DPORT_USE_CANCEL instead of HURD_DPORT_USE.
* sysdeps/mach/hurd/fsync.c: Include <sysdep-cancel.h>.
(fsync): Surround call to __file_sync with enabling async cancel, and use
HURD_DPORT_USE_CANCEL instead of HURD_DPORT_USE.
* sysdeps/mach/hurd/ioctl.c: Include <sysdep-cancel.h>.
(__ioctl): When request is TIOCDRAIN, surround call to send_rpc with enabling
async cancel, and use HURD_DPORT_USE_CANCEL instead of HURD_DPORT_USE.
* sysdeps/mach/hurd/msync.c: Include <sysdep-cancel.h>.
(msync): Surround call to __vm_object_sync with enabling async cancel.
* sysdeps/mach/hurd/sigsuspend.c: Include <sysdep-cancel.h>.
(__sigsuspend): Surround call to __mach_msg with enabling async cancel.
* sysdeps/mach/hurd/sigwait.c: Include <sysdep-cancel.h>.
(__sigwait): Surround wait code with enabling async cancel.
* sysdeps/mach/msync.c: Include <sysdep-cancel.h>.
(msync): Surround call to __vm_msync with enabling async cancel.
* sysdeps/mach/sleep.c: Include <sysdep-cancel.h>.
(__sleep): Surround call to __mach_msg with enabling async cancel.
* sysdeps/mach/usleep.c: Include <sysdep-cancel.h>.
(usleep): Surround call to __vm_msync with enabling async cancel.
Diffstat (limited to 'sysdeps/mach/sleep.c')
-rw-r--r--sysdeps/mach/sleep.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sysdeps/mach/sleep.c b/sysdeps/mach/sleep.c
index de58bd18c4..9de9de1ae9 100644
--- a/sysdeps/mach/sleep.c
+++ b/sysdeps/mach/sleep.c
@@ -19,6 +19,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <mach.h>
+#include <sysdep-cancel.h>
 
 /* Make the process sleep for SECONDS seconds, or until a signal arrives
    and is not ignored.  The function returns the number of seconds less
@@ -30,12 +31,15 @@ __sleep (unsigned int seconds)
 {
   time_t before, after;
   mach_port_t recv;
+  int cancel_oldtype;
 
   recv = __mach_reply_port ();
 
   before = time_now ();
+  cancel_oldtype = LIBC_CANCEL_ASYNC();
   (void) __mach_msg (NULL, MACH_RCV_MSG|MACH_RCV_TIMEOUT|MACH_RCV_INTERRUPT,
 		     0, 0, recv, seconds * 1000, MACH_PORT_NULL);
+  LIBC_CANCEL_RESET (cancel_oldtype);
   after = time_now ();
   __mach_port_destroy (__mach_task_self (), recv);