Skip to content

Commit

Permalink
bpo-30807: signal.setitimer() may disable the timer by mistake (#2493)
Browse files Browse the repository at this point in the history
* bpo-30807: signal.setitimer() may disable the timer by mistake

* Add NEWS blurb
  • Loading branch information
pitrou authored Jun 30, 2017
1 parent 42bc8be commit 729780a
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 0 deletions.
9 changes: 9 additions & 0 deletions Lib/test/test_signal.py
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,15 @@ def test_itimer_prof(self):
# and the handler should have been called
self.assertEqual(self.hndl_called, True)

def test_setitimer_tiny(self):
# bpo-30807: C setitimer() takes a microsecond-resolution interval.
# Check that float -> timeval conversion doesn't round
# the interval down to zero, which would disable the timer.
self.itimer = signal.ITIMER_REAL
signal.setitimer(self.itimer, 1e-6)
time.sleep(1)
self.assertEqual(self.hndl_called, True)


class PendingSignalsTests(unittest.TestCase):
"""
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
signal.setitimer() may disable the timer when passed a tiny value.

Tiny values (such as 1e-6) are valid non-zero values for setitimer(), which
is specified as taking microsecond-resolution intervals. However, on some
platform, our conversion routine could convert 1e-6 into a zero interval,
therefore disabling the timer instead of (re-)scheduling it.
4 changes: 4 additions & 0 deletions Modules/signalmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ timeval_from_double(double d, struct timeval *tv)
{
tv->tv_sec = floor(d);
tv->tv_usec = fmod(d, 1.0) * 1000000.0;
/* Don't disable the timer if the computation above rounds down to zero. */
if (d > 0.0 && tv->tv_sec == 0 && tv->tv_usec == 0) {
tv->tv_usec = 1;
}
}

Py_LOCAL_INLINE(double)
Expand Down

0 comments on commit 729780a

Please sign in to comment.