Mailman 3 April 2015 - Python-checkins

cpython (3.4): Issue #22977: Fixed formatting Windows error messages on Wine.
by serhiy.storchaka April 2, 2015

April 2, 2015

https://hg.python.org/cpython/rev/7907746baa0d changeset: 95367:7907746baa0d branch: 3.4 parent: 95364:1ad7c0253abe user: Serhiy Storchaka <storchaka(a)gmail.com> date: Thu Apr 02 09:47:27 2015 +0300 summary: Issue #22977: Fixed formatting Windows error messages on Wine. Patch by Martin Panter. files: Lib/test/test_exceptions.py | 10 +++++++++- Misc/NEWS | 3 +++ Python/errors.c | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py --- a/Lib/test/test_exceptions.py +++ b/Lib/test/test_exceptions.py @@ -6,10 +6,11 @@ import pickle import weakref import errno +import ctypes from test.support import (TESTFN, captured_output, check_impl_detail, check_warnings, cpython_only, gc_collect, run_unittest, - no_tracing, unlink) + no_tracing, unlink, get_attribute) class NaiveException(Exception): def __init__(self, x): @@ -245,6 +246,13 @@ self.assertEqual(w.strerror, 'foo') self.assertEqual(w.filename, None) + def test_windows_message(self): + """Should fill in unknown error code in Windows error message""" + windll = get_attribute(ctypes, "windll") + code = int.from_bytes(b"\xE0msc", "big") + with self.assertRaisesRegex(OSError, hex(code)): + windll.kernel32.RaiseException(code, 0, 0, None) + def testAttributes(self): # test that exception attributes are happy diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #22977: Fixed formatting Windows error messages on Wine. + Patch by Martin Panter. + - Issue #23803: Fixed str.partition() and str.rpartition() when a separator is wider then partitioned string. diff --git a/Python/errors.c b/Python/errors.c --- a/Python/errors.c +++ b/Python/errors.c @@ -491,7 +491,7 @@ /* Only ever seen this in out-of-mem situations */ s_buf = NULL; - message = PyUnicode_FromFormat("Windows Error 0x%X", i); + message = PyUnicode_FromFormat("Windows Error 0x%x", i); } else { /* remove trailing cr/lf and dots */ while (len > 0 && (s_buf[len-1] <= L' ' || s_buf[len-1] == L'.')) @@ -600,7 +600,7 @@ NULL); /* no args */ if (len==0) { /* Only seen this in out of mem situations */ - message = PyUnicode_FromFormat("Windows Error 0x%X", err); + message = PyUnicode_FromFormat("Windows Error 0x%x", err); s_buf = NULL; } else { /* remove trailing cr/lf and dots */ -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Check deques against common sequence tests (except for slicing).
by raymond.hettinger April 2, 2015

April 2, 2015

https://hg.python.org/cpython/rev/393189326adb changeset: 95350:393189326adb user: Raymond Hettinger <python(a)rcn.com> date: Wed Apr 01 08:11:09 2015 -0700 summary: Check deques against common sequence tests (except for slicing). files: Lib/test/test_deque.py | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_deque.py b/Lib/test/test_deque.py --- a/Lib/test/test_deque.py +++ b/Lib/test/test_deque.py @@ -843,6 +843,21 @@ # SF bug #1486663 -- this used to erroneously raise a TypeError SubclassWithKwargs(newarg=1) +class TestSequence(seq_tests.CommonTest): + type2test = deque + + def test_getitem(self): + # For now, bypass tests that require slicing + pass + + def test_getslice(self): + # For now, bypass tests that require slicing + pass + + def test_subscript(self): + # For now, bypass tests that require slicing + pass + #============================================================================== libreftest = """ @@ -957,6 +972,7 @@ TestVariousIteratorArgs, TestSubclass, TestSubclassWithKwargs, + TestSequence, ) support.run_unittest(*test_classes) -- Repository URL: https://hg.python.org/cpython

3 2

