(original) (raw)

changeset: 78610:4307b985209b user: Richard Oudkerk shibturn@gmail.com date: Thu Aug 16 16:48:55 2012 +0100 files: Lib/multiprocessing/reduction.py Lib/test/test_multiprocessing.py Misc/NEWS description: Issue #14669: Fix pickling of connections and sockets on MacOSX by sending/receiving an acknowledgment after file descriptor transfer. TestPicklingConnection has been reenabled for MacOSX. diff -r 5206b9dbf1ac -r 4307b985209b Lib/multiprocessing/reduction.py --- a/Lib/multiprocessing/reduction.py Thu Aug 16 07:27:47 2012 +0300 +++ b/Lib/multiprocessing/reduction.py Thu Aug 16 16:48:55 2012 +0100 @@ -120,16 +120,24 @@ else: # Unix + + # On MacOSX we should acknowledge receipt of fds -- see Issue14669 + ACKNOWLEDGE = sys.platform == 'darwin' + def send_handle(conn, handle, destination_pid): with socket.fromfd(conn.fileno(), socket.AF_UNIX, socket.SOCK_STREAM) as s: s.sendmsg([b'x'], [(socket.SOL_SOCKET, socket.SCM_RIGHTS, struct.pack("@i", handle))]) + if ACKNOWLEDGE and conn.recv_bytes() != b'ACK': + raise RuntimeError('did not receive acknowledgement of fd') def recv_handle(conn): size = struct.calcsize("@i") with socket.fromfd(conn.fileno(), socket.AF_UNIX, socket.SOCK_STREAM) as s: msg, ancdata, flags, addr = s.recvmsg(1, socket.CMSG_LEN(size)) try: + if ACKNOWLEDGE: + conn.send_bytes(b'ACK') cmsg_level, cmsg_type, cmsg_data = ancdata[0] if (cmsg_level == socket.SOL_SOCKET and cmsg_type == socket.SCM_RIGHTS): diff -r 5206b9dbf1ac -r 4307b985209b Lib/test/test_multiprocessing.py --- a/Lib/test/test_multiprocessing.py Thu Aug 16 07:27:47 2012 +0300 +++ b/Lib/test/test_multiprocessing.py Thu Aug 16 16:48:55 2012 +0100 @@ -2446,8 +2446,6 @@ # Test of sending connection and socket objects between processes # -# Intermittent fails on Mac OS X -- see Issue14669 and Issue12958 -@unittest.skipIf(sys.platform == "darwin", "fd passing unreliable on Mac OS X") @unittest.skipUnless(HAS_REDUCTION, "test needs multiprocessing.reduction") class _TestPicklingConnections(BaseTestCase): diff -r 5206b9dbf1ac -r 4307b985209b Misc/NEWS --- a/Misc/NEWS Thu Aug 16 07:27:47 2012 +0300 +++ b/Misc/NEWS Thu Aug 16 16:48:55 2012 +0100 @@ -16,6 +16,10 @@ Library ------- +- Issue #14669: Fix pickling of connections and sockets on MacOSX + by sending/receiving an acknowledgment after file descriptor transfer. + TestPicklingConnection has been reenabled for MacOSX. + - Issue #11062: Fix adding a message from file to Babyl mailbox. - Issue #15646: Prevent equivalent of a fork bomb when using /shibturn@gmail.com