From 60d73a7ac4e0116ef2e458d705aeee14aff7aed9 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 17 Jun 2003 22:11:22 +0000 Subject: Update. * sysdeps/unix/clock_nanosleep.c (clock_nanosleep): nanosleep takes care of enabling cancellation. * sysdeps/pthread/aio_suspend.c (aio_suspend): Make aio_suspend cancelable. It's not correct to disable cancellation. Instead of a cleanup handler. --- sysdeps/unix/clock_nanosleep.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'sysdeps/unix/clock_nanosleep.c') diff --git a/sysdeps/unix/clock_nanosleep.c b/sysdeps/unix/clock_nanosleep.c index 34bbc2dae6..7662d1704e 100644 --- a/sysdeps/unix/clock_nanosleep.c +++ b/sysdeps/unix/clock_nanosleep.c @@ -94,15 +94,5 @@ clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, /* Not supported. */ return ENOTSUP; - 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; + return __builtin_expect (nanosleep (req, rem), 0) ? errno : 0; } -- cgit v1.2.3