From 238c7cd730819ddba2dbde3c46ee36136575695b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 16 Sep 2018 08:52:16 -0700 Subject: [PATCH] =?utf8?q?Don=E2=80=99t=20assume=20obsolescent=20setitimer?= =?utf8?q?=20function?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * src/atimer.c (start_atimer, debug_timer_callback): Don’t assume support for setitimer merely because struct itimerspec works. POSIX no longer requires support for the obsolescent setitimer function. --- src/atimer.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/atimer.c b/src/atimer.c index 97f07362ae1..505f6bcea18 100644 --- a/src/atimer.c +++ b/src/atimer.c @@ -113,10 +113,10 @@ start_atimer (enum atimer_type type, struct timespec timestamp, sigset_t oldset; /* Round TIMESTAMP up to the next full second if we don't have itimers. */ -#ifndef HAVE_SETITIMER +#if ! (defined HAVE_ITIMERSPEC || defined HAVE_SETITIMER) if (timestamp.tv_nsec != 0 && timestamp.tv_sec < TYPE_MAXIMUM (time_t)) timestamp = make_timespec (timestamp.tv_sec + 1, 0); -#endif /* not HAVE_SETITIMER */ +#endif /* Get an atimer structure from the free-list, or allocate a new one. */ @@ -494,15 +494,14 @@ debug_timer_callback (struct atimer *t) r->intime = 0; else if (result >= 0) { -#ifdef HAVE_SETITIMER + bool intime = true; +#if defined HAVE_ITIMERSPEC || defined HAVE_SETITIMER struct timespec delta = timespec_sub (now, r->expected); /* Too late if later than expected + 0.02s. FIXME: this should depend from system clock resolution. */ - if (timespec_cmp (delta, make_timespec (0, 20000000)) > 0) - r->intime = 0; - else -#endif /* HAVE_SETITIMER */ - r->intime = 1; + intime = timespec_cmp (delta, make_timespec (0, 20000000)) <= 0; +#endif + r->intime = intime; } } -- 2.39.2