mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
bitbake: cooker/hashserv: Allow autostarting of a local hash server using BB_HASHSERVE
Its useful, particularly in the local developer model of usage, for bitbake to start and stop a hash equivalence server on local port, rather than relying on one being started by the user before the build. The new BB_HASHSERVE variable supports this. The database handling is moved internally into the hashserv code so that different threads/processes can be used for the server without errors. (Bitbake rev: a4fa8f1bd88995ae60e10430316fbed63d478587) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -31,6 +31,7 @@ import pyinotify
|
||||
import json
|
||||
import pickle
|
||||
import codecs
|
||||
import hashserv
|
||||
|
||||
logger = logging.getLogger("BitBake")
|
||||
collectlog = logging.getLogger("BitBake.Collection")
|
||||
@@ -230,6 +231,8 @@ 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
|
||||
@@ -368,6 +371,15 @@ 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()
|
||||
self.data.setVar("BB_HASHSERVE", self.hashservport)
|
||||
|
||||
#
|
||||
# Copy of the data store which has been expanded.
|
||||
# Used for firing events and accessing variables where expansion needs to be accounted for
|
||||
@@ -1645,9 +1657,10 @@ class BBCooker:
|
||||
|
||||
def post_serve(self):
|
||||
prserv.serv.auto_shutdown()
|
||||
if self.hashserv:
|
||||
self.hashserv.shutdown()
|
||||
bb.event.fire(CookerExit(), self.data)
|
||||
|
||||
|
||||
def shutdown(self, force = False):
|
||||
if force:
|
||||
self.state = state.forceshutdown
|
||||
|
||||
Reference in New Issue
Block a user