mirror of
https://github.com/python/cpython.git
synced 2025-09-26 18:29:57 +00:00
Fix issue 10527: make multiprocessing use poll() instead of select() if available.
This commit is contained in:
parent
421489f8a6
commit
cef2006eaf
3 changed files with 24 additions and 0 deletions
|
@ -200,6 +200,27 @@ if sys.platform != 'win32':
|
||||||
return c1, c2
|
return c1, c2
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
if hasattr(select, 'poll'):
|
||||||
|
def _poll(fds, timeout):
|
||||||
|
if timeout is not None:
|
||||||
|
timeout = int(timeout) * 1000 # timeout is in milliseconds
|
||||||
|
fd_map = {}
|
||||||
|
pollster = select.poll()
|
||||||
|
for fd in fds:
|
||||||
|
pollster.register(fd, select.POLLIN)
|
||||||
|
if hasattr(fd, 'fileno'):
|
||||||
|
fd_map[fd.fileno()] = fd
|
||||||
|
else:
|
||||||
|
fd_map[fd] = fd
|
||||||
|
ls = []
|
||||||
|
for fd, event in pollster.poll(timeout):
|
||||||
|
if event & select.POLLNVAL:
|
||||||
|
raise ValueError('invalid file descriptor %i' % fd)
|
||||||
|
ls.append(fd_map[fd])
|
||||||
|
return ls
|
||||||
|
else:
|
||||||
|
def _poll(fds, timeout):
|
||||||
|
return select.select(fds, [], [], timeout)[0]
|
||||||
|
|
||||||
from _multiprocessing import win32
|
from _multiprocessing import win32
|
||||||
|
|
||||||
|
|
|
@ -1513,6 +1513,7 @@ class _TestConnection(BaseTestCase):
|
||||||
self.assertTimingAlmostEqual(poll.elapsed, TIMEOUT1)
|
self.assertTimingAlmostEqual(poll.elapsed, TIMEOUT1)
|
||||||
|
|
||||||
conn.send(None)
|
conn.send(None)
|
||||||
|
time.sleep(.1)
|
||||||
|
|
||||||
self.assertEqual(poll(TIMEOUT1), True)
|
self.assertEqual(poll(TIMEOUT1), True)
|
||||||
self.assertTimingAlmostEqual(poll.elapsed, 0)
|
self.assertTimingAlmostEqual(poll.elapsed, 0)
|
||||||
|
|
|
@ -175,6 +175,8 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue 10527: make multiprocessing use poll() instead of select() if available.
|
||||||
|
|
||||||
- Issue #16485: Fix file descriptor not being closed if file header patching
|
- Issue #16485: Fix file descriptor not being closed if file header patching
|
||||||
fails on closing of aifc file.
|
fails on closing of aifc file.
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue