summaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/sleep.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-06-07 00:19:38 +0000
committerUlrich Drepper <drepper@redhat.com>2003-06-07 00:19:38 +0000
commitb1bfeac00b44818468c118ebaf52c02e8f056ca0 (patch)
tree6a281c17b28e1a956b9c7c82c4381021a94505b0 /sysdeps/unix/sysv/linux/sleep.c
parentc3f90e26a5160c3fe287c4283e7a2bc1ff54b1a9 (diff)
Update.
Diffstat (limited to 'sysdeps/unix/sysv/linux/sleep.c')
-rw-r--r--sysdeps/unix/sysv/linux/sleep.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/sysdeps/unix/sysv/linux/sleep.c b/sysdeps/unix/sysv/linux/sleep.c
index 38c197358f..0cf6be285d 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, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -24,12 +24,8 @@
#include <unistd.h>
/* We are going to use the `nanosleep' syscall of the kernel. But the
- 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. */
+ kernel does not implement the sstupid SysV SIGCHLD vs. SIG_IGN
+ behaviour for this syscall. Therefore we have to emulate it here. */
unsigned int
__sleep (unsigned int seconds)
{
@@ -71,7 +67,7 @@ __sleep (unsigned int seconds)
if (oact.sa_handler == SIG_IGN)
{
/* We should leave SIGCHLD blocked. */
- result = INLINE_SYSCALL (nanosleep, 2, &ts, &ts);
+ result = __nanosleep (&ts, &ts);
saved_errno = errno;
/* Restore the original signal mask. */
@@ -82,11 +78,11 @@ __sleep (unsigned int seconds)
{
/* We should unblock SIGCHLD. Restore the original signal mask. */
(void) __sigprocmask (SIG_SETMASK, &oset, (sigset_t *) NULL);
- result = INLINE_SYSCALL (nanosleep, 2, &ts, &ts);
+ result = __nanosleep (&ts, &ts);
}
}
else
- result = INLINE_SYSCALL (nanosleep, 2, &ts, &ts);
+ result = __nanosleep (&ts, &ts);
if (result != 0)
/* Round remaining time. */