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/generic/lockf.c | 5 ++++- sysdeps/generic/pselect.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'sysdeps/generic') diff --git a/sysdeps/generic/lockf.c b/sysdeps/generic/lockf.c index 182a70094c..7b23f66bc9 100644 --- a/sysdeps/generic/lockf.c +++ b/sysdeps/generic/lockf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1996, 1997, 1998, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1994,1996,1997,1998,2000,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -67,5 +67,8 @@ lockf (int fd, int cmd, off_t len) return -1; } + /* lockf() is a cancellation point but so is fcntl() if F_SETLKW is + used. Therefore we don't have to care about cancellation here, + the fcntl() function will take care of it. */ return __fcntl (fd, cmd, &fl); } diff --git a/sysdeps/generic/pselect.c b/sysdeps/generic/pselect.c index e090d6e526..43b371cce7 100644 --- a/sysdeps/generic/pselect.c +++ b/sysdeps/generic/pselect.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1996,1997,1998,2001,2002,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -50,6 +50,9 @@ do_pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, if (sigmask != NULL) __sigprocmask (SIG_SETMASK, sigmask, &savemask); + /* Note the pselect() is a cancellation point. But since we call + select() which itself is a cancellation point we do not have + to do anything here. */ retval = __select (nfds, readfds, writefds, exceptfds, timeout != NULL ? &tval : NULL); -- cgit 1.4.1