python-2.6.6-use-poll-for-multiprocessing-socket-connection.patch

diff -up Python-2.6.6/Lib/test/test_multiprocessing.py.use-poll-for-multiprocessing-socket-connection Python-2.6.6/Lib/test/test_multiprocessing.py
--- Python-2.6.6/Lib/test/test_multiprocessing.py.use-poll-for-multiprocessing-socket-connection	2011-06-30 19:44:47.892755812 -0400
+++ Python-2.6.6/Lib/test/test_multiprocessing.py	2011-06-30 19:52:55.789497774 -0400
@@ -65,6 +65,13 @@ HAVE_GETVALUE = not getattr(_multiproces
 
 WIN32 = (sys.platform == "win32")
 
+try:
+    from select import poll as test_for_poll
+    HAVE_POLL = True
+    del test_for_poll
+except ImportError:
+    HAVE_POLL = False
+
 #
 # Creates a wrapper for a function which records the time it takes to finish
 #
@@ -1726,7 +1733,12 @@ class TestInvalidHandle(unittest.TestCas
         if WIN32:
             return
         conn = _multiprocessing.Connection(44977608)
-        self.assertRaises(IOError, conn.poll)
+        if HAVE_POLL:
+            # conn.poll is implemented in terms of the "poll" syscall:
+            self.assertEquals(conn.poll(), False)
+        else:
+            # conn.poll is implemented in terms of the "select" syscall:
+            self.assertRaises(IOError, conn.poll)
         self.assertRaises(IOError, _multiprocessing.Connection, -1)
 #
 # Functions used to create test cases from the base ones in this module
diff -up Python-2.6.6/Modules/_multiprocessing/socket_connection.c.use-poll-for-multiprocessing-socket-connection Python-2.6.6/Modules/_multiprocessing/socket_connection.c
--- Python-2.6.6/Modules/_multiprocessing/socket_connection.c.use-poll-for-multiprocessing-socket-connection	2010-05-09 11:15:40.000000000 -0400
+++ Python-2.6.6/Modules/_multiprocessing/socket_connection.c	2011-06-30 19:24:24.391875469 -0400
@@ -7,6 +7,9 @@
  */
 
 #include "multiprocessing.h"
+#ifdef HAVE_POLL
+#include <poll.h>
+#endif
 
 #ifdef MS_WINDOWS
 #  define WRITE(h, buffer, length) send((SOCKET)h, buffer, length, 0)
@@ -152,6 +155,29 @@ conn_recv_string(ConnectionObject *conn,
  * Check whether any data is available for reading -- neg timeout blocks
  */
 
+#ifdef HAVE_POLL
+static int
+conn_poll(ConnectionObject *conn, double timeout, PyThreadState *_save)
+{
+    int res;
+    struct pollfd p;
+
+    p.fd = (int)conn->handle;
+    p.events = POLLIN | POLLPRI;
+    p.revents = 0;
+
+    res = poll(&p, 1, (int)(timeout * 1000));
+
+    if (res < 0) {
+        return MP_SOCKET_ERROR;
+    } else if (p.revents & (POLLIN | POLLPRI)) {
+        return TRUE;
+    } else {
+        assert(res == 0);
+        return FALSE;
+    }
+}
+#else
 static int
 conn_poll(ConnectionObject *conn, double timeout, PyThreadState *_save)
 {
@@ -191,6 +217,7 @@ conn_poll(ConnectionObject *conn, double
         return FALSE;
     }
 }
+#endif
 
 /*
  * "connection.h" defines the Connection type using defs above