From 7a1147946ecd5fe962e2959afe69c25c7a553672 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 15 Jun 2003 21:22:26 +0000 Subject: Update. 2003-06-15 Ulrich Drepper Fix cancellation point handling wrt exception based cleanup. * io/Makefile: Compile fcntl.c, poll.c, and lockf.c with exceptions. * misc/Makefile: Compile pselect.c, readv.c, writev.c, and usleep.c with exceptions. * posix/Makefile: Compile pread.c, pread64.c, pwrite.c, pwrite64.c, sleep.c, wait.c, waitid.c, and waitpid.c with exceptions. * rt/Makefile: Compile aio_suspend.c and clock_nanosleep.c with exceptions. * signal/Makefile: Compile sigpause.c, sigsuspend.c, sigtimedwait.c, sigwait.c, and sigwaitinfo.c with exceptions. * stdlib/Makefile: Compile system.c with exceptions. * sysvipc/Makefile: Compile msgrcv.c and msgsnd.c with exceptions. * termios/Makefile: Compile tcdrain.c with exceptions. * sysdeps/generic/lockf.c: Add comment explaining the cancellation situation. * sysdeps/generic/pselect.c: Likewise. * sysdeps/posix/sigpause.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/posix/waitid.c: Likewise. * sysdeps/unix/sysv/linux/sleep.c: Likewise. * sysdeps/unix/sysv/linux/usleep.c: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.h: Major rewrite of INTERNAL_SYSCALL to not use push inside asm statement so that unwind info is correct around the syscall. * sysdeps/unix/clock_nanosleep.c: Add cancellation support. * sysdeps/unix/sysv/linux/clock_nanosleep.c: Likewise. --- sysdeps/posix/sigpause.c | 3 +++ sysdeps/posix/system.c | 3 +++ sysdeps/posix/waitid.c | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'sysdeps/posix') diff --git a/sysdeps/posix/sigpause.c b/sysdeps/posix/sigpause.c index 78b247ebd9..98b69d3c98 100644 --- a/sysdeps/posix/sigpause.c +++ b/sysdeps/posix/sigpause.c @@ -40,6 +40,9 @@ do_sigpause (int sig_or_mask, int is_sig) else if (sigset_set_old_mask (&set, sig_or_mask) < 0) return -1; + /* Note the sigpause() is a cancellation point. But since we call + sigsuspend() which itself is a cancellation point we do not have + to do anything here. */ return __sigsuspend (&set); } diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c index b1c826e4bc..8548313314 100644 --- a/sysdeps/posix/system.c +++ b/sysdeps/posix/system.c @@ -162,6 +162,9 @@ do_system (const char *line) } while (child != pid); #else + /* Note the system() is a cancellation point. But since we call + waitpid() which itself is a cancellation point we do not + have to do anything here. */ if (TEMP_FAILURE_RETRY (__waitpid (pid, &status, 0)) != pid) status = -1; #endif diff --git a/sysdeps/posix/waitid.c b/sysdeps/posix/waitid.c index 679d97d203..e388d173f4 100644 --- a/sysdeps/posix/waitid.c +++ b/sysdeps/posix/waitid.c @@ -1,5 +1,5 @@ /* Pseudo implementation of waitid. - Copyright (C) 1997, 1998, 2002 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Zack Weinberg , 1997. @@ -66,6 +66,9 @@ do_waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options) return -1; } + /* Note the waitid() is a cancellation point. But since we call + waitpid() which itself is a cancellation point we do not have + to do anything here. */ child = __waitpid (pid, &status, options); if (child == -1) -- cgit 1.4.1