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 /hurd/hurdselect.c | |
| parent | 1f3413338e31e65f2927aef02c151745d3b899d0 (diff) | |
| download | glibc-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 'hurd/hurdselect.c')
| -rw-r--r-- | hurd/hurdselect.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hurd/hurdselect.c b/hurd/hurdselect.c index 69a415c02c..8da0ccf282 100644 --- a/hurd/hurdselect.c +++ b/hurd/hurdselect.c @@ -28,6 +28,7 @@ #include <stdint.h> #include <limits.h> #include <time.h> +#include <sysdep-cancel.h> /* All user select types. */ #define SELECT_ALL (SELECT_READ | SELECT_WRITE | SELECT_URG) @@ -432,11 +433,14 @@ _hurd_select (int nfds, to = MACH_MSG_TIMEOUT_NONE; } + int cancel_oldtype = LIBC_CANCEL_ASYNC(); while ((msgerr = __mach_msg (&msg.head, MACH_RCV_MSG | MACH_RCV_INTERRUPT | options, 0, sizeof msg, portset, to, MACH_PORT_NULL)) == MACH_MSG_SUCCESS) { + LIBC_CANCEL_RESET (cancel_oldtype); + /* We got a message. Decode it. */ #ifdef MACH_MSG_TYPE_BIT const union typeword inttype = @@ -527,6 +531,7 @@ _hurd_select (int nfds, options |= MACH_RCV_TIMEOUT; } } + LIBC_CANCEL_RESET (cancel_oldtype); if (msgerr == MACH_RCV_INTERRUPTED) /* Interruption on our side (e.g. signal reception). */ |