diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-28 00:15:56 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-28 00:38:46 +0000 |
commit | 67a78072e2891b8b16a7bfb20675844a5854cff1 (patch) | |
tree | 9eba275153b88aaca083b65c6c2d746f37f0f2e1 /hurd/fd-read.c | |
parent | 6414eef6e013f46ee94d5f961af15659e1933182 (diff) | |
download | glibc-67a78072e2891b8b16a7bfb20675844a5854cff1.tar.gz glibc-67a78072e2891b8b16a7bfb20675844a5854cff1.tar.xz glibc-67a78072e2891b8b16a7bfb20675844a5854cff1.zip |
hurd: clean fd and port on thread cancel
HURD_*PORT_USE link fd and port with a stack-stored structure, so on thread cancel we need to cleanup this. * hurd/fd-cleanup.c: New file. * hurd/port-cleanup.c (_hurd_port_use_cleanup): New function. * hurd/Makefile (routines): Add fd-cleanup. * sysdeps/hurd/include/hurd.h (__USEPORT_CANCEL): New macro. * sysdeps/hurd/include/hurd/fd.h (_hurd_fd_port_use_data): New structure. (_hurd_fd_port_use_cleanup): New prototype. (HURD_DPORT_USE_CANCEL, HURD_FD_PORT_USE_CANCEL): New macros. * sysdeps/hurd/include/hurd/port.h (_hurd_port_use_data): New structure. (_hurd_port_use_cleanup): New prototype. (HURD_PORT_USE_CANCEL): New macro. * hurd/hurd/fd.h (HURD_FD_PORT_USE): Also refer to HURD_FD_PORT_USE_CANCEL. * hurd/hurd.h (__USEPORT): Also refer to __USEPORT_CANCEL. * hurd/hurd/port.h (HURD_PORT_USE): Also refer to HURD_PORT_USE_CANCEL. * hurd/fd-read.c (_hurd_fd_read): Call HURD_FD_PORT_USE_CANCEL instead of HURD_FD_PORT_USE. * hurd/fd-write.c (_hurd_fd_write): Likewise. * sysdeps/mach/hurd/send.c (__send): Call HURD_DPORT_USE_CANCEL instead of HURD_DPORT_USE. * sysdeps/mach/hurd/sendmsg.c (__libc_sendmsg): Likewise. * sysdeps/mach/hurd/sendto.c (__sendto): Likewise. * sysdeps/mach/hurd/recv.c (__recv): Likewise. * sysdeps/mach/hurd/recvfrom.c (__recvfrom): Likewise. * sysdeps/mach/hurd/recvmsg.c (__libc_recvmsg): Call __USEPORT_CANCEL instead of __USEPORT, and HURD_DPORT_USE_CANCEL instead of HURD_DPORT_USE.
Diffstat (limited to 'hurd/fd-read.c')
-rw-r--r-- | hurd/fd-read.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hurd/fd-read.c b/hurd/fd-read.c index 11c435f491..1a8f20301e 100644 --- a/hurd/fd-read.c +++ b/hurd/fd-read.c @@ -35,7 +35,7 @@ _hurd_fd_read (struct hurd_fd *fd, void *buf, size_t *nbytes, loff_t offset) data = buf; nread = *nbytes; - if (err = HURD_FD_PORT_USE (fd, _hurd_ctty_input (port, ctty, readfd))) + if (err = HURD_FD_PORT_USE_CANCEL (fd, _hurd_ctty_input (port, ctty, readfd))) return err; if (data != buf) |