[Python-checkins] [3.6] bpo-31334: Fix timeout in select.poll.poll() (GH-3277) (#4033)
Serhiy Storchaka
webhook-mailer at python.org
Wed Oct 18 08:05:19 EDT 2017
https://github.com/python/cpython/commit/97abcabc195b87d6a5562dbb867a469fac27d3f6
commit: 97abcabc195b87d6a5562dbb867a469fac27d3f6
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-18T15:05:16+03:00
summary:
[3.6] bpo-31334: Fix timeout in select.poll.poll() (GH-3277) (#4033)
Always pass -1, or INFTIM where defined, to the poll() system call when
a negative timeout is passed to the poll.poll([timeout]) method in the
select module. Various OSes throw an error with arbitrary negative
values.
(cherry picked from commit 6cfa927ceb931ad968b5b03e4a2bffb64a8a0604)
files:
A Misc/NEWS.d/next/Library/2017-09-04-00-22-31.bpo-31334.9WYRfi.rst
M Lib/test/test_poll.py
M Misc/ACKS
M Modules/selectmodule.c
diff --git a/Lib/test/test_poll.py b/Lib/test/test_poll.py
index 2a393601131..e8725c3df8f 100644
--- a/Lib/test/test_poll.py
+++ b/Lib/test/test_poll.py
@@ -211,7 +211,7 @@ def test_threaded_poll(self):
@unittest.skipUnless(threading, 'Threading required for this test.')
@reap_threads
def test_poll_blocks_with_negative_ms(self):
- for timeout_ms in [None, -1, -1.0, -0.1, -1e-100]:
+ for timeout_ms in [None, -1000, -1, -1.0, -0.1, -1e-100]:
# Create two file descriptors. This will be used to unlock
# the blocking call to poll.poll inside the thread
r, w = os.pipe()
diff --git a/Misc/ACKS b/Misc/ACKS
index c9dbf9f5560..a956acd6ecf 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -290,6 +290,7 @@ Brad Clements
Robbie Clemons
Steve Clift
Hervé Coatanhay
+Riccardo Coccioli
Nick Coghlan
Josh Cogliati
Dave Cole
diff --git a/Misc/NEWS.d/next/Library/2017-09-04-00-22-31.bpo-31334.9WYRfi.rst b/Misc/NEWS.d/next/Library/2017-09-04-00-22-31.bpo-31334.9WYRfi.rst
new file mode 100644
index 00000000000..1cbfd2531bc
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-09-04-00-22-31.bpo-31334.9WYRfi.rst
@@ -0,0 +1,3 @@
+Fix ``poll.poll([timeout])`` in the ``select`` module for arbitrary negative
+timeouts on all OSes where it can only be a non-negative integer or -1.
+Patch by Riccardo Coccioli.
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 9ae583be244..1de8bf7e4d5 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -528,20 +528,14 @@ poll_poll(pollObject *self, PyObject *args)
PyObject *result_list = NULL, *timeout_obj = NULL;
int poll_result, i, j;
PyObject *value = NULL, *num = NULL;
- _PyTime_t timeout, ms, deadline;
+ _PyTime_t timeout = -1, ms = -1, deadline = 0;
int async_err = 0;
if (!PyArg_ParseTuple(args, "|O:poll", &timeout_obj)) {
return NULL;
}
- /* Check values for timeout */
- if (timeout_obj == NULL || timeout_obj == Py_None) {
- timeout = -1;
- ms = -1;
- deadline = 0; /* initialize to prevent gcc warning */
- }
- else {
+ if (timeout_obj != NULL && timeout_obj != Py_None) {
if (_PyTime_FromMillisecondsObject(&timeout, timeout_obj,
_PyTime_ROUND_TIMEOUT) < 0) {
if (PyErr_ExceptionMatches(PyExc_TypeError)) {
@@ -557,7 +551,20 @@ poll_poll(pollObject *self, PyObject *args)
return NULL;
}
- deadline = _PyTime_GetMonotonicClock() + timeout;
+ if (timeout >= 0) {
+ deadline = _PyTime_GetMonotonicClock() + timeout;
+ }
+ }
+
+ /* On some OSes, typically BSD-based ones, the timeout parameter of the
+ poll() syscall, when negative, must be exactly INFTIM, where defined,
+ or -1. See issue 31334. */
+ if (ms < 0) {
+#ifdef INFTIM
+ ms = INFTIM;
+#else
+ ms = -1;
+#endif
}
/* Avoid concurrent poll() invocation, issue 8865 */
More information about the Python-checkins
mailing list