From cef2006eaff86f843b8f0fc21fc7b652415b96ed Mon Sep 17 00:00:00 2001
From: Giampaolo Rodola' <g.rodola@gmail.com>
Date: Mon, 31 Dec 2012 17:23:09 +0100
Subject: [PATCH] Fix issue 10527: make multiprocessing use poll() instead of
 select() if available.

---
 Lib/multiprocessing/connection.py | 21 +++++++++++++++++++++
 Lib/test/test_multiprocessing.py  |  1 +
 Misc/NEWS                         |  2 ++
 3 files changed, 24 insertions(+)

diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
index 4421ac5cfd7..6c398fdc918 100644
--- a/Lib/multiprocessing/connection.py
+++ b/Lib/multiprocessing/connection.py
@@ -200,6 +200,27 @@ if sys.platform != 'win32':
         return c1, c2
 
 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
 
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 15870570db0..f140aca63f1 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -1513,6 +1513,7 @@ class _TestConnection(BaseTestCase):
         self.assertTimingAlmostEqual(poll.elapsed, TIMEOUT1)
 
         conn.send(None)
+        time.sleep(.1)
 
         self.assertEqual(poll(TIMEOUT1), True)
         self.assertTimingAlmostEqual(poll.elapsed, 0)
diff --git a/Misc/NEWS b/Misc/NEWS
index 8ec9675fb47..e99efca3ffd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -175,6 +175,8 @@ Core and Builtins
 Library
 -------
 
+- Issue 10527: make multiprocessing use poll() instead of select() if available.
+
 - Issue #16485: Fix file descriptor not being closed if file header patching
   fails on closing of aifc file.