mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #12462: time.sleep() now calls immediatly the (Python) signal handler if

Browse source 
it is interrupted by a signal, instead of having to wait until the next
instruction.

Patch reviewed by Antoine Pitrou.
This commit is contained in:
Victor Stinner 2011-07-01 13:50:09 +02:00
parent 210e7ca032
commit 48b1ce5519
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Misc/NEWS
View file

@ -200,6 +200,10 @@ Core and Builtins
Library
-------
- Issue #12462: time.sleep() now calls immediatly the (Python) signal handler
if it is interrupted by a signal, instead of having to wait until the next
instruction.
- Issue #12442: new shutil.disk_usage function, providing total, used and free
disk space statistics.

17
Modules/timemodule.c
View file

@ -915,23 +915,28 @@ floatsleep(double secs)
#if defined(HAVE_SELECT) && !defined(__EMX__)
struct timeval t;
double frac;
int err;
frac = fmod(secs, 1.0);
secs = floor(secs);
t.tv_sec = (long)secs;
t.tv_usec = (long)(frac*1000000.0);
Py_BEGIN_ALLOW_THREADS
if (select(0, (fd_set *)0, (fd_set *)0, (fd_set *)0, &t) != 0) {
err = select(0, (fd_set *)0, (fd_set *)0, (fd_set *)0, &t);
Py_END_ALLOW_THREADS
if (err != 0) {
#ifdef EINTR
if (errno != EINTR) {
#else
if (1) {
if (errno == EINTR) {
if (PyErr_CheckSignals())
return -1;
}
else
#endif
Py_BLOCK_THREADS
{
PyErr_SetFromErrno(PyExc_IOError);
return -1;
}
}
Py_END_ALLOW_THREADS
#elif defined(__WATCOMC__) && !defined(__QNX__)
/* XXX Can't interrupt this sleep */
Py_BEGIN_ALLOW_THREADS