Mailman 3 March 2015 - Python-checkins

cpython: Issue #23485: select.epoll.poll() is now retried when interrupted by a signal
by victor.stinner March 30, 2015

March 30, 2015

https://hg.python.org/cpython/rev/5194a84ed9f3 changeset: 95308:5194a84ed9f3 user: Victor Stinner <victor.stinner(a)gmail.com> date: Mon Mar 30 21:59:21 2015 +0200 summary: Issue #23485: select.epoll.poll() is now retried when interrupted by a signal files: Doc/library/select.rst | 6 + Doc/whatsnew/3.5.rst | 2 +- Lib/selectors.py | 6 +- Lib/test/eintrdata/eintr_tester.py | 11 ++ Modules/selectmodule.c … [View More] | 69 +++++++++++++---- 5 files changed, 71 insertions(+), 23 deletions(-) diff --git a/Doc/library/select.rst b/Doc/library/select.rst --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -329,6 +329,12 @@ Wait for events. timeout in seconds (float) + .. versionchanged:: 3.5 + The function is now retried with a recomputed timeout when interrupted by + a signal, except if the signal handler raises an exception (see + :pep:`475` for the rationale), instead of raising + :exc:`InterruptedError`. + .. _poll-objects: diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -621,7 +621,7 @@ - :func:`os.open`, :func:`open` - :func:`os.read`, :func:`os.write` - - :func:`select.select`, :func:`select.poll.poll` + - :func:`select.select`, :func:`select.poll.poll`, :func:`select.epoll.poll` - :func:`time.sleep` * Before Python 3.5, a :class:`datetime.time` object was considered to be false diff --git a/Lib/selectors.py b/Lib/selectors.py --- a/Lib/selectors.py +++ b/Lib/selectors.py @@ -423,11 +423,9 @@ # FD is registered. max_ev = max(len(self._fd_to_key), 1) + fd_event_list = self._epoll.poll(timeout, max_ev) + ready = [] - try: - fd_event_list = self._epoll.poll(timeout, max_ev) - except InterruptedError: - return ready for fd, event in fd_event_list: events = 0 if event & ~select.EPOLLIN: diff --git a/Lib/test/eintrdata/eintr_tester.py b/Lib/test/eintrdata/eintr_tester.py --- a/Lib/test/eintrdata/eintr_tester.py +++ b/Lib/test/eintrdata/eintr_tester.py @@ -329,6 +329,17 @@ dt = time.monotonic() - t0 self.assertGreaterEqual(dt, self.sleep_time) + @unittest.skipUnless(hasattr(select, 'epoll'), 'need select.epoll') + def test_epoll(self): + poller = select.epoll() + self.addCleanup(poller.close) + + t0 = time.monotonic() + poller.poll(self.sleep_time) + self.stop_alarm() + dt = time.monotonic() - t0 + self.assertGreaterEqual(dt, self.sleep_time) + def test_main(): support.run_unittest( diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -535,7 +535,7 @@ if (timeout_obj == NULL || timeout_obj == Py_None) { timeout = -1; ms = -1; - deadline = 0; + deadline = 0; /* initialize to prevent gcc warning */ } else { if (_PyTime_FromMillisecondsObject(&timeout, timeout_obj, @@ -1465,34 +1465,46 @@ static PyObject * pyepoll_poll(pyEpoll_Object *self, PyObject *args, PyObject *kwds) { - double dtimeout = -1.; - int timeout; + static char *kwlist[] = {"timeout", "maxevents", NULL}; + PyObject *timeout_obj = NULL; int maxevents = -1; int nfds, i; PyObject *elist = NULL, *etuple = NULL; struct epoll_event *evs = NULL; - static char *kwlist[] = {"timeout", "maxevents", NULL}; + _PyTime_t timeout, ms, deadline; if (self->epfd < 0) return pyepoll_err_closed(); - if (!PyArg_ParseTupleAndKeywords(args, kwds, "|di:poll", kwlist, - &dtimeout, &maxevents)) { + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|Oi:poll", kwlist, + &timeout_obj, &maxevents)) { return NULL; } - if (dtimeout < 0) { + if (timeout_obj == NULL || timeout_obj == Py_None) { timeout = -1; - } - else if (dtimeout * 1000.0 > INT_MAX) { - PyErr_SetString(PyExc_OverflowError, - "timeout is too large"); - return NULL; + ms = -1; + deadline = 0; /* initialize to prevent gcc warning */ } else { - /* epoll_wait() has a resolution of 1 millisecond, round away from zero - to wait *at least* dtimeout seconds. */ - timeout = (int)ceil(dtimeout * 1000.0); + /* epoll_wait() has a resolution of 1 millisecond, round towards + infinity to wait at least timeout seconds. */ + if (_PyTime_FromSecondsObject(&timeout, timeout_obj, + _PyTime_ROUND_CEILING) < 0) { + if (PyErr_ExceptionMatches(PyExc_TypeError)) { + PyErr_SetString(PyExc_TypeError, + "timeout must be an integer or None"); + } + return NULL; + } + + ms = _PyTime_AsMilliseconds(timeout, _PyTime_ROUND_CEILING); + if (ms < INT_MIN || ms > INT_MAX) { + PyErr_SetString(PyExc_OverflowError, "timeout is too large"); + return NULL; + } + + deadline = _PyTime_GetMonotonicClock() + timeout; } if (maxevents == -1) { @@ -1511,9 +1523,30 @@ return NULL; } - Py_BEGIN_ALLOW_THREADS - nfds = epoll_wait(self->epfd, evs, maxevents, timeout); - Py_END_ALLOW_THREADS + do { + Py_BEGIN_ALLOW_THREADS + errno = 0; + nfds = epoll_wait(self->epfd, evs, maxevents, (int)ms); + Py_END_ALLOW_THREADS + + if (errno != EINTR) + break; + + /* poll() was interrupted by a signal */ + if (PyErr_CheckSignals()) + goto error; + + if (timeout >= 0) { + timeout = deadline - _PyTime_GetMonotonicClock(); + if (timeout < 0) { + nfds = 0; + break; + } + ms = _PyTime_AsMilliseconds(timeout, _PyTime_ROUND_CEILING); + /* retry epoll_wait() with the recomputed timeout */ + } + } while(1); + if (nfds < 0) { PyErr_SetFromErrno(PyExc_OSError); goto error; -- Repository URL: https://hg.python.org/cpython [View Less]

