projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2005-02-22 Simon Josefsson <jas@extundo.com>
[gnulib.git]
/
lib
/
nanosleep.c
diff --git
a/lib/nanosleep.c
b/lib/nanosleep.c
index
1f17c09
..
2f91c31
100644
(file)
--- a/
lib/nanosleep.c
+++ b/
lib/nanosleep.c
@@
-1,5
+1,5
@@
/* Provide a replacement for the POSIX nanosleep function.
/* Provide a replacement for the POSIX nanosleep function.
- Copyright (C) 1999, 2000 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
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
@@
-18,23
+18,32
@@
/* written by Jim Meyering */
#include <config.h>
/* written by Jim Meyering */
#include <config.h>
+
+/* 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>
#include <sys/types.h>
#include <signal.h>
#include <errno.h>
#include <stdio.h>
#include <sys/types.h>
#include <signal.h>
#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
-#include "nanosleep.h"
+/* Some systems (MSDOS) don't have SIGCONT.
+ Using SIGTERM here turns the signal-handling code below
+ into a no-op on such systems. */
+#ifndef SIGCONT
+# define SIGCONT SIGTERM
+#endif
+
+#include "timespec.h"
-static int suspended;
-int first_call = 1;
+static sig_atomic_t volatile suspended;
/* Handle SIGCONT. */
/* Handle SIGCONT. */
@@
-51,26
+60,33
@@
my_usleep (const struct timespec *ts_delay)
{
struct timeval tv_delay;
tv_delay.tv_sec = ts_delay->tv_sec;
{
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);
}
/* FIXME: comment */
int
select (0, (void *) 0, (void *) 0, (void *) 0, &tv_delay);
}
/* FIXME: comment */
int
-nanosleep (const struct timespec *requested_delay,
- struct timespec *remaining_delay)
+
rpl_
nanosleep (const struct timespec *requested_delay,
+
struct timespec *remaining_delay)
{
{
-#ifdef SA_INTERRUPT
+ static bool initialized;
+
+#ifdef SA_NOCLDSTOP
struct sigaction oldact, newact;
#endif
suspended = 0;
/* set up sig handler */
struct sigaction oldact, newact;
#endif
suspended = 0;
/* set up sig handler */
- if (
first_call
)
+ if (
! initialized
)
{
{
-#ifdef SA_
INTERRUPT
+#ifdef SA_
NOCLDSTOP
newact.sa_handler = sighandler;
sigemptyset (&newact.sa_mask);
newact.sa_flags = 0;
newact.sa_handler = sighandler;
sigemptyset (&newact.sa_mask);
newact.sa_flags = 0;
@@
-82,7
+98,7
@@
nanosleep (const struct timespec *requested_delay,
if (signal (SIGCONT, SIG_IGN) != SIG_IGN)
signal (SIGCONT, sighandler);
#endif
if (signal (SIGCONT, SIG_IGN) != SIG_IGN)
signal (SIGCONT, sighandler);
#endif
-
first_call = 0
;
+
initialized = true
;
}
my_usleep (requested_delay);
}
my_usleep (requested_delay);