[Python-checkins] cpython: Issue #23834: Simplify timeout handling
victor.stinner
python-checkins at python.org
Fri Apr 3 13:36:57 CEST 2015
https://hg.python.org/cpython/rev/7a9c49885cd3
changeset: 95409:7a9c49885cd3
user: Victor Stinner <victor.stinner at gmail.com>
date: Fri Apr 03 13:22:27 2015 +0200
summary:
Issue #23834: Simplify timeout handling
* Use the new _PyTime_FromSeconds() function to set the timeout to -1 second
for socket.settimeout(None). It avoids a special case in internal_select()
because of a rounding issue: -1 nanosecond is rounded to 0 millisecond which
means non-blocking, instead of blocking.
* Check if the interval the negative in sock_call_ex() instead of doing the
check in internal_select(). sock_call_ex() remembers if the socket has a
timeout or not, which avoids a race condition if the timeout is modified in a
different thread.
files:
Modules/socketmodule.c | 42 ++++++++++--------------------
1 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -629,17 +629,6 @@
if (s->sock_fd < 0)
return 0;
- /* for connect(), we want to poll even if the socket is blocking */
- if (!connect) {
- /* Nothing to do unless we're in timeout mode (not non-blocking) */
- if (s->sock_timeout <= 0)
- return 0;
-
- /* Handling this condition here simplifies the select loops */
- if (interval < 0)
- return 1;
- }
-
/* Prefer poll, if available, since you can poll() any fd
* which can't be done with select(). */
#ifdef HAVE_POLL
@@ -654,22 +643,14 @@
}
/* s->sock_timeout is in seconds, timeout in ms */
- if (interval >= 0)
- ms = _PyTime_AsMilliseconds(interval, _PyTime_ROUND_CEILING);
- else
- ms = -1;
+ ms = _PyTime_AsMilliseconds(interval, _PyTime_ROUND_CEILING);
assert(ms <= INT_MAX);
Py_BEGIN_ALLOW_THREADS;
n = poll(&pollfd, 1, (int)ms);
Py_END_ALLOW_THREADS;
#else
- if (interval >= 0)
- _PyTime_AsTimeval_noraise(interval, &tv, _PyTime_ROUND_CEILING);
- else {
- tv.tv_sec = -1;
- tv.tv_sec = 0;
- }
+ _PyTime_AsTimeval_noraise(interval, &tv, _PyTime_ROUND_CEILING);
FD_ZERO(&fds);
FD_SET(s->sock_fd, &fds);
@@ -741,9 +722,9 @@
/* For connect(), poll even for blocking socket. The connection
runs asynchronously. */
if (has_timeout || connect) {
- _PyTime_t interval;
-
if (has_timeout) {
+ _PyTime_t interval;
+
if (deadline_initialized) {
/* recompute the timeout */
interval = deadline - _PyTime_GetMonotonicClock();
@@ -753,11 +734,16 @@
deadline = _PyTime_GetMonotonicClock() + s->sock_timeout;
interval = s->sock_timeout;
}
+
+ if (interval >= 0)
+ res = internal_select(s, writing, interval, connect);
+ else
+ res = 1;
}
- else
- interval = -1;
-
- res = internal_select(s, writing, interval, connect);
+ else {
+ res = internal_select(s, writing, -1, connect);
+ }
+
if (res == -1) {
if (err)
*err = GET_SOCK_ERROR;
@@ -2332,7 +2318,7 @@
int overflow = 0;
if (timeout_obj == Py_None) {
- *timeout = -1;
+ *timeout = _PyTime_FromSeconds(-1);
return 0;
}
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list