2003-06-06 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/unix/sysv/linux/sleep.c (__sleep): Use nanosleep syscall
+ directly to avoid cancellation in the regular nanosleep
+ implementation.
+
* sysdeps/unix/sysv/linux/i386/sysdep.h (ASMFMT_2): Only allow
%edx for first parameter. This means no pushl and therefore the
unwind info isn't screwed up.
/* We push lr onto the stack, so we have to use ldmib instead of ldmia
to find the saved arguments. */
-#undef DOARGS_5
-#undef DOARGS_6
-#undef DOARGS_7
-#define DOARGS_5 str r4, [sp, $-4]!; ldr r4, [sp, $8];
-#define DOARGS_6 mov ip, sp; stmfd sp!, {r4, r5}; ldmib ip, {r4, r5};
-#define DOARGS_7 mov ip, sp; stmfd sp!, {r4, r5, r6}; ldmib ip, {r4, r5, r6};
+# ifdef PIC
+# undef DOARGS_5
+# undef DOARGS_6
+# undef DOARGS_7
+# define DOARGS_5 str r4, [sp, $-4]!; ldr r4, [sp, $8];
+# define DOARGS_6 mov ip, sp; stmfd sp!, {r4, r5}; ldmib ip, {r4, r5};
+# define DOARGS_7 mov ip, sp; stmfd sp!, {r4, r5, r6}; ldmib ip, {r4, r5, r6};
+# endif
# undef PSEUDO_RET
# define PSEUDO_RET \
/* 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.
#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)
{
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. */
{
/* 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. */