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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | hurd/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hurd/Makefile b/hurd/Makefile index 1ace90d10b..861bbf7842 100644 --- a/hurd/Makefile +++ b/hurd/Makefile @@ -56,7 +56,8 @@ routines = hurdstartup hurdinit \ ports-get ports-set hurdports hurdmsg \ errno-loc \ hurdlock \ - $(sig) $(dtable) $(inlines) port-cleanup report-wait xattr + $(sig) $(dtable) $(inlines) \ + fd-cleanup port-cleanup report-wait xattr sig = hurdsig hurdfault siginfo hurd-raise preempt-sig \ trampoline longjmp-ts catch-exc exc2signal hurdkill sigunwind \ thread-self thread-cancel intr-msg catch-signal |