Movatterモバイル変換


[0]ホーム

URL:


homepage

Issue23285

This issue trackerhas been migrated toGitHub, and is currentlyread-only.
For more information, see the GitHub FAQs in the Python's Developer Guide.

classification
Title:PEP 475 - EINTR handling
Type:enhancementStage:patch review
Components:Library (Lib)Versions:Python 3.5
process
Status:closedResolution:fixed
Dependencies:Superseder:
Assigned To:Nosy List: martin.panter, ned.deily, neologix, pitrou, python-dev, vstinner
Priority:normalKeywords:patch

Created on2015-01-20 23:03 byneologix, last changed2022-04-11 14:58 byadmin. This issue is nowclosed.

Files
File nameUploadedDescriptionEdit
ff1274594739.diffneologix,2015-01-20 23:05review
eintr.diffneologix,2015-01-21 05:56review
eintr-1.diffneologix,2015-01-29 08:12review
eintr-2.diffneologix,2015-01-29 19:56review
eintr-3.diffneologix,2015-01-29 22:49review
eintr-4.diffneologix,2015-01-31 08:58review
fileio.patchvstinner,2015-03-03 01:46review
setitimer.patchvstinner,2015-03-09 09:11review
Repositories containing patches
https://hg.python.org/features/eintr
Messages (33)
msg234400 -(view)Author: Charles-François Natali (neologix)*(Python committer)Date: 2015-01-20 23:04
The test runs fine on Linux, but hangs in test_send() on OS-X and *BSD.I don't know what's wrong, so if someone with access to one of these OS could have a look, it would be great.
msg234402 -(view)Author: Antoine Pitrou (pitrou)*(Python committer)Date: 2015-01-20 23:14
Perhaps Ned can help on the OS X side of things.
msg234403 -(view)Author: Antoine Pitrou (pitrou)*(Python committer)Date: 2015-01-20 23:15
The review diff is weird: it seems it contains changes that aren't EINTR-related (see e.g. argparse.rst).
msg234412 -(view)Author: Ned Deily (ned.deily)*(Python committer)Date: 2015-01-20 23:55
(It may be several days before I can spend much time on it but I will take a look.)
msg234425 -(view)Author: Charles-François Natali (neologix)*(Python committer)Date: 2015-01-21 05:56
> The review diff is weird: it seems it contains changes that aren't EINTR-related (see e.g. argparse.rst).Here's a manually generated diff.
msg234874 -(view)Author: Ned Deily (ned.deily)*(Python committer)Date: 2015-01-28 07:53
I added a few prints to the send and receive loops of _test_send.  When running on a reasonably current Debian testing Linux:./pythonLib/test/eintrdata/eintr_tester.pytest_read (__main__.OSEINTRTest) ... oktest_wait (__main__.OSEINTRTest) ... oktest_wait3 (__main__.OSEINTRTest) ... oktest_wait4 (__main__.OSEINTRTest) ... oktest_waitpid (__main__.OSEINTRTest) ... oktest_write (__main__.OSEINTRTest) ... oktest_accept (__main__.SocketEINTRTest) ... oktest_recv (__main__.SocketEINTRTest) ... oktest_recvmsg (__main__.SocketEINTRTest) ... oktest_send (__main__.SocketEINTRTest) ... len(data) = 50331651 sent = 183360, written = 183360 sent = 50148291, written = 50331651 chunk = 50331651, total read = 50331651oktest_sendall (__main__.SocketEINTRTest) ... len(data) = 50331651 chunk = 49323840, total read = 49323840 sent = None, written = 50331651 chunk = 1007811, total read = 50331651oktest_sendmsg (__main__.SocketEINTRTest) ... len(data) = 50331651 sent = 183360, written = 183360 sent = 50148291, written = 50331651 chunk = 50331651, total read = 50331651ok----------------------------------------------------------------------Ran 12 tests in 10.139sOKWhen run on OS X (10.10.1):test_read (__main__.OSEINTRTest) ... oktest_wait (__main__.OSEINTRTest) ... oktest_wait3 (__main__.OSEINTRTest) ... oktest_wait4 (__main__.OSEINTRTest) ... oktest_waitpid (__main__.OSEINTRTest) ... oktest_write (__main__.OSEINTRTest) ... oktest_accept (__main__.SocketEINTRTest) ... oktest_recv (__main__.SocketEINTRTest) ... oktest_recvmsg (__main__.SocketEINTRTest) ... oktest_send (__main__.SocketEINTRTest) ... len(data) = 50331651 sent = 8192, written = 8192 chunk = 8192, total read = 8192 chunk = 8192, total read = 16384 sent = 16384, written = 24576 chunk = 8192, total read = 24576 chunk = 8192, total read = 32768 chunk = 8192, total read = 40960 chunk = 8192, total read = 49152 sent = 32768, written = 57344 chunk = 8192, total read = 57344 chunk = 8192, total read = 65536 chunk = 8192, total read = 73728 chunk = 8192, total read = 81920 chunk = 8192, total read = 90112 sent = 40960, written = 98304 chunk = 8192, total read = 98304 chunk = 8192, total read = 106496 chunk = 8192, total read = 114688 chunk = 8192, total read = 122880 sent = 32768, written = 131072 chunk = 8192, total read = 131072 chunk = 8192, total read = 139264 chunk = 8192, total read = 147456 chunk = 8192, total read = 155648 chunk = 8192, total read = 163840 sent = 40960, written = 172032 chunk = 8192, total read = 172032 chunk = 8192, total read = 180224 chunk = 8192, total read = 188416 chunk = 8192, total read = 196608 sent = 32768, written = 204800 chunk = 8192, total read = 204800 chunk = 8192, total read = 212992 chunk = 8192, total read = 221184 chunk = 8192, total read = 229376 chunk = 8192, total read = 237568 sent = 40960, written = 245760 chunk = 8192, total read = 245760 chunk = 8192, total read = 253952 chunk = 8192, total read = 262144 chunk = 8192, total read = 270336 sent = 32768, written = 278528 chunk = 8192, total read = 278528 chunk = 8192, total read = 286720 chunk = 8192, total read = 294912 chunk = 8192, total read = 303104 chunk = 8192, total read = 311296 sent = 40960, written = 319488[... and so on]When run standalone, the tests do eventually finish without error but take a *long* time to do so.
msg234879 -(view)Author: Charles-François Natali (neologix)*(Python committer)Date: 2015-01-28 09:26
> I added a few prints to the send and receive loops of _test_send.  When running on a reasonably current Debian testing Linux:Thanks, that's what I was suspecting, but I really don't understandwhy 200ms isn't enough for a socket write to actually do something:maybe OS-X and *BSD schedulers are large timeslice...Could you try by increasing signal_period to e.g. 0.5, and sleep_time to 1?
msg234931 -(view)Author: Ned Deily (ned.deily)*(Python committer)Date: 2015-01-29 00:58
It turns out the times are not important; the hangup is the default size of the socket buffers on OS X and possibly BSD in general.  In my case, the send and receive buffers are 8192, which explains why the chunks written are so small.  I somewhat arbitrarily changed the sizes of the buffers in _test_send with:rd.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, support.SOCK_MAX_SIZE // 3)wr.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, support.SOCK_MAX_SIZE // 3)The results were:test_send (__main__.SocketEINTRTest) ... rd SO_RCVBUF default was 8192, wr SO_SNDBUF default was 8192len(data) = 50331651 sent = 5592405, written = 5592405 chunk = 5592405, total read = 5592405 chunk = 5592405, total read = 11184810 chunk = 5592405, total read = 16777215 sent = 16777215, written = 22369620 chunk = 5592405, total read = 22369620 chunk = 5592405, total read = 27962025 chunk = 5592405, total read = 33554430 chunk = 5592405, total read = 39146835 sent = 22369620, written = 44739240 chunk = 5592405, total read = 44739240 sent = 5592411, written = 50331651 chunk = 5592405, total read = 50331645 chunk = 6, total read = 50331651oktest_sendall (__main__.SocketEINTRTest) ... rd SO_RCVBUF default was 8192, wr SO_SNDBUF default was 8192len(data) = 50331651 chunk = 5592405, total read = 5592405 chunk = 5592405, total read = 11184810 chunk = 5592405, total read = 16777215 chunk = 5592405, total read = 22369620 chunk = 5592405, total read = 27962025 chunk = 5592405, total read = 33554430 chunk = 5592405, total read = 39146835 chunk = 5592405, total read = 44739240 sent = None, written = 50331651 chunk = 5592405, total read = 50331645 chunk = 6, total read = 50331651oktest_sendmsg (__main__.SocketEINTRTest) ... rd SO_RCVBUF default was 8192, wr SO_SNDBUF default was 8192len(data) = 50331651 sent = 5592405, written = 5592405 chunk = 5592405, total read = 5592405 chunk = 5592405, total read = 11184810 chunk = 5592405, total read = 16777215 chunk = 5592405, total read = 22369620 chunk = 5592405, total read = 27962025 sent = 27962025, written = 33554430 chunk = 5592405, total read = 33554430 chunk = 5592405, total read = 39146835 chunk = 5592405, total read = 44739240 sent = 16777221, written = 50331651 chunk = 5592405, total read = 50331645 chunk = 6, total read = 50331651okI dunno if a value that large will work in all environments, so the code to call setsockopt might need to be smarter.
msg234950 -(view)Author: Charles-François Natali (neologix)*(Python committer)Date: 2015-01-29 07:28
> It turns out the times are not important; the hangup is the default size of the socket buffers on OS X and possibly BSD in general.  In my case, the send and receive buffers are 8192, which explains why the chunks written are so small.Hmmm...Basically, with a much smaller socket buffer, we get much more contextswitches, which increases drastically the test runtime.But I must admit I'm still really surprised by the time it takes onOS-X: with a SOCK_MAX_SIZE of 16MB and a socket buffer size of 8kb,that's 2000 calls to send with context switches between the sender andreceiver - and thie overhead should be much less on a two coremachine.I'll try to increase the socket buffer size and see what the buildbotsdo: most of them will probably cap it at around 100k, but that'llhopefully be enough.
msg234952 -(view)Author: Charles-François Natali (neologix)*(Python committer)Date: 2015-01-29 07:42
> Charles-François Natali added the comment:>> Hmmm...> Basically, with a much smaller socket buffer, we get much more context> switches, which increases drastically the test runtime.> But I must admit I'm still really surprised by the time it takes on> OS-X: with a SOCK_MAX_SIZE of 16MB and a socket buffer size of 8kb,> that's 2000 calls to send with context switches between the sender and> receiver - and thie overhead should be much less on a two core> machine.OK, actually the receiver is completely CPU-bound, because of memoryallocation for the socket.recv() buffer I'll play with recv_into() andprofile a bit more.
msg234953 -(view)Author: Charles-François Natali (neologix)*(Python committer)Date: 2015-01-29 08:12
OK, it turns out the culprit was repeated calls to BytesIO.getvalue(),which forced large allocations upon reception of every message.The patch attached fixes this (without changing the socket buffer size).
msg234955 -(view)Author: Ned Deily (ned.deily)*(Python committer)Date: 2015-01-29 08:41
eintr-1.diff doesn't seem to make any significant difference from eintr.diff on my system.  It's still pegging a CPU at 100% and takes 7 minutes wall time to complete.$ time ./python ~/Projects/PyDev/active/dev/3x/source/Lib/test/eintrdata/eintr_tester.pytest_read (__main__.OSEINTRTest) ... oktest_wait (__main__.OSEINTRTest) ... oktest_wait3 (__main__.OSEINTRTest) ... oktest_wait4 (__main__.OSEINTRTest) ... oktest_waitpid (__main__.OSEINTRTest) ... oktest_write (__main__.OSEINTRTest) ... oktest_accept (__main__.SocketEINTRTest) ... oktest_recv (__main__.SocketEINTRTest) ... oktest_recvmsg (__main__.SocketEINTRTest) ... oktest_send (__main__.SocketEINTRTest) ... oktest_sendall (__main__.SocketEINTRTest) ... oktest_sendmsg (__main__.SocketEINTRTest) ... ok----------------------------------------------------------------------Ran 12 tests in 439.966sOKreal7m20.276suser5m7.575ssys2m9.846s
msg234989 -(view)Author: Charles-François Natali (neologix)*(Python committer)Date: 2015-01-29 19:56
> eintr-1.diff doesn't seem to make any significant difference from eintr.diff on my system.  It's still pegging a CPU at 100% and takes 7 minutes wall time to complete.Alright, enough played: the patch attached uses a memoryview andsocket.recv_into() to remove all memory allocations: if this doesn'tfix your problem, I don't know what's going on...
msg234993 -(view)Author: Ned Deily (ned.deily)*(Python committer)Date: 2015-01-29 22:01
With eintr-2.diff, fast!:$ time ./python ~/Projects/PyDev/active/dev/3x/source/Lib/test/eintrdata/eintr_tester.pytest_read (__main__.OSEINTRTest) ... oktest_wait (__main__.OSEINTRTest) ... oktest_wait3 (__main__.OSEINTRTest) ... oktest_wait4 (__main__.OSEINTRTest) ... oktest_waitpid (__main__.OSEINTRTest) ... oktest_write (__main__.OSEINTRTest) ... oktest_accept (__main__.SocketEINTRTest) ... oktest_recv (__main__.SocketEINTRTest) ... oktest_recvmsg (__main__.SocketEINTRTest) ... oktest_send (__main__.SocketEINTRTest) ... oktest_sendall (__main__.SocketEINTRTest) ... oktest_sendmsg (__main__.SocketEINTRTest) ... ok----------------------------------------------------------------------Ran 12 tests in 7.652sOKreal0m7.959suser0m2.573ssys0m1.604sInstrumented test_send, 3 socket.send calls, many socket.recv_into calls:test_send (__main__.SocketEINTRTest) ... rd SO_RCVBUF default was 8192, wr SO_SNDBUF default was 8192len(data) = 16777215  sent = 8192, total written = 8192 sent = 4440064, total written = 4448256 sent = 12328959, total written = 16777215  received = 8192, total read = 8192 received = 8192, total read = 16384 received = 8192, total read = 24576 [...] received = 8192, total read = 16760832 received = 8192, total read = 16769024 received = 8191, total read = 16777215
msg234997 -(view)Author: Charles-François Natali (neologix)*(Python committer)Date: 2015-01-29 22:49
> With eintr-2.diff, fast!:Victory \°/.> Instrumented test_send, 3 socket.send calls, many socket.recv_into calls:Yep, that's expected.I think we should keep the default socket buffer size: it increasesthe test coverage, and it's probably not worth trying to increase itto make the test a bit faster, especially since it spends so much timesleeping.Antoine, I'm now happy with the patch, so we'll be waiting for yourdecision on the PEP with Victor :-).
msg235010 -(view)Author: Antoine Pitrou (pitrou)*(Python committer)Date: 2015-01-30 00:39
Victor, do you think there's anything left to do?
msg235091 -(view)Author: Charles-François Natali (neologix)*(Python committer)Date: 2015-01-31 08:58
I just realized I didn't retry upon EINTR for open(): eintr-4.diffadds this, along with tests (using a fifo).Also, I added comments explaining why we don't retry upon close() (seee.g.http://lwn.net/Articles/576478/ andhttp://linux.derkeiler.com/Mailing-Lists/Kernel/2005-09/3000.html).
msg235092 -(view)Author: STINNER Victor (vstinner)*(Python committer)Date: 2015-01-31 09:35
Charles-François Natali added the comment:> I just realized I didn't retry upon EINTR for open(): eintr-4.diff> adds this, along with tests (using a fifo).>> Also, I added comments explaining why we don't retry upon close() (see> e.g.http://lwn.net/Articles/576478/ and>http://linux.derkeiler.com/Mailing-Lists/Kernel/2005-09/3000.html).I didn't read these articles yet, but I will. IMO the PEP must beupdated if we don't retry in close(), since close() is used as anexample where "EINTR is unexpected"!
msg235285 -(view)Author: Antoine Pitrou (pitrou)*(Python committer)Date: 2015-02-02 20:39
PEP is now updated.
msg235424 -(view)Author: STINNER Victor (vstinner)*(Python committer)Date: 2015-02-05 08:36
Would it be possible to push the latest patch right now, and fix remaining issues (if there are known issues?), before Python 3.4 alpha 1? According to thePEP 478, the alpha 1 is scheduled for this sunday (February 8, 2015).
msg235435 -(view)Author: Antoine Pitrou (pitrou)*(Python committer)Date: 2015-02-05 12:55
> Would it be possible to push the latest patch right nowIt's ok for me. Please watch the buildbots :)
msg235451 -(view)Author: Charles-François Natali (neologix)*(Python committer)Date: 2015-02-05 20:51
> Antoine Pitrou added the comment:>>> Would it be possible to push the latest patch right now>> It's ok for me. Please watch the buildbots :)Cool, I'll push on Friday evening or Saturday.
msg235525 -(view)Author: Roundup Robot (python-dev)(Python triager)Date: 2015-02-07 13:29
New changeset5b63010be19e by Charles-François Natali in branch 'default':Issue#23285:PEP 475 -- Retry system calls failing with EINTR.https://hg.python.org/cpython/rev/5b63010be19e
msg235546 -(view)Author: Roundup Robot (python-dev)(Python triager)Date: 2015-02-08 04:49
New changeset000bbdf0ea76 by Ned Deily in branch 'default':Issue#23285: Install new test directory.https://hg.python.org/cpython/rev/000bbdf0ea76
msg237100 -(view)Author: STINNER Victor (vstinner)*(Python committer)Date: 2015-03-03 01:46
The change onModules/_io/fileio.c is wrong: functions may return None with an exception set. It is wrong because a function must return a result with no exception set, or NULL and an exception set.Attached patch fixes this issue.
msg237101 -(view)Author: STINNER Victor (vstinner)*(Python committer)Date: 2015-03-03 01:49
Note: I found the bug while working on a patch for#22181.My test is this shell script:$ while true; do ./python -c 'import os, signal; signal.setitimer(signal.ITIMER_REAL, 0.001, 0.0001); signal.signal(signal.SIGALRM, lambda *args: print(".", end="")); print("urandom"); x=os.urandom(5000); print("ok"); signal.alarm(0)'; if [ $? -ne 142 -a $? -ne 0 ]; then break; fi done  The test calls print() in a signal handler which can likely create a reentrant call, which is forbidden. But Python handles this case, it's fine.After removing all debug prints and reverting the fix on fileio.c, the test doesn't crash with the assertion error anymore. Before, an assertion failed because fileio_write() returned Py_None with an exception set.
msg237159 -(view)Author: Charles-François Natali (neologix)*(Python committer)Date: 2015-03-03 20:26
@Victor: please commit.Would be nice to have a test for it;
msg237193 -(view)Author: STINNER Victor (vstinner)*(Python committer)Date: 2015-03-04 17:43
> Would be nice to have a test for it;There are already some tests on EINTR in test_file_eintr and test_subprocess (test_communicate_eintr()).
msg237194 -(view)Author: Roundup Robot (python-dev)(Python triager)Date: 2015-03-04 17:47
New changesetcad6eac598ec by Victor Stinner in branch 'default':Issue#23285: Fix handling of EINTR in fileio.chttps://hg.python.org/cpython/rev/cad6eac598ec
msg237611 -(view)Author: STINNER Victor (vstinner)*(Python committer)Date: 2015-03-09 09:11
test_setitimer.patch: hack unittest.TestCase.run() to inject signals every 1 ms, send the first signal in 100 ms.This patch helped me to find that socket.connect() doesn't handle EINTR yet: see issue#23618 "PEP 475: handle EINTR in the socket module".
msg237612 -(view)Author: Antoine Pitrou (pitrou)*(Python committer)Date: 2015-03-09 09:15
For the record, it seems test_eintr sometimes left zombie processes in my machine where I run reference leak tests every night. I didn't investigate and just disabled the tests.
msg237613 -(view)Author: Antoine Pitrou (pitrou)*(Python committer)Date: 2015-03-09 09:15
(I'll add that that machine is hosted on an OpenVZ-based VPS, so perhaps there are issues with the old patched kernel and whatnot?)
msg238650 -(view)Author: STINNER Victor (vstinner)*(Python committer)Date: 2015-03-20 11:44
> For the record, it seems test_eintr sometimes left zombie processes in my machine where I run reference leak tests every night. I didn't investigate and just disabled the tests.>> (I'll add that that machine is hosted on an OpenVZ-based VPS, so perhaps there are issues with the old patched kernel and whatnot?)On my Fedora 21 (on a physical PC, not virtualized), I ran "./python -m test -R 3:3: test_eintr" 3 times. After that, I didn't see any zombi Python process. If I cannot reproduce the issue, I cannot fix it. I bet that it's related to OpenVZ.IMO this issue can be closed. It already has a long history. I prefer to open new issues. See the issue#23648 "PEP 475 meta issue" which lists all issues related to thePEP 475. I opened new issues for each module which didn't handle completly thePEP 475 yet.By the way: great job Charles-François! I like your changeset, it works well.
History
DateUserActionArgs
2022-04-11 14:58:12adminsetgithub: 67474
2016-07-10 09:23:45berker.peksagsetfiles: -b3b439d7dd40.diff
2016-07-10 06:16:19Pes2009ksetfiles: +b3b439d7dd40.diff
2015-03-20 11:44:35vstinnersetstatus: open -> closed
resolution: fixed
2015-03-20 11:44:17vstinnersetmessages: +msg238650
2015-03-12 15:51:50vstinnerlinkissue23648 dependencies
2015-03-09 09:15:55pitrousetmessages: +msg237613
2015-03-09 09:15:16pitrousetmessages: +msg237612
2015-03-09 09:11:53vstinnersetfiles: +setitimer.patch

messages: +msg237611
2015-03-04 17:47:03python-devsetmessages: +msg237194
2015-03-04 17:43:18vstinnersetmessages: +msg237193
2015-03-03 20:26:10neologixsetmessages: +msg237159
2015-03-03 01:49:15vstinnersetmessages: +msg237101
2015-03-03 01:46:05vstinnersetfiles: +fileio.patch

messages: +msg237100
2015-02-08 04:49:29python-devsetmessages: +msg235546
2015-02-07 21:43:16martin.pantersetnosy: +martin.panter
2015-02-07 13:29:32python-devsetnosy: +python-dev
messages: +msg235525
2015-02-05 20:51:37neologixsetmessages: +msg235451
2015-02-05 12:55:44pitrousetmessages: +msg235435
2015-02-05 08:36:11vstinnersetmessages: +msg235424
2015-02-02 20:39:05pitrousetmessages: +msg235285
2015-01-31 09:35:20vstinnersetmessages: +msg235092
2015-01-31 08:58:14neologixsetfiles: +eintr-4.diff

messages: +msg235091
2015-01-30 00:39:28pitrousetmessages: +msg235010
2015-01-30 00:32:48pitrousetstage: patch review
versions: + Python 3.5
2015-01-29 22:49:06neologixsetfiles: +eintr-3.diff

messages: +msg234997
2015-01-29 22:01:17ned.deilysetmessages: +msg234993
2015-01-29 19:56:13neologixsetfiles: +eintr-2.diff

messages: +msg234989
2015-01-29 08:41:44ned.deilysetmessages: +msg234955
2015-01-29 08:12:29neologixsetfiles: +eintr-1.diff

messages: +msg234953
2015-01-29 07:42:33neologixsetmessages: +msg234952
2015-01-29 07:28:23neologixsetmessages: +msg234950
2015-01-29 00:58:32ned.deilysetmessages: +msg234931
2015-01-28 09:26:11neologixsetmessages: +msg234879
2015-01-28 07:53:47ned.deilysetmessages: +msg234874
2015-01-21 05:56:39neologixsetfiles: +eintr.diff

messages: +msg234425
2015-01-20 23:55:34ned.deilysetmessages: +msg234412
2015-01-20 23:15:08pitrousetmessages: +msg234403
2015-01-20 23:14:05pitrousetnosy: +ned.deily
messages: +msg234402
2015-01-20 23:09:17neologixsettitle: PEP 475 - EINTR hanndling -> PEP 475 - EINTR handling
2015-01-20 23:05:45neologixsetfiles: +ff1274594739.diff
keywords: +patch
2015-01-20 23:04:33neologixsetmessages: +msg234400
2015-01-20 23:03:28neologixcreate
Supported byThe Python Software Foundation,
Powered byRoundup
Copyright © 1990-2022,Python Software Foundation
Legal Statements

[8]ページ先頭

©2009-2026 Movatter.jp