mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-04 14:09:47 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: hashserv: Switch from threads to multiprocessing

Browse Source 
There were hard to debug lockups when trying to use threading to start
hashserv as a thread. Switch to multiprocessing which doesn't show the
same locking problems.

(Bitbake rev: be23d887c8e244f1ef961298fbc9214d0fd0968a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2019-07-31 10:49:39 +01:00
parent d40d7e4385
commit 43d37a6eaf
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/cooker.py
+11 -9
View File
@@ -193,6 +193,8 @@ class BBCooker:
bb.parse.BBHandler.cached_statements = {}
self.ui_cmdline = None
self.hashserv = None
self.hashservport = None
self.initConfigurationData()
@@ -231,8 +233,6 @@ class BBCooker:
self.state = state.initial
self.parser = None
self.hashserv = None
self.hashservport = None
signal.signal(signal.SIGTERM, self.sigterm_exception)
# Let SIGHUP exit as SIGTERM
@@ -372,12 +372,13 @@ class BBCooker:
self.data.setVar('BB_CMDLINE', self.ui_cmdline)
if self.data.getVar("BB_HASHSERVE") == "localhost:0":
dbfile = (self.data.getVar("PERSISTENT_DIR") or self.data.getVar("CACHE")) + "/hashserv.db"
self.hashserv = hashserv.create_server(('localhost', 0), dbfile, '')
self.hashservport = "localhost:" + str(self.hashserv.server_port)
thread = threading.Thread(target=self.hashserv.serve_forever)
thread.daemon = True
thread.start()
if not self.hashserv:
dbfile = (self.data.getVar("PERSISTENT_DIR") or self.data.getVar("CACHE")) + "/hashserv.db"
self.hashserv = hashserv.create_server(('localhost', 0), dbfile, '')
self.hashservport = "localhost:" + str(self.hashserv.server_port)
self.hashserv.process = multiprocessing.Process(target=self.hashserv.serve_forever)
self.hashserv.process.daemon = True
self.hashserv.process.start()
self.data.setVar("BB_HASHSERVE", self.hashservport)
#
@@ -1658,7 +1659,8 @@ class BBCooker:
def post_serve(self):
prserv.serv.auto_shutdown()
if self.hashserv:
self.hashserv.shutdown()
self.hashserv.process.terminate()
self.hashserv.process.join()
bb.event.fire(CookerExit(), self.data)
def shutdown(self, force = False):