Change class names, use errno constant

forkserver_singleton
Tyler Goodlet 2018-08-02 22:32:48 -04:00
parent 4b875f0ade
commit 4fc7edf466
1 changed files with 5 additions and 5 deletions

View File

@ -26,7 +26,7 @@ from multiprocessing.context import reduction
SIGNED_STRUCT = struct.Struct('q') # large enough for pid_t SIGNED_STRUCT = struct.Struct('q') # large enough for pid_t
class AdultForkServer(ForkServer): class PatchedForkServer(ForkServer):
def connect_to_new_process(self, fds): def connect_to_new_process(self, fds):
'''Request forkserver to create a child process. '''Request forkserver to create a child process.
@ -55,7 +55,7 @@ class AdultForkServer(ForkServer):
reduction.sendfds(client, allfds) reduction.sendfds(client, allfds)
break break
except OSError as err: except OSError as err:
if err.args[0] == 9: if err.errno == errno.EBADF:
print(f"Bad FD {err}") print(f"Bad FD {err}")
client = socket.socket(socket.AF_UNIX) client = socket.socket(socket.AF_UNIX)
client.connect(self._forkserver_address) client.connect(self._forkserver_address)
@ -248,7 +248,7 @@ def write_signed(fd, n):
msg = msg[nbytes:] msg = msg[nbytes:]
class AdultSemaphoreTracker(semaphore_tracker.SemaphoreTracker): class PatchedSemaphoreTracker(semaphore_tracker.SemaphoreTracker):
"""Stop GD ensuring everything is running... """Stop GD ensuring everything is running...
""" """
def getfd(self): def getfd(self):
@ -256,8 +256,8 @@ class AdultSemaphoreTracker(semaphore_tracker.SemaphoreTracker):
return self._fd return self._fd
_semaphore_tracker = AdultSemaphoreTracker() _semaphore_tracker = PatchedSemaphoreTracker()
_forkserver = AdultForkServer() _forkserver = PatchedForkServer()
def override_stdlib(): def override_stdlib():