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/hurd | |
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/hurd')
-rw-r--r-- | hurd/hurd/fd.h | 1 | ||||
-rw-r--r-- | hurd/hurd/port.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/hurd/hurd/fd.h b/hurd/hurd/fd.h index e18c3cef42..d27be21cfd 100644 --- a/hurd/hurd/fd.h +++ b/hurd/hurd/fd.h @@ -115,6 +115,7 @@ _hurd_fd_get (int fd) HURD_FD_USE ((fd), HURD_FD_PORT_USE (descriptor, (expr))) /* Likewise, but FD is a pointer to the file descriptor structure. */ +/* Also see HURD_FD_PORT_USE_CANCEL. */ #define HURD_FD_PORT_USE(fd, expr) \ ({ error_t __result; \ diff --git a/hurd/hurd/port.h b/hurd/hurd/port.h index 33e696a4b2..f91b1d5e26 100644 --- a/hurd/hurd/port.h +++ b/hurd/hurd/port.h @@ -42,6 +42,7 @@ struct hurd_port /* Evaluate EXPR with the variable `port' bound to the port in PORTCELL. */ +/* Also see HURD_PORT_USE_CANCEL. */ #define HURD_PORT_USE(portcell, expr) \ ({ struct hurd_port *const __p = (portcell); \ |