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/sysv/linux/clock_nanosleep.c | |
| parent | 1fde494e69792603263bdf85819831f00d29cee4 (diff) | |
| download | glibc-7a1147946ecd5fe962e2959afe69c25c7a553672.tar.gz glibc-7a1147946ecd5fe962e2959afe69c25c7a553672.tar.xz glibc-7a1147946ecd5fe962e2959afe69c25c7a553672.zip | |
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/sysv/linux/clock_nanosleep.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/clock_nanosleep.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c b/sysdeps/unix/sysv/linux/clock_nanosleep.c index ceb3801eb9..2a3dd411a1 100644 --- a/sysdeps/unix/sysv/linux/clock_nanosleep.c +++ b/sysdeps/unix/sysv/linux/clock_nanosleep.c @@ -18,7 +18,7 @@ #include <time.h> -#include <sysdep.h> +#include <sysdep-cancel.h> #include "kernel-features.h" @@ -32,7 +32,18 @@ clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, INTERNAL_SYSCALL_DECL (err); int r; - r = INTERNAL_SYSCALL (clock_nanosleep, err, 4, clock_id, flags, req, rem); + if (SINGLE_THREAD_P) + r = INTERNAL_SYSCALL (clock_nanosleep, err, 4, clock_id, flags, req, rem); + else + { + int oldstate = LIBC_CANCEL_ASYNC (); + + r = INTERNAL_SYSCALL (clock_nanosleep, err, 4, clock_id, flags, req, + rem); + + LIBC_CANCEL_RESET (oldstate); + } + return (INTERNAL_SYSCALL_ERROR_P (r, err) ? INTERNAL_SYSCALL_ERRNO (r, err) : 0); } @@ -48,15 +59,20 @@ extern int __libc_missing_posix_timers attribute_hidden; if (!__libc_missing_posix_timers) \ { \ INTERNAL_SYSCALL_DECL (err); \ + \ + int oldstate = LIBC_CANCEL_ASYNC (); \ + \ int r = INTERNAL_SYSCALL (clock_nanosleep, err, 4, clock_id, flags, \ req, rem); \ \ + LIBC_CANCEL_RESET (oldstate); \ + \ if (!INTERNAL_SYSCALL_ERROR_P (r, err)) \ return 0; \ \ if (INTERNAL_SYSCALL_ERRNO (r, err) != ENOSYS) \ return INTERNAL_SYSCALL_ERRNO (r, err); \ - \ + \ __libc_missing_posix_timers = 1; \ } # endif |