cpython: e8246baad0f6 (original) (raw)

--- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -597,7 +597,7 @@ internal_setblocking(PySocketSockObject after they've reacquired the interpreter lock. Returns 1 on timeout, -1 on error, 0 otherwise. */ static int -internal_select_ex(PySocketSockObject *s, int writing, _PyTime_t interval) +internal_select(PySocketSockObject *s, int writing, _PyTime_t interval) { int n; #ifdef HAVE_POLL @@ -664,12 +664,6 @@ internal_select_ex(PySocketSockObject *s return 0; } -static int -internal_select(PySocketSockObject *s, int writing) -{

return internal_select_ex(s, writing, s->sock_timeout);

-} - /* Two macros for automatic retry of select() in case of false positives (for example, select() could indicate a socket is ready for reading @@ -678,7 +672,7 @@ internal_select(PySocketSockObject *s, i BEGIN_SELECT_LOOP(s)

timeout = internal_select_ex(s, 0, interval);

timeout = internal_select(s, 0, interval);

if (!timeout) { Py_BEGIN_ALLOW_THREADS @@ -2075,7 +2069,7 @@ sock_accept(PySocketSockObject *s) BEGIN_SELECT_LOOP(s) do {

   timeout = internal_select_ex(s, 0, interval);[](#l1.38)

   timeout = internal_select(s, 0, interval);[](#l1.39)

if (!timeout) { Py_BEGIN_ALLOW_THREADS @@ -2498,7 +2492,7 @@ internal_connect(PySocketSockObject *s, if (s->sock_timeout > 0 && res < 0 && errno == EINPROGRESS && IS_SELECTABLE(s)) {

   timeout = internal_select(s, 1);[](#l1.47)

   timeout = internal_select(s, 1, s->sock_timeout);[](#l1.48)

if (timeout == 0) { /* Bug #1019808: in case of an EINPROGRESS, @@ -2731,7 +2725,7 @@ sock_recv_guts(PySocketSockObject *s, ch BEGIN_SELECT_LOOP(s) do {

   timeout = internal_select_ex(s, 0, interval);[](#l1.56)

   timeout = internal_select(s, 0, interval);[](#l1.57)

if (!timeout) { Py_BEGIN_ALLOW_THREADS @@ -2907,7 +2901,7 @@ sock_recvfrom_guts(PySocketSockObject *s BEGIN_SELECT_LOOP(s) do { memset(&addrbuf, 0, addrlen);

   timeout = internal_select_ex(s, 0, interval);[](#l1.65)

   timeout = internal_select(s, 0, interval);[](#l1.66)

if (!timeout) { Py_BEGIN_ALLOW_THREADS @@ -3114,7 +3108,7 @@ sock_recvmsg_guts(PySocketSockObject *s, msg.msg_iovlen = iovlen; msg.msg_control = controlbuf; msg.msg_controllen = controllen;

   timeout = internal_select_ex(s, 0, interval);[](#l1.74)

   timeout = internal_select(s, 0, interval);[](#l1.75)

if (timeout == 1) { PyErr_SetString(socket_timeout, "timed out"); @@ -3407,7 +3401,7 @@ sock_send(PySocketSockObject *s, PyObjec BEGIN_SELECT_LOOP(s) do {

   timeout = internal_select_ex(s, 1, interval);[](#l1.83)

   timeout = internal_select(s, 1, interval);[](#l1.84)

if (!timeout) { Py_BEGIN_ALLOW_THREADS @@ -3464,7 +3458,7 @@ sock_sendall(PySocketSockObject *s, PyOb } do {

   timeout = internal_select(s, 1);[](#l1.92)

   timeout = internal_select(s, 1, s->sock_timeout);[](#l1.93)

n = -1; if (!timeout) { @@ -3554,7 +3548,7 @@ sock_sendto(PySocketSockObject *s, PyObj BEGIN_SELECT_LOOP(s) do {

   timeout = internal_select_ex(s, 1, interval);[](#l1.101)

   timeout = internal_select(s, 1, interval);[](#l1.102)

if (!timeout) { Py_BEGIN_ALLOW_THREADS @@ -3770,7 +3764,7 @@ sock_sendmsg(PySocketSockObject *s, PyOb BEGIN_SELECT_LOOP(s) do {

   timeout = internal_select_ex(s, 1, interval);[](#l1.110)

   timeout = internal_select(s, 1, interval);[](#l1.111)

if (!timeout) { Py_BEGIN_ALLOW_THREADS;