From c6beac9fc4202f59840b4b1e774ff803b43ec044 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 13 May 2004 22:20:53 +0000 Subject: [PATCH] nanosleep merge from coreutils --- lib/ChangeLog | 7 +++++++ lib/nanosleep.c | 18 ++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 2283e15ff..7ce0bf5da 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,5 +1,12 @@ 2004-05-13 Paul Eggert + * nanosleep.c (suspended): Change its type from int to + sig_atomic_t volatile. + (first_call): Make it private to rpl_nanosleep, and have it + be zero initially as that's a bit faster. + (my_usleep): Round up fractional times instead of truncating them, + as this is the usual meaning for 'sleep'. + * gettime.c (gettime): Fall back on `time' if `gettimeofday' doesn't work. * settime.c: Include , for stime (on Solaris 8, anyway). diff --git a/lib/nanosleep.c b/lib/nanosleep.c index 902fd2dfe..c5451ffc4 100644 --- a/lib/nanosleep.c +++ b/lib/nanosleep.c @@ -1,5 +1,5 @@ /* Provide a replacement for the POSIX nanosleep function. - Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2002, 2004 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -45,8 +45,7 @@ extern int errno; #include "timespec.h" -static int suspended; -int first_call = 1; +static sig_atomic_t volatile suspended; /* Handle SIGCONT. */ @@ -63,7 +62,12 @@ my_usleep (const struct timespec *ts_delay) { struct timeval tv_delay; tv_delay.tv_sec = ts_delay->tv_sec; - tv_delay.tv_usec = ts_delay->tv_nsec / 1000; + tv_delay.tv_usec = (ts_delay->tv_nsec + 999) / 1000; + if (tv_delay.tv_usec == 1000000) + { + tv_delay.tv_sec++; + tv_delay.tv_usec = 0; + } select (0, (void *) 0, (void *) 0, (void *) 0, &tv_delay); } @@ -73,6 +77,8 @@ int rpl_nanosleep (const struct timespec *requested_delay, struct timespec *remaining_delay) { + static int initialized; + #ifdef SA_NOCLDSTOP struct sigaction oldact, newact; #endif @@ -80,7 +86,7 @@ rpl_nanosleep (const struct timespec *requested_delay, suspended = 0; /* set up sig handler */ - if (first_call) + if (! initialized) { #ifdef SA_NOCLDSTOP newact.sa_handler = sighandler; @@ -94,7 +100,7 @@ rpl_nanosleep (const struct timespec *requested_delay, if (signal (SIGCONT, SIG_IGN) != SIG_IGN) signal (SIGCONT, sighandler); #endif - first_call = 0; + initialized = 1; } my_usleep (requested_delay); -- 2.11.0