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/msync.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 'sysdeps/mach/msync.c')
| -rw-r--r-- | sysdeps/mach/msync.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sysdeps/mach/msync.c b/sysdeps/mach/msync.c index e36a564ef4..f72222b57b 100644 --- a/sysdeps/mach/msync.c +++ b/sysdeps/mach/msync.c @@ -20,6 +20,7 @@ #include <sys/mman.h> #include <errno.h> #include <mach.h> +#include <sysdep-cancel.h> /* Some Mach variants have vm_msync and some don't. Those that have it define the VM_SYNC_* bits when we include <mach/mach_types.h>. */ @@ -37,6 +38,7 @@ msync (void *addr, size_t len, int flags) { vm_sync_t sync_flags = 0; kern_return_t err; + int cancel_oldtype; if (flags & MS_SYNC) sync_flags |= VM_SYNC_SYNCHRONOUS; @@ -45,8 +47,11 @@ msync (void *addr, size_t len, int flags) if (flags & MS_INVALIDATE) sync_flags |= VM_SYNC_INVALIDATE; - if (err = __vm_msync (__mach_task_self (), - (vm_address_t) addr, (vm_size_t) len, sync_flags)) + cancel_oldtype = LIBC_CANCEL_ASYNC(); + err = __vm_msync (__mach_task_self (), + (vm_address_t) addr, (vm_size_t) len, sync_flags); + LIBC_CANCEL_RESET (cancel_oldtype); + if (err) { errno = err; return -1; |