1 0

cpython: Issue #23485: select.poll.poll() is now retried when interrupted by a signal
by victor.stinner March 30, 2015

March 30, 2015

https://hg.python.org/cpython/rev/69b1683ee001 changeset: 95307:69b1683ee001 user: Victor Stinner <victor.stinner(a)gmail.com> date: Mon Mar 30 21:38:00 2015 +0200 summary: Issue #23485: select.poll.poll() is now retried when interrupted by a signal files: Doc/library/select.rst | 6 + Doc/whatsnew/3.5.rst | 2 +- Lib/asyncore.py | 6 +- Lib/selectors.py | 7 +- Lib/test/eintrdata/… [View More]eintr_tester.py | 20 ++- Modules/selectmodule.c | 131 ++++++++++------ 6 files changed, 111 insertions(+), 61 deletions(-) diff --git a/Doc/library/select.rst b/Doc/library/select.rst --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -408,6 +408,12 @@ returning. If *timeout* is omitted, negative, or :const:`None`, the call will block until there is an event for this poll object. + .. versionchanged:: 3.5 + The function is now retried with a recomputed timeout when interrupted by + a signal, except if the signal handler raises an exception (see + :pep:`475` for the rationale), instead of raising + :exc:`InterruptedError`. + .. _kqueue-objects: diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -621,7 +621,7 @@ - :func:`os.open`, :func:`open` - :func:`os.read`, :func:`os.write` - - :func:`select.select` + - :func:`select.select`, :func:`select.poll.poll` - :func:`time.sleep` * Before Python 3.5, a :class:`datetime.time` object was considered to be false diff --git a/Lib/asyncore.py b/Lib/asyncore.py --- a/Lib/asyncore.py +++ b/Lib/asyncore.py @@ -179,10 +179,8 @@ flags |= select.POLLOUT if flags: pollster.register(fd, flags) - try: - r = pollster.poll(timeout) - except InterruptedError: - r = [] + + r = pollster.poll(timeout) for fd, flags in r: obj = map.get(fd) if obj is None: diff --git a/Lib/selectors.py b/Lib/selectors.py --- a/Lib/selectors.py +++ b/Lib/selectors.py @@ -359,11 +359,10 @@ # poll() has a resolution of 1 millisecond, round away from # zero to wait *at least* timeout seconds. timeout = math.ceil(timeout * 1e3) + + fd_event_list = self._poll.poll(timeout) + ready = [] - try: - fd_event_list = self._poll.poll(timeout) - except InterruptedError: - return ready for fd, event in fd_event_list: events = 0 if event & ~select.POLLIN: diff --git a/Lib/test/eintrdata/eintr_tester.py b/Lib/test/eintrdata/eintr_tester.py --- a/Lib/test/eintrdata/eintr_tester.py +++ b/Lib/test/eintrdata/eintr_tester.py @@ -38,8 +38,12 @@ cls.signal_period) @classmethod + def stop_alarm(cls): + signal.setitimer(signal.ITIMER_REAL, 0, 0) + + @classmethod def tearDownClass(cls): - signal.setitimer(signal.ITIMER_REAL, 0, 0) + cls.stop_alarm() signal.signal(signal.SIGALRM, cls.orig_handler) @classmethod @@ -260,7 +264,7 @@ def test_sleep(self): t0 = time.monotonic() time.sleep(self.sleep_time) - signal.alarm(0) + self.stop_alarm() dt = time.monotonic() - t0 self.assertGreaterEqual(dt, self.sleep_time) @@ -311,7 +315,17 @@ def test_select(self): t0 = time.monotonic() select.select([], [], [], self.sleep_time) - signal.alarm(0) + self.stop_alarm() + dt = time.monotonic() - t0 + self.assertGreaterEqual(dt, self.sleep_time) + + @unittest.skipUnless(hasattr(select, 'poll'), 'need select.poll') + def test_poll(self): + poller = select.poll() + + t0 = time.monotonic() + poller.poll(self.sleep_time * 1e3) + self.stop_alarm() dt = time.monotonic() - t0 self.assertGreaterEqual(dt, self.sleep_time) diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -279,6 +279,7 @@ break; } _PyTime_AsTimeval_noraise(timeout, &tv, _PyTime_ROUND_CEILING); + /* retry select() with the recomputed timeout */ } } while (1); @@ -520,30 +521,39 @@ static PyObject * poll_poll(pollObject *self, PyObject *args) { - PyObject *result_list = NULL, *tout = NULL; - int timeout = 0, poll_result, i, j; + PyObject *result_list = NULL, *timeout_obj = NULL; + int poll_result, i, j; PyObject *value = NULL, *num = NULL; + _PyTime_t timeout, ms, deadline; + int async_err = 0; - if (!PyArg_UnpackTuple(args, "poll", 0, 1, &tout)) { + if (!PyArg_ParseTuple(args, "|O:poll", &timeout_obj)) { return NULL; } /* Check values for timeout */ - if (tout == NULL || tout == Py_None) + if (timeout_obj == NULL || timeout_obj == Py_None) { timeout = -1; - else if (!PyNumber_Check(tout)) { - PyErr_SetString(PyExc_TypeError, - "timeout must be an integer or None"); - return NULL; + ms = -1; + deadline = 0; } else { - tout = PyNumber_Long(tout); - if (!tout) + if (_PyTime_FromMillisecondsObject(&timeout, timeout_obj, + _PyTime_ROUND_CEILING) < 0) { + if (PyErr_ExceptionMatches(PyExc_TypeError)) { + PyErr_SetString(PyExc_TypeError, + "timeout must be an integer or None"); + } return NULL; - timeout = _PyLong_AsInt(tout); - Py_DECREF(tout); - if (timeout == -1 && PyErr_Occurred()) + } + + ms = _PyTime_AsMilliseconds(timeout, _PyTime_ROUND_CEILING); + if (ms < INT_MIN || ms > INT_MAX) { + PyErr_SetString(PyExc_OverflowError, "timeout is too large"); return NULL; + } + + deadline = _PyTime_GetMonotonicClock() + timeout; } /* Avoid concurrent poll() invocation, issue 8865 */ @@ -561,14 +571,38 @@ self->poll_running = 1; /* call poll() */ - Py_BEGIN_ALLOW_THREADS - poll_result = poll(self->ufds, self->ufd_len, timeout); - Py_END_ALLOW_THREADS + async_err = 0; + do { + Py_BEGIN_ALLOW_THREADS + errno = 0; + poll_result = poll(self->ufds, self->ufd_len, (int)ms); + Py_END_ALLOW_THREADS + + if (errno != EINTR) + break; + + /* poll() was interrupted by a signal */ + if (PyErr_CheckSignals()) { + async_err = 1; + break; + } + + if (timeout >= 0) { + timeout = deadline - _PyTime_GetMonotonicClock(); + if (timeout < 0) { + poll_result = 0; + break; + } + ms = _PyTime_AsMilliseconds(timeout, _PyTime_ROUND_CEILING); + /* retry poll() with the recomputed timeout */ + } + } while (1); self->poll_running = 0; if (poll_result < 0) { - PyErr_SetFromErrno(PyExc_OSError); + if (!async_err) + PyErr_SetFromErrno(PyExc_OSError); return NULL; } @@ -577,41 +611,40 @@ result_list = PyList_New(poll_result); if (!result_list) return NULL; - else { - for (i = 0, j = 0; j < poll_result; j++) { - /* skip to the next fired descriptor */ - while (!self->ufds[i].revents) { - i++; - } - /* if we hit a NULL return, set value to NULL - and break out of loop; code at end will - clean up result_list */ - value = PyTuple_New(2); - if (value == NULL) - goto error; - num = PyLong_FromLong(self->ufds[i].fd); - if (num == NULL) { - Py_DECREF(value); - goto error; - } - PyTuple_SET_ITEM(value, 0, num); - /* The &0xffff is a workaround for AIX. 'revents' - is a 16-bit short, and IBM assigned POLLNVAL - to be 0x8000, so the conversion to int results - in a negative number. See SF bug #923315. */ - num = PyLong_FromLong(self->ufds[i].revents & 0xffff); - if (num == NULL) { - Py_DECREF(value); - goto error; - } - PyTuple_SET_ITEM(value, 1, num); - if ((PyList_SetItem(result_list, j, value)) == -1) { - Py_DECREF(value); - goto error; - } + for (i = 0, j = 0; j < poll_result; j++) { + /* skip to the next fired descriptor */ + while (!self->ufds[i].revents) { i++; } + /* if we hit a NULL return, set value to NULL + and break out of loop; code at end will + clean up result_list */ + value = PyTuple_New(2); + if (value == NULL) + goto error; + num = PyLong_FromLong(self->ufds[i].fd); + if (num == NULL) { + Py_DECREF(value); + goto error; + } + PyTuple_SET_ITEM(value, 0, num); + + /* The &0xffff is a workaround for AIX. 'revents' + is a 16-bit short, and IBM assigned POLLNVAL + to be 0x8000, so the conversion to int results + in a negative number. See SF bug #923315. */ + num = PyLong_FromLong(self->ufds[i].revents & 0xffff); + if (num == NULL) { + Py_DECREF(value); + goto error; + } + PyTuple_SET_ITEM(value, 1, num); + if ((PyList_SetItem(result_list, j, value)) == -1) { + Py_DECREF(value); + goto error; + } + i++; } return result_list; -- Repository URL: https://hg.python.org/cpython [View Less]

