diff options
author | peter <peter@FreeBSD.org> | 1997-05-18 10:57:49 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1997-05-18 10:57:49 +0000 |
commit | 9e3a2a0c2bba75d9444fb16eabbc328c7938dbbe (patch) | |
tree | d5a8e9914bd8711a8581122eb1df1456ba3b7c21 /lib/libc/gen/sleep.c | |
parent | 8fc601bf6f37fba71b0dcd292805572648a02312 (diff) | |
download | FreeBSD-src-9e3a2a0c2bba75d9444fb16eabbc328c7938dbbe.zip FreeBSD-src-9e3a2a0c2bba75d9444fb16eabbc328c7938dbbe.tar.gz |
Update the nanosleep versions to set a SIGALRM handler while sleeping.
This appears to appease Apache, although depending on having sleep(3)
changing the SIGALRM handler is a bit bogus.
Diffstat (limited to 'lib/libc/gen/sleep.c')
-rw-r--r-- | lib/libc/gen/sleep.c | 11 |
1 files changed, 9 insertions, 2 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 */ |