diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-14 15:50:44 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-14 15:53:21 +0000 |
| commit | 662de0889a040e3ebeefcfdde547edc8a11f87d7 (patch) | |
| tree | 6fe6a2490e6a9b9e08b01b2a62fafcf67a220cc6 /sysdeps/mach/hurd/write.c | |
| parent | 76fe4ef4be842e78e175a200f7afa4a567b57db2 (diff) | |
| download | glibc-662de0889a040e3ebeefcfdde547edc8a11f87d7.tar.gz glibc-662de0889a040e3ebeefcfdde547edc8a11f87d7.tar.xz glibc-662de0889a040e3ebeefcfdde547edc8a11f87d7.zip | |
hurd: Make write and pwrite64 cancellation points
and add _nocancel variants. * sysdeps/mach/hurd/write.c (__libc_write): Call __write_nocancel surrounded by enabling async cancel, to replace implementation moved to... * sysdeps/mach/hurd/write_nocancel.c (__write_nocancel): ... here. * sysdeps/mach/hurd/pwrite64.c (__libc_pwrite64): Call __pwrite64_nocancel surrounded by enabling async cancel, to replace implementation moved to... * sysdeps/mach/hurd/pwrite64_nocancel.c (__pwrite64_nocancel): ... here. * sysdeps/mach/hurd/Makefile (sysdep_routines): Add write_nocancel and pwrite64_nocancel. * sysdeps/mach/hurd/not-cancel.h (__write_nocancel, __pwrite64_nocancel): Replace macros with prototypes with a hidden proto on libc. * sysdeps/mach/hurd/dl-sysdep.c (__write_nocancel): New alias, check that it is not hidden. * sysdeps/mach/hurd/Versions (libc.GLIBC_PRIVATE): Add __write_nocancel. (ld.GLIBC_PRIVATE): Add __write_nocancel. * sysdeps/mach/hurd/i386/localplt.data (__write_nocancel): Add reference.
Diffstat (limited to 'sysdeps/mach/hurd/write.c')
| -rw-r--r-- | sysdeps/mach/hurd/write.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sysdeps/mach/hurd/write.c b/sysdeps/mach/hurd/write.c index 9e1ade8801..0eea22be4b 100644 --- a/sysdeps/mach/hurd/write.c +++ b/sysdeps/mach/hurd/write.c @@ -15,16 +15,17 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ -#include <errno.h> -#include <unistd.h> -#include <hurd/fd.h> +#include <sysdep-cancel.h> +#include <not-cancel.h> ssize_t __libc_write (int fd, const void *buf, size_t nbytes) { - error_t err = HURD_FD_USE (fd, _hurd_fd_write (descriptor, - buf, &nbytes, -1)); - return err ? __hurd_dfail (fd, err) : nbytes; + ssize_t ret; + int cancel_oldtype = LIBC_CANCEL_ASYNC(); + ret = __write_nocancel (fd, buf, nbytes); + LIBC_CANCEL_RESET (cancel_oldtype); + return ret; } libc_hidden_def (__libc_write) weak_alias (__libc_write, __write) |