1 0

cpython: Issue #23485: Fix test_signal, select.select() now retries the syscall if the
by victor.stinner March 30, 2015

March 30, 2015

https://hg.python.org/cpython/rev/17b6d0d7da00 changeset: 95305:17b6d0d7da00 user: Victor Stinner <victor.stinner(a)gmail.com> date: Mon Mar 30 22:09:14 2015 +0200 summary: Issue #23485: Fix test_signal, select.select() now retries the syscall if the signal handler does not raise an exception files: Lib/test/test_signal.py | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py --- … [View More]

1 0

cpython: Ignore .rst files in the venv directory.
by brett.cannon March 30, 2015

March 30, 2015

https://hg.python.org/cpython/rev/aef4371ec800 changeset: 95304:aef4371ec800 user: Brett Cannon <brett(a)python.org> date: Mon Mar 30 15:35:37 2015 -0400 summary: Ignore .rst files in the venv directory. files: Doc/conf.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Doc/conf.py b/Doc/conf.py --- a/Doc/conf.py +++ b/Doc/conf.py @@ -36,6 +36,9 @@ # Require Sphinx 1.2 for build. needs_sphinx = '1.2' +# Ignore any .rst files in the venv/ … [View More]

1 0

cpython: PEP 475: on EINTR, retry the function even if the timeout is equals to zero
by victor.stinner March 30, 2015

