diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-28 22:41:18 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-28 22:46:21 +0000 |
| commit | f512321130d6c02332d441812ef4780908bb744d (patch) | |
| tree | db2c8cc8194b611a69ecc29c4146bfbb478b99c7 /sysdeps/mach/usleep.c | |
| parent | 1f3413338e31e65f2927aef02c151745d3b899d0 (diff) | |
| download | glibc-f512321130d6c02332d441812ef4780908bb744d.tar glibc-f512321130d6c02332d441812ef4780908bb744d.tar.gz glibc-f512321130d6c02332d441812ef4780908bb744d.tar.bz2 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/usleep.c')
| -rw-r--r-- | sysdeps/mach/usleep.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sysdeps/mach/usleep.c b/sysdeps/mach/usleep.c index d53eb04a51..75514b2e35 100644 --- a/sysdeps/mach/usleep.c +++ b/sysdeps/mach/usleep.c @@ -19,12 +19,14 @@ #include <mach.h> #include <sys/time.h> #include <unistd.h> +#include <sysdep-cancel.h> /* Sleep USECONDS microseconds, or until a previously set timer goes off. */ int usleep (useconds_t useconds) { mach_port_t recv; + int cancel_oldtype; useconds_t useconds_up = useconds + 999; if (useconds_up < useconds) @@ -32,8 +34,10 @@ usleep (useconds_t useconds) recv = __mach_reply_port (); + cancel_oldtype = LIBC_CANCEL_ASYNC(); (void) __mach_msg (NULL, MACH_RCV_MSG|MACH_RCV_TIMEOUT|MACH_RCV_INTERRUPT, 0, 0, recv, useconds_up / 1000, MACH_PORT_NULL); + LIBC_CANCEL_RESET (cancel_oldtype); __mach_port_destroy (mach_task_self (), recv); return 0; |