cpython (merge 3.4 -> default): merge 3.4 (#23844)
by benjamin.peterson April 2, 2015

April 2, 2015

https://hg.python.org/cpython/rev/c27585e43e50 changeset: 95366:c27585e43e50 parent: 95363:920b700d9509 parent: 95364:1ad7c0253abe user: Benjamin Peterson <benjamin(a)python.org> date: Thu Apr 02 00:08:10 2015 -0400 summary: merge 3.4 (#23844) files: Lib/test/dh1024.pem | 7 +++++++ Lib/test/dh512.pem | 9 --------- Lib/test/test_ssl.py | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Lib/test/dh1024.pem b/Lib/test/dh1024.pem new file mode 100644 --- /dev/null +++ b/Lib/test/dh1024.pem @@ -0,0 +1,7 @@ +-----BEGIN DH PARAMETERS----- +MIGHAoGBAIbzw1s9CT8SV5yv6L7esdAdZYZjPi3qWFs61CYTFFQnf2s/d09NYaJt +rrvJhIzWavqnue71qXCf83/J3nz3FEwUU/L0mGyheVbsSHiI64wUo3u50wK5Igo0 +RNs/LD0irs7m0icZ//hijafTU+JOBiuA8zMI+oZfU7BGuc9XrUprAgEC +-----END DH PARAMETERS----- + +Generated with: openssl dhparam -out dh1024.pem 1024 diff --git a/Lib/test/dh512.pem b/Lib/test/dh512.pem deleted file mode 100644 --- a/Lib/test/dh512.pem +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN DH PARAMETERS----- -MEYCQQD1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWak -XUGfnHy9iUsiGSa6q6Jew1XpKgVfAgEC ------END DH PARAMETERS----- - -These are the 512 bit DH parameters from "Assigned Number for SKIP Protocols" -(http://www.skip-vpn.org/spec/numbers.html). -See there for how they were generated. -Note that g is not a generator, but this is not a problem since p is a safe prime. diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -64,7 +64,7 @@ NOKIACERT = data_file("nokia.pem") NULLBYTECERT = data_file("nullbytecert.pem") -DHFILE = data_file("dh512.pem") +DHFILE = data_file("dh1024.pem") BYTES_DHFILE = os.fsencode(DHFILE) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): replace 512 bit dh key with a 2014 bit one (closes #23844)
by benjamin.peterson April 2, 2015

April 2, 2015

https://hg.python.org/cpython/rev/1ad7c0253abe changeset: 95364:1ad7c0253abe branch: 3.4 parent: 95352:47451f6e7e75 user: Benjamin Peterson <benjamin(a)python.org> date: Thu Apr 02 00:04:06 2015 -0400 summary: replace 512 bit dh key with a 2014 bit one (closes #23844) Patch by Cédric Krier. files: Lib/test/dh1024.pem | 7 +++++++ Lib/test/dh512.pem | 9 --------- Lib/test/test_ssl.py | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Lib/test/dh1024.pem b/Lib/test/dh1024.pem new file mode 100644 --- /dev/null +++ b/Lib/test/dh1024.pem @@ -0,0 +1,7 @@ +-----BEGIN DH PARAMETERS----- +MIGHAoGBAIbzw1s9CT8SV5yv6L7esdAdZYZjPi3qWFs61CYTFFQnf2s/d09NYaJt +rrvJhIzWavqnue71qXCf83/J3nz3FEwUU/L0mGyheVbsSHiI64wUo3u50wK5Igo0 +RNs/LD0irs7m0icZ//hijafTU+JOBiuA8zMI+oZfU7BGuc9XrUprAgEC +-----END DH PARAMETERS----- + +Generated with: openssl dhparam -out dh1024.pem 1024 diff --git a/Lib/test/dh512.pem b/Lib/test/dh512.pem deleted file mode 100644 --- a/Lib/test/dh512.pem +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN DH PARAMETERS----- -MEYCQQD1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWak -XUGfnHy9iUsiGSa6q6Jew1XpKgVfAgEC ------END DH PARAMETERS----- - -These are the 512 bit DH parameters from "Assigned Number for SKIP Protocols" -(http://www.skip-vpn.org/spec/numbers.html). -See there for how they were generated. -Note that g is not a generator, but this is not a problem since p is a safe prime. diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -64,7 +64,7 @@ NOKIACERT = data_file("nokia.pem") NULLBYTECERT = data_file("nullbytecert.pem") -DHFILE = data_file("dh512.pem") +DHFILE = data_file("dh1024.pem") BYTES_DHFILE = os.fsencode(DHFILE) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): replace 512 bit dh key with a 2014 bit one (closes #23844)
by benjamin.peterson April 2, 2015

April 2, 2015

https://hg.python.org/cpython/rev/4f2391e86643 changeset: 95365:4f2391e86643 branch: 2.7 parent: 95353:5d88f6531872 user: Benjamin Peterson <benjamin(a)python.org> date: Thu Apr 02 00:04:06 2015 -0400 summary: replace 512 bit dh key with a 2014 bit one (closes #23844) Patch by Cédric Krier. files: Lib/test/dh1024.pem | 7 +++++++ Lib/test/dh512.pem | 9 --------- Lib/test/test_ssl.py | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Lib/test/dh1024.pem b/Lib/test/dh1024.pem new file mode 100644 --- /dev/null +++ b/Lib/test/dh1024.pem @@ -0,0 +1,7 @@ +-----BEGIN DH PARAMETERS----- +MIGHAoGBAIbzw1s9CT8SV5yv6L7esdAdZYZjPi3qWFs61CYTFFQnf2s/d09NYaJt +rrvJhIzWavqnue71qXCf83/J3nz3FEwUU/L0mGyheVbsSHiI64wUo3u50wK5Igo0 +RNs/LD0irs7m0icZ//hijafTU+JOBiuA8zMI+oZfU7BGuc9XrUprAgEC +-----END DH PARAMETERS----- + +Generated with: openssl dhparam -out dh1024.pem 1024 diff --git a/Lib/test/dh512.pem b/Lib/test/dh512.pem deleted file mode 100644 --- a/Lib/test/dh512.pem +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN DH PARAMETERS----- -MEYCQQD1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWak -XUGfnHy9iUsiGSa6q6Jew1XpKgVfAgEC ------END DH PARAMETERS----- - -These are the 512 bit DH parameters from "Assigned Number for SKIP Protocols" -(http://www.skip-vpn.org/spec/numbers.html). -See there for how they were generated. -Note that g is not a generator, but this is not a problem since p is a safe prime. diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -66,7 +66,7 @@ NOKIACERT = data_file("nokia.pem") NULLBYTECERT = data_file("nullbytecert.pem") -DHFILE = data_file("dh512.pem") +DHFILE = data_file("dh1024.pem") BYTES_DHFILE = DHFILE.encode(sys.getfilesystemencoding()) -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #23834: Fix sock_call(), set deadline_initialized to recompute the timeout
by victor.stinner April 2, 2015

April 2, 2015

https://hg.python.org/cpython/rev/920b700d9509 changeset: 95363:920b700d9509 user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Apr 02 03:22:49 2015 +0200 summary: Issue #23834: Fix sock_call(), set deadline_initialized to recompute the timeout files: Modules/socketmodule.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -723,6 +723,7 @@ interval = deadline - _PyTime_GetMonotonicClock(); } else { + deadline_initialized = 1; deadline = _PyTime_GetMonotonicClock() + s->sock_timeout; interval = s->sock_timeout; } -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #23834: Modify socket.sendall() to reuse sock_call() with
by victor.stinner April 1, 2015

April 1, 2015

https://hg.python.org/cpython/rev/b3c7ae99b8e0 changeset: 95362:b3c7ae99b8e0 user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Apr 01 22:53:26 2015 +0200 summary: Issue #23834: Modify socket.sendall() to reuse sock_call() with sock_send_impl() files: Modules/socketmodule.c | 50 ++++++++++++----------------- 1 files changed, 21 insertions(+), 29 deletions(-) diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -3501,10 +3501,10 @@ sock_sendall(PySocketSockObject *s, PyObject *args) { char *buf; - Py_ssize_t len, n = -1; - int async_err = 0; - int flags = 0, timeout; + Py_ssize_t len, n; + int flags = 0; Py_buffer pbuf; + struct sock_send ctx; if (!PyArg_ParseTuple(args, "y*|i:sendall", &pbuf, &flags)) return NULL; @@ -3517,38 +3517,30 @@ } do { - timeout = internal_select(s, 1, s->sock_timeout); - - n = -1; - if (!timeout) { - Py_BEGIN_ALLOW_THREADS -#ifdef MS_WINDOWS - if (len > INT_MAX) - len = INT_MAX; - n = send(s->sock_fd, buf, (int)len, flags); -#else - n = send(s->sock_fd, buf, len, flags); -#endif - Py_END_ALLOW_THREADS - } - if (timeout == 1) { + ctx.buf = buf; + ctx.len = len; + ctx.flags = flags; + if (sock_call(s, 1, sock_send_impl, &ctx) < 0) { PyBuffer_Release(&pbuf); - PyErr_SetString(socket_timeout, "timed out"); return NULL; } - if (n >= 0) { - buf += n; - len -= n; + n = ctx.result; + assert(n >= 0); + + buf += n; + len -= n; + + /* We must run our signal handlers before looping again. + send() can return a successful partial write when it is + interrupted, so we can't restrict ourselves to EINTR. */ + if (PyErr_CheckSignals()) { + PyBuffer_Release(&pbuf); + return NULL; } - } while (len > 0 && (n >= 0 || errno == EINTR) && - !(async_err = PyErr_CheckSignals())); + } while (len > 0); PyBuffer_Release(&pbuf); - if (n < 0 || async_err) - return (!async_err) ? s->errorhandler() : NULL; - - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } PyDoc_STRVAR(sendall_doc, -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #23834: Add sock_call() helper function
by victor.stinner April 1, 2015

April 1, 2015

https://hg.python.org/cpython/rev/358a2bcd0d0b changeset: 95361:358a2bcd0d0b user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Apr 01 21:57:09 2015 +0200 summary: Issue #23834: Add sock_call() helper function The BEGIN_SELECT_LOOP and END_SELECT_LOOP macros of socketmodule.c don't handle EINTR. Functions using these macros use an inner loop to handle EINTR, but they don't recompute the timeout. This changes replaces the two macros with a new sock_call() function which takes a function as a parameter. sock_call() recomputes the timeout, handle false positive and handle EINTR. files: Modules/socketmodule.c | 593 ++++++++++++++++------------ 1 files changed, 330 insertions(+), 263 deletions(-) diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -683,45 +683,113 @@ return internal_select_impl(s, 1, s->sock_timeout, 1); } -/* - Two macros for automatic retry of select() in case of false positives - (for example, select() could indicate a socket is ready for reading - but the data then discarded by the OS because of a wrong checksum). - Here is an example of use: - - BEGIN_SELECT_LOOP(s) - - timeout = internal_select(s, 0, interval); - - if (!timeout) { - Py_BEGIN_ALLOW_THREADS - outlen = recv(s->sock_fd, cbuf, len, flags); - Py_END_ALLOW_THREADS - } - if (timeout == 1) { - PyErr_SetString(socket_timeout, "timed out"); +/* Call a socket function. + + Raise an exception and return -1 on error, return 0 on success. + + If the socket has a timeout, wait until the socket is ready before calling + the function: wait until the socket is writable if writing is nonzero, wait + until the socket received data otherwise. + + If the function func is interrupted by a signal (failed with EINTR): retry + the function, except if the signal handler raised an exception (PEP 475). + + When the function is retried, recompute the timeout using a monotonic clock. + + sock_call() must be called with the GIL held. The function func is called + with the GIL released. */ +static int +sock_call(PySocketSockObject *s, + int writing, + int (*func) (PySocketSockObject *s, void *data), + void *data) +{ + int has_timeout = (s->sock_timeout > 0); + _PyTime_t deadline = 0; + int deadline_initialized = 0; + int res; + + /* sock_call() must be called with the GIL held. */ + assert(PyGILState_Check()); + + /* outer loop to retry select() when select() is interrupted by a signal + or to retry select()+func() on false positive (see above) */ + while (1) { + if (has_timeout) { + _PyTime_t interval; + + if (deadline_initialized) { + /* recompute the timeout */ + interval = deadline - _PyTime_GetMonotonicClock(); + } + else { + deadline = _PyTime_GetMonotonicClock() + s->sock_timeout; + interval = s->sock_timeout; + } + + res = internal_select(s, writing, interval); + if (res == -1) { + if (CHECK_ERRNO(EINTR)) { + /* select() was interrupted by a signal */ + if (PyErr_CheckSignals()) + return -1; + + /* retry select() */ + continue; + } + + /* select() failed */ + s->errorhandler(); + return -1; + } + + if (res == 1) { + PyErr_SetString(socket_timeout, "timed out"); + return -1; + } + + /* the socket is ready */ + } + + /* inner loop to retry func() when func() is interrupted by a signal */ + while (1) { + Py_BEGIN_ALLOW_THREADS + res = func(s, data); + Py_END_ALLOW_THREADS + + if (res) { + /* func() succeeded */ + return 0; + } + + if (!CHECK_ERRNO(EINTR)) + break; + + /* func() was interrupted by a signal */ + if (PyErr_CheckSignals()) + return -1; + + /* retry func() */ + } + + if (s->sock_timeout > 0 + && (CHECK_ERRNO(EWOULDBLOCK) || CHECK_ERRNO(EAGAIN))) { + /* False positive: func() failed with EWOULDBLOCK or EAGAIN. + + For example, select() could indicate a socket is ready for + reading, but the data then discarded by the OS because of a + wrong checksum. + + Loop on select() to recheck for socket readyness. */ + continue; + } + + /* func() failed */ + s->errorhandler(); return -1; } - END_SELECT_LOOP(s) -*/ - -#define BEGIN_SELECT_LOOP(s) \ - { \ - _PyTime_t deadline = 0; \ - _PyTime_t interval = s->sock_timeout; \ - int has_timeout = (s->sock_timeout > 0); \ - if (has_timeout) \ - deadline = _PyTime_GetMonotonicClock() + interval; \ - while (1) { \ - errno = 0; \ - -#define END_SELECT_LOOP(s) \ - if (!has_timeout || \ - (!CHECK_ERRNO(EWOULDBLOCK) && !CHECK_ERRNO(EAGAIN))) \ - break; \ - interval = deadline - _PyTime_GetMonotonicClock(); \ - } \ - } \ +} + /* Initialize a new socket object. */ @@ -2061,23 +2129,51 @@ #endif /* CMSG_LEN */ +struct sock_accept { + socklen_t *addrlen; + sock_addr_t *addrbuf; + SOCKET_T result; +}; + +#if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC) +/* accept4() is available on Linux 2.6.28+ and glibc 2.10 */ +static int accept4_works = -1; +#endif + +static int +sock_accept_impl(PySocketSockObject *s, void *data) +{ + struct sock_accept *ctx = data; + +#if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC) + if (accept4_works != 0) { + ctx->result = accept4(s->sock_fd, SAS2SA(ctx->addrbuf), ctx->addrlen, + SOCK_CLOEXEC); + if (ctx->result == INVALID_SOCKET && accept4_works == -1) { + /* On Linux older than 2.6.28, accept4() fails with ENOSYS */ + accept4_works = (errno != ENOSYS); + } + } + if (accept4_works == 0) + ctx->result = accept(s->sock_fd, SAS2SA(ctx->addrbuf), ctx->addrlen); +#else + ctx->result = accept(s->sock_fd, SAS2SA(ctx->addrbuf), ctx->addrlen); +#endif + return (ctx->result >= 0); +} + /* s._accept() -> (fd, address) */ static PyObject * sock_accept(PySocketSockObject *s) { sock_addr_t addrbuf; - SOCKET_T newfd = INVALID_SOCKET; + SOCKET_T newfd; socklen_t addrlen; PyObject *sock = NULL; PyObject *addr = NULL; PyObject *res = NULL; - int timeout; - int async_err = 0; -#if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC) - /* accept4() is available on Linux 2.6.28+ and glibc 2.10 */ - static int accept4_works = -1; -#endif + struct sock_accept ctx; if (!getsockaddrlen(s, &addrlen)) return NULL; @@ -2086,37 +2182,11 @@ if (!IS_SELECTABLE(s)) return select_error(); - BEGIN_SELECT_LOOP(s) - do { - timeout = internal_select(s, 0, interval); - - if (!timeout) { - Py_BEGIN_ALLOW_THREADS -#if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC) - if (accept4_works != 0) { - newfd = accept4(s->sock_fd, SAS2SA(&addrbuf), &addrlen, - SOCK_CLOEXEC); - if (newfd == INVALID_SOCKET && accept4_works == -1) { - /* On Linux older than 2.6.28, accept4() fails with ENOSYS */ - accept4_works = (errno != ENOSYS); - } - } - if (accept4_works == 0) - newfd = accept(s->sock_fd, SAS2SA(&addrbuf), &addrlen); -#else - newfd = accept(s->sock_fd, SAS2SA(&addrbuf), &addrlen); -#endif - Py_END_ALLOW_THREADS - } - } while (newfd < 0 && errno == EINTR && !(async_err = PyErr_CheckSignals())); - if (timeout == 1) { - PyErr_SetString(socket_timeout, "timed out"); + ctx.addrlen = &addrlen; + ctx.addrbuf = &addrbuf; + if (sock_call(s, 0, sock_accept_impl, &ctx) < 0) return NULL; - } - END_SELECT_LOOP(s) - - if (newfd == INVALID_SOCKET) - return (!async_err) ? s->errorhandler() : NULL; + newfd = ctx.result; #ifdef MS_WINDOWS if (!SetHandleInformation((HANDLE)newfd, HANDLE_FLAG_INHERIT, 0)) { @@ -2690,6 +2760,28 @@ unaccepted connections that the system will allow before refusing new\n\ connections. If not specified, a default reasonable value is chosen."); +struct sock_recv { + char *cbuf; + Py_ssize_t len; + int flags; + Py_ssize_t result; +}; + +static int +sock_recv_impl(PySocketSockObject *s, void *data) +{ + struct sock_recv *ctx = data; + +#ifdef MS_WINDOWS + if (ctx->len > INT_MAX) + ctx->len = INT_MAX; + ctx->result = recv(s->sock_fd, ctx->cbuf, (int)ctx->len, ctx->flags); +#else + ctx->result = recv(s->sock_fd, ctx->cbuf, ctx->len, ctx->flags); +#endif + return (ctx->result >= 0); +} + /* * This is the guts of the recv() and recv_into() methods, which reads into a @@ -2703,9 +2795,7 @@ static Py_ssize_t sock_recv_guts(PySocketSockObject *s, char* cbuf, Py_ssize_t len, int flags) { - Py_ssize_t outlen = -1; - int timeout; - int async_err = 0; + struct sock_recv ctx; if (!IS_SELECTABLE(s)) { select_error(); @@ -2716,36 +2806,13 @@ return 0; } - BEGIN_SELECT_LOOP(s) - do { - timeout = internal_select(s, 0, interval); - - if (!timeout) { - Py_BEGIN_ALLOW_THREADS -#ifdef MS_WINDOWS - if (len > INT_MAX) - len = INT_MAX; - outlen = recv(s->sock_fd, cbuf, (int)len, flags); -#else - outlen = recv(s->sock_fd, cbuf, len, flags); -#endif - Py_END_ALLOW_THREADS - } - } while (outlen < 0 && errno == EINTR && !(async_err = PyErr_CheckSignals())); - - if (timeout == 1) { - PyErr_SetString(socket_timeout, "timed out"); + ctx.cbuf = cbuf; + ctx.len = len; + ctx.flags = flags; + if (sock_call(s, 0, sock_recv_impl, &ctx) < 0) return -1; - } - END_SELECT_LOOP(s) - if (outlen < 0) { - /* Note: the call to errorhandler() ALWAYS indirectly returned - NULL, so ignore its return value */ - if (!async_err) - s->errorhandler(); - return -1; - } - return outlen; + + return ctx.result; } @@ -2859,6 +2926,34 @@ \n\ See recv() for documentation about the flags."); +struct sock_recvfrom { + char* cbuf; + Py_ssize_t len; + int flags; + socklen_t *addrlen; + sock_addr_t *addrbuf; + Py_ssize_t result; +}; + +static int +sock_recvfrom_impl(PySocketSockObject *s, void *data) +{ + struct sock_recvfrom *ctx = data; + + memset(ctx->addrbuf, 0, *ctx->addrlen); + +#ifdef MS_WINDOWS + if (ctx->len > INT_MAX) + ctx->len = INT_MAX; + ctx->result = recvfrom(s->sock_fd, ctx->cbuf, (int)ctx->len, ctx->flags, + SAS2SA(ctx->addrbuf), ctx->addrlen); +#else + ctx->result = recvfrom(s->sock_fd, ctx->cbuf, ctx->len, ctx->flags, + SAS2SA(ctx->addrbuf), ctx->addrlen); +#endif + return (ctx->result >= 0); +} + /* * This is the guts of the recvfrom() and recvfrom_into() methods, which reads @@ -2876,10 +2971,8 @@ PyObject** addr) { sock_addr_t addrbuf; - int timeout; - Py_ssize_t n = -1; socklen_t addrlen; - int async_err = 0; + struct sock_recvfrom ctx; *addr = NULL; @@ -2891,42 +2984,20 @@ return -1; } - BEGIN_SELECT_LOOP(s) - do { - memset(&addrbuf, 0, addrlen); - timeout = internal_select(s, 0, interval); - - if (!timeout) { - Py_BEGIN_ALLOW_THREADS -#ifdef MS_WINDOWS - if (len > INT_MAX) - len = INT_MAX; - n = recvfrom(s->sock_fd, cbuf, (int)len, flags, - (void *) &addrbuf, &addrlen); -#else - n = recvfrom(s->sock_fd, cbuf, len, flags, - SAS2SA(&addrbuf), &addrlen); -#endif - Py_END_ALLOW_THREADS - } - } while (n < 0 && errno == EINTR && !(async_err = PyErr_CheckSignals())); - - if (timeout == 1) { - PyErr_SetString(socket_timeout, "timed out"); + ctx.cbuf = cbuf; + ctx.len = len; + ctx.flags = flags; + ctx.addrbuf = &addrbuf; + ctx.addrlen = &addrlen; + if (sock_call(s, 0, sock_recvfrom_impl, &ctx) < 0) return -1; - } - END_SELECT_LOOP(s) - if (n < 0) { - if (!async_err) - s->errorhandler(); + + *addr = makesockaddr(s->sock_fd, SAS2SA(&addrbuf), addrlen, + s->sock_proto); + if (*addr == NULL) return -1; - } - - if (!(*addr = makesockaddr(s->sock_fd, SAS2SA(&addrbuf), - addrlen, s->sock_proto))) - return -1; - - return n; + + return ctx.result; } /* s.recvfrom(nbytes [,flags]) method */ @@ -3037,6 +3108,21 @@ \n\ Like recv_into(buffer[, nbytes[, flags]]) but also return the sender's address info."); +struct sock_recvmsg { + struct msghdr *msg; + int flags; + ssize_t result; +}; + +static int +sock_recvmsg_impl(PySocketSockObject *s, void *data) +{ + struct sock_recvmsg *ctx = data; + + ctx->result = recvmsg(s->sock_fd, ctx->msg, ctx->flags); + return (ctx->result >= 0); +} + /* The sendmsg() and recvmsg[_into]() methods require a working CMSG_LEN(). See the comment near get_CMSG_LEN(). */ @@ -3056,9 +3142,6 @@ int flags, Py_ssize_t controllen, PyObject *(*makeval)(ssize_t, void *), void *makeval_data) { - ssize_t bytes_received = -1; - int timeout; - int async_err = 0; sock_addr_t addrbuf; socklen_t addrbuflen; struct msghdr msg = {0}; @@ -3067,6 +3150,7 @@ struct cmsghdr *cmsgh; size_t cmsgdatalen = 0; int cmsg_status; + struct sock_recvmsg ctx; /* XXX: POSIX says that msg_name and msg_namelen "shall be ignored" when the socket is connected (Linux fills them in @@ -3093,35 +3177,17 @@ goto finally; } - BEGIN_SELECT_LOOP(s) - do { - msg.msg_name = SAS2SA(&addrbuf); - msg.msg_namelen = addrbuflen; - msg.msg_iov = iov; - msg.msg_iovlen = iovlen; - msg.msg_control = controlbuf; - msg.msg_controllen = controllen; - timeout = internal_select(s, 0, interval); - - if (timeout == 1) { - PyErr_SetString(socket_timeout, "timed out"); - goto finally; - } - - if (!timeout) { - Py_BEGIN_ALLOW_THREADS; - bytes_received = recvmsg(s->sock_fd, &msg, flags); - Py_END_ALLOW_THREADS; - } - } while (bytes_received < 0 && errno == EINTR && - !(async_err = PyErr_CheckSignals())); - END_SELECT_LOOP(s) - - if (bytes_received < 0) { - if (!async_err) - s->errorhandler(); + msg.msg_name = SAS2SA(&addrbuf); + msg.msg_namelen = addrbuflen; + msg.msg_iov = iov; + msg.msg_iovlen = iovlen; + msg.msg_control = controlbuf; + msg.msg_controllen = controllen; + + ctx.msg = &msg; + ctx.flags = flags; + if (sock_call(s, 0, sock_recvmsg_impl, &ctx) < 0) goto finally; - } /* Make list of (level, type, data) tuples from control messages. */ if ((cmsg_list = PyList_New(0)) == NULL) @@ -3163,7 +3229,7 @@ } retval = Py_BuildValue("NOiN", - (*makeval)(bytes_received, makeval_data), + (*makeval)(ctx.result, makeval_data), cmsg_list, (int)msg.msg_flags, makesockaddr(s->sock_fd, SAS2SA(&addrbuf), @@ -3371,16 +3437,36 @@ #endif /* CMSG_LEN */ +struct sock_send { + char *buf; + Py_ssize_t len; + int flags; + Py_ssize_t result; +}; + +static int +sock_send_impl(PySocketSockObject *s, void *data) +{ + struct sock_send *ctx = data; + +#ifdef MS_WINDOWS + if (ctx->len > INT_MAX) + ctx->len = INT_MAX; + ctx->result = send(s->sock_fd, ctx->buf, (int)ctx->len, ctx->flags); +#else + ctx->result = send(s->sock_fd, ctx->buf, ctx->len, ctx->flags); +#endif + return (ctx->result >= 0); +} + /* s.send(data [,flags]) method */ static PyObject * sock_send(PySocketSockObject *s, PyObject *args) { - char *buf; - Py_ssize_t len, n = -1; - int async_err = 0; - int flags = 0, timeout; + int flags = 0; Py_buffer pbuf; + struct sock_send ctx; if (!PyArg_ParseTuple(args, "y*|i:send", &pbuf, &flags)) return NULL; @@ -3389,36 +3475,16 @@ PyBuffer_Release(&pbuf); return select_error(); } - buf = pbuf.buf; - len = pbuf.len; - - BEGIN_SELECT_LOOP(s) - do { - timeout = internal_select(s, 1, interval); - - if (!timeout) { - Py_BEGIN_ALLOW_THREADS -#ifdef MS_WINDOWS - if (len > INT_MAX) - len = INT_MAX; - n = send(s->sock_fd, buf, (int)len, flags); -#else - n = send(s->sock_fd, buf, len, flags); -#endif - Py_END_ALLOW_THREADS - } - } while (n < 0 && errno == EINTR && !(async_err = PyErr_CheckSignals())); - if (timeout == 1) { + ctx.buf = pbuf.buf; + ctx.len = pbuf.len; + ctx.flags = flags; + if (sock_call(s, 1, sock_send_impl, &ctx) < 0) { PyBuffer_Release(&pbuf); - PyErr_SetString(socket_timeout, "timed out"); return NULL; } - END_SELECT_LOOP(s) - PyBuffer_Release(&pbuf); - if (n < 0) - return (!async_err) ? s->errorhandler() : NULL; - return PyLong_FromSsize_t(n); + + return PyLong_FromSsize_t(ctx.result); } PyDoc_STRVAR(send_doc, @@ -3494,6 +3560,32 @@ to tell how much data has been sent."); +struct sock_sendto { + char *buf; + Py_ssize_t len; + int flags; + int addrlen; + sock_addr_t *addrbuf; + Py_ssize_t result; +}; + +static int +sock_sendto_impl(PySocketSockObject *s, void *data) +{ + struct sock_sendto *ctx = data; + +#ifdef MS_WINDOWS + if (ctx->len > INT_MAX) + ctx->len = INT_MAX; + ctx->result = sendto(s->sock_fd, ctx->buf, (int)ctx->len, ctx->flags, + SAS2SA(ctx->addrbuf), ctx->addrlen); +#else + ctx->result = sendto(s->sock_fd, ctx->buf, ctx->len, ctx->flags, + SAS2SA(ctx->addrbuf), ctx->addrlen); +#endif + return (ctx->result >= 0); +} + /* s.sendto(data, [flags,] sockaddr) method */ static PyObject * @@ -3501,11 +3593,10 @@ { Py_buffer pbuf; PyObject *addro; - char *buf; - Py_ssize_t len, arglen; + Py_ssize_t arglen; sock_addr_t addrbuf; - int addrlen, n = -1, flags, timeout; - int async_err = 0; + int addrlen, flags; + struct sock_sendto ctx; flags = 0; arglen = PyTuple_Size(args); @@ -3526,9 +3617,6 @@ if (PyErr_Occurred()) return NULL; - buf = pbuf.buf; - len = pbuf.len; - if (!IS_SELECTABLE(s)) { PyBuffer_Release(&pbuf); return select_error(); @@ -3539,35 +3627,18 @@ return NULL; } - BEGIN_SELECT_LOOP(s) - do { - timeout = internal_select(s, 1, interval); - - if (!timeout) { - Py_BEGIN_ALLOW_THREADS -#ifdef MS_WINDOWS - if (len > INT_MAX) - len = INT_MAX; - n = sendto(s->sock_fd, buf, (int)len, flags, - SAS2SA(&addrbuf), addrlen); -#else - n = sendto(s->sock_fd, buf, len, flags, - SAS2SA(&addrbuf), addrlen); -#endif - Py_END_ALLOW_THREADS - } - } while (n < 0 && errno == EINTR && !(async_err = PyErr_CheckSignals())); - - if (timeout == 1) { + ctx.buf = pbuf.buf; + ctx.len = pbuf.len; + ctx.flags = flags; + ctx.addrlen = addrlen; + ctx.addrbuf = &addrbuf; + if (sock_call(s, 1, sock_sendto_impl, &ctx) < 0) { PyBuffer_Release(&pbuf); - PyErr_SetString(socket_timeout, "timed out"); return NULL; } - END_SELECT_LOOP(s) PyBuffer_Release(&pbuf); - if (n < 0) - return (!async_err) ? s->errorhandler() : NULL; - return PyLong_FromSsize_t(n); + + return PyLong_FromSsize_t(ctx.result); } PyDoc_STRVAR(sendto_doc, @@ -3577,6 +3648,21 @@ For IP sockets, the address is a pair (hostaddr, port)."); +struct sock_sendmsg { + struct msghdr *msg; + int flags; + ssize_t result; +}; + +static int +sock_sendmsg_impl(PySocketSockObject *s, void *data) +{ + struct sock_sendmsg *ctx = data; + + ctx->result = sendmsg(s->sock_fd, ctx->msg, ctx->flags); + return (ctx->result >= 0); +} + /* The sendmsg() and recvmsg[_into]() methods require a working CMSG_LEN(). See the comment near get_CMSG_LEN(). */ #ifdef CMSG_LEN @@ -3597,11 +3683,10 @@ } *cmsgs = NULL; void *controlbuf = NULL; size_t controllen, controllen_last; - ssize_t bytes_sent = -1; - int async_err = 0; - int addrlen, timeout, flags = 0; + int addrlen, flags = 0; PyObject *data_arg, *cmsg_arg = NULL, *addr_arg = NULL, *data_fast = NULL, *cmsg_fast = NULL, *retval = NULL; + struct sock_sendmsg ctx; if (!PyArg_ParseTuple(args, "O|OiO:sendmsg", &data_arg, &cmsg_arg, &flags, &addr_arg)) @@ -3755,30 +3840,12 @@ goto finally; } - BEGIN_SELECT_LOOP(s) - do { - timeout = internal_select(s, 1, interval); - - if (!timeout) { - Py_BEGIN_ALLOW_THREADS; - bytes_sent = sendmsg(s->sock_fd, &msg, flags); - Py_END_ALLOW_THREADS; - } - - if (timeout == 1) { - PyErr_SetString(socket_timeout, "timed out"); - goto finally; - } - } while (bytes_sent < 0 && errno == EINTR && - !(async_err = PyErr_CheckSignals())); - END_SELECT_LOOP(s) - - if (bytes_sent < 0) { - if (!async_err) - s->errorhandler(); + ctx.msg = &msg; + ctx.flags = flags; + if (sock_call(s, 1, sock_sendmsg_impl, &ctx) < 0) goto finally; - } - retval = PyLong_FromSsize_t(bytes_sent); + + retval = PyLong_FromSsize_t(ctx.result); finally: PyMem_Free(controlbuf); -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #23836: Use _Py_write_noraise() to retry on EINTR in child_exec() of
by victor.stinner April 1, 2015

April 1, 2015

https://hg.python.org/cpython/rev/e3c97621d8b4 changeset: 95358:e3c97621d8b4 user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Apr 01 18:35:53 2015 +0200 summary: Issue #23836: Use _Py_write_noraise() to retry on EINTR in child_exec() of _posixsubprocess files: Modules/_posixsubprocess.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c --- a/Modules/_posixsubprocess.c +++ b/Modules/_posixsubprocess.c @@ -382,7 +382,7 @@ PyObject *preexec_fn, PyObject *preexec_fn_args_tuple) { - int i, saved_errno, unused, reached_preexec = 0; + int i, saved_errno, reached_preexec = 0; PyObject *result; const char* err_msg = ""; /* Buffer large enough to hold a hex integer. We can't malloc. */ @@ -496,28 +496,29 @@ saved_errno = errno; /* Report the posix error to our parent process. */ /* We ignore all write() return values as the total size of our writes is - * less than PIPEBUF and we cannot do anything about an error anyways. */ + less than PIPEBUF and we cannot do anything about an error anyways. + Use _Py_write_noraise() to retry write() if it is interrupted by a + signal (fails with EINTR). */ if (saved_errno) { char *cur; - unused = write(errpipe_write, "OSError:", 8); + _Py_write_noraise(errpipe_write, "OSError:", 8); cur = hex_errno + sizeof(hex_errno); while (saved_errno != 0 && cur > hex_errno) { *--cur = "0123456789ABCDEF"[saved_errno % 16]; saved_errno /= 16; } - unused = write(errpipe_write, cur, hex_errno + sizeof(hex_errno) - cur); - unused = write(errpipe_write, ":", 1); + _Py_write_noraise(errpipe_write, cur, hex_errno + sizeof(hex_errno) - cur); + _Py_write_noraise(errpipe_write, ":", 1); if (!reached_preexec) { /* Indicate to the parent that the error happened before exec(). */ - unused = write(errpipe_write, "noexec", 6); + _Py_write_noraise(errpipe_write, "noexec", 6); } /* We can't call strerror(saved_errno). It is not async signal safe. * The parent process will look the error message up. */ } else { - unused = write(errpipe_write, "SubprocessError:0:", 18); - unused = write(errpipe_write, err_msg, strlen(err_msg)); + _Py_write_noraise(errpipe_write, "SubprocessError:0:", 18); + _Py_write_noraise(errpipe_write, err_msg, strlen(err_msg)); } - if (unused) return; /* silly? yes! avoids gcc compiler warning. */ } -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #23836: Use _Py_write_noraise() to retry on EINTR in _Py_DumpTraceback()
by victor.stinner April 1, 2015

April 1, 2015

https://hg.python.org/cpython/rev/29ab05c5e9dc changeset: 95359:29ab05c5e9dc user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Apr 01 18:38:01 2015 +0200 summary: Issue #23836: Use _Py_write_noraise() to retry on EINTR in _Py_DumpTraceback() and _Py_DumpTracebackThreads(). Document also these functions to explain that the caller is responsible to call PyErr_CheckSignals(). files: Python/traceback.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Python/traceback.c b/Python/traceback.c --- a/Python/traceback.c +++ b/Python/traceback.c @@ -13,7 +13,7 @@ #define OFF(x) offsetof(PyTracebackObject, x) -#define PUTS(fd, str) write(fd, str, (int)strlen(str)) +#define PUTS(fd, str) _Py_write_noraise(fd, str, (int)strlen(str)) #define MAX_STRING_LENGTH 500 #define MAX_FRAME_DEPTH 100 #define MAX_NTHREADS 100 @@ -512,7 +512,7 @@ len++; } while (value); reverse_string(buffer, len); - write(fd, buffer, len); + _Py_write_noraise(fd, buffer, len); } /* Format an integer in range [0; 0xffffffff] to hexadecimal of 'width' digits, @@ -532,7 +532,7 @@ len++; } while (len < width || value); reverse_string(buffer, len); - write(fd, buffer, len); + _Py_write_noraise(fd, buffer, len); } /* Write an unicode object into the file fd using ascii+backslashreplace. @@ -585,7 +585,7 @@ if (' ' <= ch && ch <= 126) { /* printable ASCII character */ char c = (char)ch; - write(fd, &c, 1); + _Py_write_noraise(fd, &c, 1); } else if (ch <= 0xff) { PUTS(fd, "\\x"); @@ -619,9 +619,9 @@ if (code != NULL && code->co_filename != NULL && PyUnicode_Check(code->co_filename)) { - write(fd, "\"", 1); + PUTS(fd, "\""); dump_ascii(fd, code->co_filename); - write(fd, "\"", 1); + PUTS(fd, "\""); } else { PUTS(fd, "???"); } @@ -638,7 +638,7 @@ else PUTS(fd, "???"); - write(fd, "\n", 1); + PUTS(fd, "\n"); } static void @@ -668,6 +668,12 @@ } } +/* Dump the traceback of a Python thread into fd. Use write() to write the + traceback and retry if write() is interrupted by a signal (failed with + EINTR), but don't call the Python signal handler. + + The caller is responsible to call PyErr_CheckSignals() to call Python signal + handlers if signals were received. */ void _Py_DumpTraceback(int fd, PyThreadState *tstate) { @@ -690,6 +696,12 @@ PUTS(fd, " (most recent call first):\n"); } +/* Dump the traceback of all Python threads into fd. Use write() to write the + traceback and retry if write() is interrupted by a signal (failed with + EINTR), but don't call the Python signal handler. + + The caller is responsible to call PyErr_CheckSignals() to call Python signal + handlers if signals were received. */ const char* _Py_DumpTracebackThreads(int fd, PyInterpreterState *interp, PyThreadState *current_thread) @@ -708,7 +720,7 @@ do { if (nthreads != 0) - write(fd, "\n", 1); + PUTS(fd, "\n"); if (nthreads >= MAX_NTHREADS) { PUTS(fd, "...\n"); break; -- Repository URL: https://hg.python.org/cpython

1 0