March 30, 2015

https://hg.python.org/cpython/rev/85fea45ca94d changeset: 95303:85fea45ca94d user: Victor Stinner <victor.stinner(a)gmail.com> date: Mon Mar 30 21:33:51 2015 +0200 summary: PEP 475: on EINTR, retry the function even if the timeout is equals to zero Retry: * signal.sigtimedwait() * threading.Lock.acquire() * threading.RLock.acquire() * time.sleep() files: Modules/_threadmodule.c | 2 +- Modules/signalmodule.c | 2 +- Modules/timemodule.c | 2 +- 3 files … [View More]

1 0

cpython: Issue #23485: select.select() is now retried automatically with the recomputed
by victor.stinner March 30, 2015

March 30, 2015

https://hg.python.org/cpython/rev/0ff1090307c7 changeset: 95302:0ff1090307c7 user: Victor Stinner <victor.stinner(a)gmail.com> date: Mon Mar 30 21:16:11 2015 +0200 summary: Issue #23485: select.select() is now retried automatically with the recomputed timeout when interrupted by a signal, except if the signal handler raises an exception. This change is part of the PEP 475. The asyncore and selectors module doesn't catch the InterruptedError exception anymore when … [View More]calling select.select(), since this function should not raise InterruptedError anymore. files: Doc/library/errno.rst | 5 +- Doc/library/exceptions.rst | 7 ++- Doc/library/select.rst | 7 ++ Doc/whatsnew/3.5.rst | 14 ++-- Lib/asyncore.py | 5 +- Lib/selectors.py | 5 +- Lib/test/eintrdata/eintr_tester.py | 16 +++++- Misc/NEWS | 4 + Modules/selectmodule.c | 53 +++++++++++++---- 9 files changed, 85 insertions(+), 31 deletions(-) diff --git a/Doc/library/errno.rst b/Doc/library/errno.rst --- a/Doc/library/errno.rst +++ b/Doc/library/errno.rst @@ -41,7 +41,10 @@ .. data:: EINTR - Interrupted system call + Interrupted system call. + + .. seealso:: + This error is mapped to the exception :exc:`InterruptedError`. .. data:: EIO diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -536,7 +536,12 @@ .. exception:: InterruptedError Raised when a system call is interrupted by an incoming signal. - Corresponds to :c:data:`errno` ``EINTR``. + Corresponds to :c:data:`errno` :py:data:`~errno.EINTR`. + + .. versionchanged:: 3.5 + Python now retries system calls when a syscall is interrupted by a + signal, except if the signal handler raises an exception (see :pep:`475` + for the rationale), instead of raising :exc:`InterruptedError`. .. exception:: IsADirectoryError diff --git a/Doc/library/select.rst b/Doc/library/select.rst --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -145,6 +145,13 @@ library, and does not handle file descriptors that don't originate from WinSock. + .. versionchanged:: 3.5 + The function is now retried with a recomputed timeout when interrupted by + a signal, except if the signal handler raises an exception (see + :pep:`475` for the rationale), instead of raising + :exc:`InterruptedError`. + + .. attribute:: PIPE_BUF The minimum number of bytes which can be written without blocking to a pipe diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -173,9 +173,10 @@ PEP 475: Retry system calls failing with EINTR ---------------------------------------------- -:pep:`475` adds support for automatic retry of system calls failing with EINTR: -this means that user code doesn't have to deal with EINTR or InterruptedError -manually, and should make it more robust against asynchronous signal reception. +:pep:`475` adds support for automatic retry of system calls failing with +:py:data:`~errno.EINTR`: this means that user code doesn't have to deal with +EINTR or :exc:`InterruptedError` manually, and should make it more robust +against asynchronous signal reception. .. seealso:: @@ -614,12 +615,13 @@ Changes in the Python API ------------------------- -* :pep:`475`: the following functions are now retried when interrupted instead - of raising :exc:`InterruptedError` if the signal handler does not raise - an exception: +* :pep:`475`: Examples of functions which are now retried when interrupted + instead of raising :exc:`InterruptedError` if the signal handler does not + raise an exception: - :func:`os.open`, :func:`open` - :func:`os.read`, :func:`os.write` + - :func:`select.select` - :func:`time.sleep` * Before Python 3.5, a :class:`datetime.time` object was considered to be false diff --git a/Lib/asyncore.py b/Lib/asyncore.py --- a/Lib/asyncore.py +++ b/Lib/asyncore.py @@ -141,10 +141,7 @@ time.sleep(timeout) return - try: - r, w, e = select.select(r, w, e, timeout) - except InterruptedError: - return + r, w, e = select.select(r, w, e, timeout) for fd in r: obj = map.get(fd) diff --git a/Lib/selectors.py b/Lib/selectors.py --- a/Lib/selectors.py +++ b/Lib/selectors.py @@ -310,10 +310,7 @@ def select(self, timeout=None): timeout = None if timeout is None else max(timeout, 0) ready = [] - try: - r, w, _ = self._select(self._readers, self._writers, [], timeout) - except InterruptedError: - return ready + r, w, _ = self._select(self._readers, self._writers, [], timeout) r = set(r) w = set(w) for fd in r | w: diff --git a/Lib/test/eintrdata/eintr_tester.py b/Lib/test/eintrdata/eintr_tester.py --- a/Lib/test/eintrdata/eintr_tester.py +++ b/Lib/test/eintrdata/eintr_tester.py @@ -10,6 +10,7 @@ import io import os +import select import signal import socket import time @@ -303,12 +304,25 @@ self.assertGreaterEqual(dt, self.sleep_time) +(a)unittest.skipUnless(hasattr(signal, "setitimer"), "requires setitimer()") +class SelectEINTRTest(EINTRBaseTest): + """ EINTR tests for the select module. """ + + def test_select(self): + t0 = time.monotonic() + select.select([], [], [], self.sleep_time) + signal.alarm(0) + dt = time.monotonic() - t0 + self.assertGreaterEqual(dt, self.sleep_time) + + def test_main(): support.run_unittest( OSEINTRTest, SocketEINTRTest, TimeEINTRTest, - SignalEINTRTest) + SignalEINTRTest, + SelectEINTRTest) if __name__ == "__main__": diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,6 +13,10 @@ Library ------- +- Issue #23485: select.select() is now retried automatically with the + recomputed timeout when interrupted by a signal, except if the signal handler + raises an exception. This change is part of the PEP 475. + - Issue #23752: When built from an existing file descriptor, io.FileIO() now only calls fstat() once. Before fstat() was called twice, which was not necessary. diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -193,29 +193,31 @@ #endif /* SELECT_USES_HEAP */ PyObject *ifdlist, *ofdlist, *efdlist; PyObject *ret = NULL; - PyObject *tout = Py_None; + PyObject *timeout_obj = Py_None; fd_set ifdset, ofdset, efdset; struct timeval tv, *tvp; int imax, omax, emax, max; int n; + _PyTime_t timeout, deadline = 0; /* convert arguments */ if (!PyArg_UnpackTuple(args, "select", 3, 4, - &ifdlist, &ofdlist, &efdlist, &tout)) + &ifdlist, &ofdlist, &efdlist, &timeout_obj)) return NULL; - if (tout == Py_None) - tvp = (struct timeval *)0; + if (timeout_obj == Py_None) + tvp = (struct timeval *)NULL; else { - _PyTime_t ts; - - if (_PyTime_FromSecondsObject(&ts, tout, _PyTime_ROUND_CEILING) < 0) { - PyErr_SetString(PyExc_TypeError, - "timeout must be a float or None"); + if (_PyTime_FromSecondsObject(&timeout, timeout_obj, + _PyTime_ROUND_CEILING) < 0) { + if (PyErr_ExceptionMatches(PyExc_TypeError)) { + PyErr_SetString(PyExc_TypeError, + "timeout must be a float or None"); + } return NULL; } - if (_PyTime_AsTimeval(ts, &tv, _PyTime_ROUND_CEILING) == -1) + if (_PyTime_AsTimeval(timeout, &tv, _PyTime_ROUND_CEILING) == -1) return NULL; if (tv.tv_sec < 0) { PyErr_SetString(PyExc_ValueError, "timeout must be non-negative"); @@ -224,7 +226,6 @@ tvp = &tv; } - #ifdef SELECT_USES_HEAP /* Allocate memory for the lists */ rfd2obj = PyMem_NEW(pylist, FD_SETSIZE + 1); @@ -237,6 +238,7 @@ return PyErr_NoMemory(); } #endif /* SELECT_USES_HEAP */ + /* Convert sequences to fd_sets, and get maximum fd number * propagates the Python exception set in seq2set() */ @@ -249,13 +251,36 @@ goto finally; if ((emax=seq2set(efdlist, &efdset, efd2obj)) < 0) goto finally; + max = imax; if (omax > max) max = omax; if (emax > max) max = emax; - Py_BEGIN_ALLOW_THREADS - n = select(max, &ifdset, &ofdset, &efdset, tvp); - Py_END_ALLOW_THREADS + if (tvp) + deadline = _PyTime_GetMonotonicClock() + timeout; + + do { + Py_BEGIN_ALLOW_THREADS + errno = 0; + n = select(max, &ifdset, &ofdset, &efdset, tvp); + Py_END_ALLOW_THREADS + + if (errno != EINTR) + break; + + /* select() was interrupted by a signal */ + if (PyErr_CheckSignals()) + goto finally; + + if (tvp) { + timeout = deadline - _PyTime_GetMonotonicClock(); + if (timeout < 0) { + n = 0; + break; + } + _PyTime_AsTimeval_noraise(timeout, &tv, _PyTime_ROUND_CEILING); + } + } while (1); #ifdef MS_WINDOWS if (n == SOCKET_ERROR) { -- Repository URL: https://hg.python.org/cpython [View Less]

