diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-06-15 21:22:26 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-06-15 21:22:26 +0000 |
| commit | 7a1147946ecd5fe962e2959afe69c25c7a553672 (patch) | |
| tree | a6ffd9a6c377d19c531d24e4ac5f9e820a14b72e /sysdeps/unix/clock_nanosleep.c | |
| parent | 1fde494e69792603263bdf85819831f00d29cee4 (diff) | |
Update.
2003-06-15 Ulrich Drepper <drepper@redhat.com>
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.
Diffstat (limited to 'sysdeps/unix/clock_nanosleep.c')
| -rw-r--r-- | sysdeps/unix/clock_nanosleep.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sysdeps/unix/clock_nanosleep.c b/sysdeps/unix/clock_nanosleep.c index ec468ad8c9..34bbc2dae6 100644 --- a/sysdeps/unix/clock_nanosleep.c +++ b/sysdeps/unix/clock_nanosleep.c @@ -21,7 +21,7 @@ #include <errno.h> #include <time.h> #include <hp-timing.h> - +#include <sysdep-cancel.h> #if HP_TIMING_AVAIL # define CPUCLOCK_P(clock) \ @@ -94,5 +94,15 @@ clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, /* Not supported. */ return ENOTSUP; - return __builtin_expect (nanosleep (req, rem), 0) ? errno : 0; + if (SINGLE_THREAD_P) + return __builtin_expect (nanosleep (req, rem), 0) ? errno : 0; + + /* More than one thread running, enable cancellation. */ + int oldstate = LIBC_CANCEL_ASYNC (); + + int result = __builtin_expect (nanosleep (req, rem), 0) ? errno : 0; + + LIBC_CANCEL_RESET (oldstate); + + return result; } |