diff options
| -rw-r--r-- | lib/libc/gen/sleep.c | 11 | ||||
| -rw-r--r-- | lib/libc/gen/usleep.c | 10 |
2 files changed, 18 insertions, 3 deletions
diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c index d59db4b..6b872f9 100644 --- a/lib/libc/gen/sleep.c +++ b/lib/libc/gen/sleep.c @@ -43,18 +43,20 @@ static char sccsid[] = "@(#)sleep.c 8.1 (Berkeley) 6/4/93"; #include "pthread_private.h" #endif -#if !defined(_THREAD_SAFE) && !defined(USE_NANOSLEEP) #define setvec(vec, a) \ vec.sv_handler = a; vec.sv_mask = vec.sv_onstack = 0 +#if !defined(_THREAD_SAFE) && !defined(USE_NANOSLEEP) static int ringring; +#endif static void sleephandler() { +#if !defined(_THREAD_SAFE) && !defined(USE_NANOSLEEP) ringring = 1; -} #endif +} unsigned int sleep(seconds) @@ -63,11 +65,16 @@ sleep(seconds) #if defined(_THREAD_SAFE) || defined(USE_NANOSLEEP) struct timespec time_to_sleep; struct timespec time_remaining; + struct sigvec vec, ovec; if (seconds != 0) { time_to_sleep.tv_sec = seconds; time_to_sleep.tv_nsec = 0; + setvec(vec, sleephandler); + (void) sigvec(SIGALRM, &vec, &ovec); + /* XXX race here.. a SIGALRM right _now_ could be lost */ nanosleep(&time_to_sleep, &time_remaining); + (void) sigvec(SIGALRM, &ovec, (struct sigvec *)0); seconds = time_remaining.tv_sec; if (time_remaining.tv_nsec > 0) seconds++; /* round up */ diff --git a/lib/libc/gen/usleep.c b/lib/libc/gen/usleep.c index 1549173..0f3e004 100644 --- a/lib/libc/gen/usleep.c +++ b/lib/libc/gen/usleep.c @@ -46,18 +46,22 @@ static char sccsid[] = "@(#)usleep.c 8.1 (Berkeley) 6/4/93"; #if !defined(_THREAD_SAFE) && !defined(USE_NANOSLEEP) #define TICK 10000 /* system clock resolution in microseconds */ #define USPS 1000000 /* number of microseconds in a second */ +#endif #define setvec(vec, a) \ vec.sv_handler = a; vec.sv_mask = vec.sv_onstack = 0 +#if !defined(_THREAD_SAFE) && !defined(USE_NANOSLEEP) static int ringring; +#endif static void sleephandler() { +#if !defined(_THREAD_SAFE) && !defined(USE_NANOSLEEP) ringring = 1; -} #endif +} void @@ -67,15 +71,19 @@ usleep(useconds) #if defined(_THREAD_SAFE) || defined(USE_NANOSLEEP) struct timespec time_to_sleep; struct timespec time_remaining; + struct sigvec vec, ovec; if (useconds) { time_to_sleep.tv_nsec = (useconds % 1000000) * 1000; time_to_sleep.tv_sec = useconds / 1000000; + setvec(vec, sleephandler); + (void) sigvec(SIGALRM, &vec, &ovec); do { nanosleep(&time_to_sleep, &time_remaining); time_to_sleep = time_remaining; } while (time_to_sleep.tv_sec != 0 && time_to_sleep.tv_nsec != 0); + (void) sigvec(SIGALRM, &ovec, (struct sigvec *)0); } #else register struct itimerval *itp; |
