diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-07 23:16:46 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-07 23:36:10 +0000 |
| commit | 3944c61bdf5d1530d0576a396eb3e2f9a4d6caff (patch) | |
| tree | 92c54c6245f82a7053049eb3f030e076ba7d2178 /sysdeps/mach/hurd/dl-sysdep.c | |
| parent | 337a7b74faed2c8daf8c91cbb3038dc4984f3207 (diff) | |
| download | glibc-3944c61bdf5d1530d0576a396eb3e2f9a4d6caff.zip glibc-3944c61bdf5d1530d0576a396eb3e2f9a4d6caff.tar.gz glibc-3944c61bdf5d1530d0576a396eb3e2f9a4d6caff.tar.bz2 | |
hurd: Make read and pread64 cancellable
and add _nocancel variants.
* sysdeps/mach/hurd/pread64.c (__libc_pread64): Call __pread64_nocancel
surrounded by enabling async cancel, to replace implementation moved to...
* sysdeps/mach/hurd/pread64_nocancel.c (__pread64_nocancel): ... here.
* sysdeps/mach/hurd/read.c (__libc_read): Call __read_nocancel surrounded by
enabling async cancel, to replace implementation moved to...
* sysdeps/mach/hurd/read_nocancel.c (__read_nocancel): ... here.
* sysdeps/mach/hurd/Makefile (sysdep_routines): Add read_nocancel and
pread64_nocancel.
* sysdeps/mach/hurd/not-cancel.h (__read_nocancel, __pread64_nocancel):
Replace macros with prototypes with a hidden proto on libc.
* sysdeps/mach/hurd/dl-sysdep.c: Include <not-cancel.h>.
(__pread64_nocancel): New alias, check that it is not hidden.
(__read_nocancel): New alias, check that it is not hidden.
* sysdeps/mach/hurd/Versions (libc.GLIBC_PRIVATE): Add __read_nocancel and
__pread64_nocancel.
(ld.GLIBC_2.1): Add __pread64.
(ld.GLIBC_PRIVATE): Add __read_nocancel and __pread64_nocancel.
* sysdeps/mach/hurd/i386/ld.abilist (__pread64): Add symbol.
* sysdeps/mach/hurd/i386/localplt.data (__read_nocancel, __pread64,
__pread64_nocancel): Add references.
Diffstat (limited to 'sysdeps/mach/hurd/dl-sysdep.c')
| -rw-r--r-- | sysdeps/mach/hurd/dl-sysdep.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index 574e252..1626cd5 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -47,6 +47,7 @@ #include <dl-tunables.h> #include <not-errno.h> +#include <not-cancel.h> extern void __mach_init (void); @@ -359,6 +360,7 @@ __close (int fd) } check_no_hidden(__pread64); +check_no_hidden(__pread64_nocancel); __ssize_t weak_function __pread64 (int fd, void *buf, size_t nbytes, off64_t offset) { @@ -381,14 +383,17 @@ __pread64 (int fd, void *buf, size_t nbytes, off64_t offset) return nread; } libc_hidden_weak (__pread64) +weak_alias (__pread64, __pread64_nocancel) check_no_hidden(__read); +check_no_hidden(__read_nocancel); __ssize_t weak_function __read (int fd, void *buf, size_t nbytes) { return __pread64 (fd, buf, nbytes, -1); } libc_hidden_weak (__read) +weak_alias (__read, __read_nocancel) check_no_hidden(__write); __ssize_t weak_function |