diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-31 10:49:39 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-06 11:21:32 +0100 |
| commit | 43d37a6eaf2224c0dda1d1436a0afc2bd34fdddf (patch) | |
| tree | 273e6a02584e2222a4f2b7249018dbd487e818e4 /bitbake/lib/bb/cooker.py | |
| parent | d40d7e43856f176c45cf515644b5f211c708e237 (diff) | |
| download | openembedded-core-contrib-43d37a6eaf2224c0dda1d1436a0afc2bd34fdddf.tar.gz | |
bitbake: hashserv: Switch from threads to multiprocessing
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>
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 84f25ec94e..6e1d59bb3a 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -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): |