From: Richard Purdie Date: Fri, 28 Jul 2017 14:37:29 +0000 (+0100) Subject: bitbake: process: Move socket keep alive into BitBakeProcessServerConnection X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd3a59d3546b900dae92ab3b3eccca5a215ddf61;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git bitbake: process: Move socket keep alive into BitBakeProcessServerConnection This cleans up the socket keep alive into better class structured code and adds cleanup of the open file descriptors upon shutdown. (Bitbake rev: 77fd3a3a29a569e212374b27aea742ddbaafcdd5) Signed-off-by: Richard Purdie --- diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py index 3d9077fd07c..fb96804e687 100644 --- a/bitbake/lib/bb/server/process.py +++ b/bitbake/lib/bb/server/process.py @@ -336,12 +336,16 @@ class ServerCommunicator(): return class BitBakeProcessServerConnection(object): - def __init__(self, ui_channel, recv, eq): + def __init__(self, ui_channel, recv, eq, sock): self.connection = ServerCommunicator(ui_channel, recv) self.events = eq + # Save sock so it doesn't get gc'd for the life of our connection + self.socket_connection = sock def terminate(self): self.socket_connection.close() + self.connection.connection.close() + self.connection.recv.close() return class BitBakeServer(object): @@ -413,12 +417,10 @@ def connectProcessServer(sockname, featureset): sendfds(sock, [writefd, readfd1, writefd2]) - server_connection = BitBakeProcessServerConnection(command_chan, command_chan_recv, eq) + server_connection = BitBakeProcessServerConnection(command_chan, command_chan_recv, eq, sock) server_connection.connection.updateFeatureSet(featureset) - # Save sock so it doesn't get gc'd for the life of our connection - server_connection.socket_connection = sock except: sock.close() raise