/* Provide a replacement for the POSIX nanosleep function.
- Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
+
+ Copyright (C) 1999, 2000, 2002, 2004, 2005, 2006 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
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* written by Jim Meyering */
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
/* Undefine nanosleep here so any prototype is not redefined to be a
prototype for rpl_nanosleep. (they'd conflict e.g., on alpha-dec-osf3.2) */
#undef nanosleep
+#include <stdbool.h>
#include <stdio.h>
+#if HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
#include <sys/types.h>
#include <signal.h>
-#include <errno.h>
-#ifndef errno
-extern int errno;
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <errno.h>
+
+#include <unistd.h>
+
+#include "timespec.h"
/* Some systems (MSDOS) don't have SIGCONT.
Using SIGTERM here turns the signal-handling code below
# define SIGCONT SIGTERM
#endif
-#include "timespec.h"
+#if ! HAVE_SIGINTERRUPT
+# define siginterrupt(sig, flag) /* empty */
+#endif
-static int suspended;
-int first_call = 1;
+static sig_atomic_t volatile suspended;
/* Handle SIGCONT. */
suspended = 1;
}
-/* FIXME: comment */
+/* Suspend execution for at least *TS_DELAY seconds. */
static void
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;
- select (0, (void *) 0, (void *) 0, (void *) 0, &tv_delay);
+ tv_delay.tv_usec = (ts_delay->tv_nsec + 999) / 1000;
+ if (tv_delay.tv_usec == 1000000)
+ {
+ time_t t1 = tv_delay.tv_sec + 1;
+ if (t1 < tv_delay.tv_sec)
+ tv_delay.tv_usec = 1000000 - 1; /* close enough */
+ else
+ {
+ tv_delay.tv_sec = t1;
+ tv_delay.tv_usec = 0;
+ }
+ }
+ select (0, NULL, NULL, NULL, &tv_delay);
}
-/* FIXME: comment */
+/* Suspend execution for at least *REQUESTED_DELAY seconds. The
+ *REMAINING_DELAY part isn't implemented yet. */
int
rpl_nanosleep (const struct timespec *requested_delay,
struct timespec *remaining_delay)
{
-#ifdef SA_NOCLDSTOP
- struct sigaction oldact, newact;
-#endif
-
- suspended = 0;
+ static bool initialized;
/* set up sig handler */
- if (first_call)
+ if (! initialized)
{
#ifdef SA_NOCLDSTOP
+ struct sigaction oldact, newact;
newact.sa_handler = sighandler;
sigemptyset (&newact.sa_mask);
newact.sa_flags = 0;
sigaction (SIGCONT, &newact, NULL);
#else
if (signal (SIGCONT, SIG_IGN) != SIG_IGN)
- signal (SIGCONT, sighandler);
+ {
+ signal (SIGCONT, sighandler);
+ siginterrupt (SIGCONT, 1);
+ }
#endif
- first_call = 0;
+ initialized = true;
}
+ suspended = 0;
+
my_usleep (requested_delay);
if (suspended)