about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-06-06 17:34:54 +0000
committerUlrich Drepper <drepper@redhat.com>2003-06-06 17:34:54 +0000
commitc3f90e26a5160c3fe287c4283e7a2bc1ff54b1a9 (patch)
tree1164126ce1a33b340459c03a100011566853ed9b /sysdeps
parent3a370de88f9ca928a90d1fa88afaf5d17d939fb6 (diff)
downloadglibc-c3f90e26a5160c3fe287c4283e7a2bc1ff54b1a9.tar.gz
glibc-c3f90e26a5160c3fe287c4283e7a2bc1ff54b1a9.tar.xz
glibc-c3f90e26a5160c3fe287c4283e7a2bc1ff54b1a9.zip
Update.
	* sysdeps/unix/sysv/linux/sleep.c (__sleep): Use nanosleep syscall
	directly to avoid cancellation in the regular nanosleep
	implementation.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/sleep.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/sleep.c b/sysdeps/unix/sysv/linux/sleep.c
index 0cf6be285d..38c197358f 100644
--- a/sysdeps/unix/sysv/linux/sleep.c
+++ b/sysdeps/unix/sysv/linux/sleep.c
@@ -1,5 +1,5 @@
 /* Implementation of the POSIX sleep function using nanosleep.
-   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -24,8 +24,12 @@
 #include <unistd.h>
 
 /* We are going to use the `nanosleep' syscall of the kernel.  But the
-   kernel does not implement the sstupid SysV SIGCHLD vs. SIG_IGN
-   behaviour for this syscall.  Therefore we have to emulate it here.  */
+   kernel does not implement the stupid SysV SIGCHLD vs. SIG_IGN
+   behaviour for this syscall.  Therefore we have to emulate it here.
+
+   Also note that we use the syscall directly instead of using the
+   __nanosleep function.  The reason is that nanosleep() is a cancellation
+   point while sleep() isn't.  */
 unsigned int
 __sleep (unsigned int seconds)
 {
@@ -67,7 +71,7 @@ __sleep (unsigned int seconds)
       if (oact.sa_handler == SIG_IGN)
 	{
 	  /* We should leave SIGCHLD blocked.  */
-	  result = __nanosleep (&ts, &ts);
+	  result = INLINE_SYSCALL (nanosleep, 2, &ts, &ts);
 
 	  saved_errno = errno;
 	  /* Restore the original signal mask.  */
@@ -78,11 +82,11 @@ __sleep (unsigned int seconds)
 	{
 	  /* We should unblock SIGCHLD.  Restore the original signal mask.  */
 	  (void) __sigprocmask (SIG_SETMASK, &oset, (sigset_t *) NULL);
-	  result = __nanosleep (&ts, &ts);
+	  result = INLINE_SYSCALL (nanosleep, 2, &ts, &ts);
 	}
     }
   else
-    result = __nanosleep (&ts, &ts);
+    result = INLINE_SYSCALL (nanosleep, 2, &ts, &ts);
 
   if (result != 0)
     /* Round remaining time.  */