1 0

cpython: Partially revert 3603bae63c13 (issue23326) for asyncio.
by serhiy.storchaka March 30, 2015

March 30, 2015

https://hg.python.org/cpython/rev/e881444f078f changeset: 95301:e881444f078f user: Serhiy Storchaka <storchaka(a)gmail.com> date: Mon Mar 30 22:25:16 2015 +0300 summary: Partially revert 3603bae63c13 (issue23326) for asyncio. files: Lib/asyncio/events.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py --- a/Lib/asyncio/events.py +++ b/Lib/asyncio/events.py @@ -178,6 +178,10 @@ … [View More]

1 0

cpython: #2211: Fix typo, address missed review comment.
by r.david.murray March 30, 2015

March 30, 2015

https://hg.python.org/cpython/rev/a70ca6f35327 changeset: 95300:a70ca6f35327 user: R David Murray <rdmurray(a)bitdance.com> date: Mon Mar 30 11:48:50 2015 -0400 summary: #2211: Fix typo, address missed review comment. files: Doc/library/http.cookies.rst | 6 ++++++ Doc/whatsnew/3.5.rst | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Doc/library/http.cookies.rst b/Doc/library/http.cookies.rst --- a/Doc/library/http.cookies.rst +++ … [View More]

1 0

cpython (3.4): #23792: also catch interrupt around pipe.write.
by r.david.murray March 30, 2015

March 30, 2015

https://hg.python.org/cpython/rev/7a5f30babc72 changeset: 95298:7a5f30babc72 branch: 3.4 parent: 95293:9d3013a383eb user: R David Murray <rdmurray(a)bitdance.com> date: Mon Mar 30 10:14:47 2015 -0400 summary: #23792: also catch interrupt around pipe.write. The previous patch only dealt with KeyboardInterrupt when all of the data had been consumed by the pager. This deals with the interrupt when some data is still pending. files: Lib/pydoc.py | 7 ++++++- … [View More]

1 0

cpython (merge 3.4 -> default): Merge: #23792: also catch interrupt around pipe.write.
by r.david.murray March 30, 2015

March 30, 2015

https://hg.python.org/cpython/rev/536c4f4acae1 changeset: 95299:536c4f4acae1 parent: 95297:00c982c9f681 parent: 95298:7a5f30babc72 user: R David Murray <rdmurray(a)bitdance.com> date: Mon Mar 30 10:15:22 2015 -0400 summary: Merge: #23792: also catch interrupt around pipe.write. files: Lib/pydoc.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1451,7 +1451,… [View More]

1 0