bitbake: siggen/runqueue/bitbake-worker: Improve siggen data transfer interface
We need to transfer some of the siggen data from the core/cooker into the worker instances. There was a partial API created for this but its ugly and its not possible to extend it from the siggen class. This patch completes the interface/abstraction for the data and means the class can extend/customise it in any siggen class. (Bitbake rev: cf2d642052979d236185c5b8ca2c5478c06e62ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
9ebf982d4a
commit
bb54fd0570
|
@ -168,7 +168,7 @@ def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, taskdepdat
|
||||||
data.setVar("BUILDNAME", workerdata["buildname"])
|
data.setVar("BUILDNAME", workerdata["buildname"])
|
||||||
data.setVar("DATE", workerdata["date"])
|
data.setVar("DATE", workerdata["date"])
|
||||||
data.setVar("TIME", workerdata["time"])
|
data.setVar("TIME", workerdata["time"])
|
||||||
bb.parse.siggen.set_taskdata(workerdata["hashes"], workerdata["hash_deps"], workerdata["sigchecksums"])
|
bb.parse.siggen.set_taskdata(workerdata["sigdata"])
|
||||||
ret = 0
|
ret = 0
|
||||||
try:
|
try:
|
||||||
the_data = bb.cache.Cache.loadDataFull(fn, appends, data)
|
the_data = bb.cache.Cache.loadDataFull(fn, appends, data)
|
||||||
|
|
|
@ -879,9 +879,7 @@ class RunQueue:
|
||||||
"fakerootenv" : self.rqdata.dataCache.fakerootenv,
|
"fakerootenv" : self.rqdata.dataCache.fakerootenv,
|
||||||
"fakerootdirs" : self.rqdata.dataCache.fakerootdirs,
|
"fakerootdirs" : self.rqdata.dataCache.fakerootdirs,
|
||||||
"fakerootnoenv" : self.rqdata.dataCache.fakerootnoenv,
|
"fakerootnoenv" : self.rqdata.dataCache.fakerootnoenv,
|
||||||
"hashes" : bb.parse.siggen.taskhash,
|
"sigdata" : bb.parse.siggen.get_taskdata(),
|
||||||
"hash_deps" : bb.parse.siggen.runtaskdeps,
|
|
||||||
"sigchecksums" : bb.parse.siggen.file_checksum_values,
|
|
||||||
"runq_hash" : self.rqdata.runq_hash,
|
"runq_hash" : self.rqdata.runq_hash,
|
||||||
"logdefaultdebug" : bb.msg.loggerDefaultDebugLevel,
|
"logdefaultdebug" : bb.msg.loggerDefaultDebugLevel,
|
||||||
"logdefaultverbose" : bb.msg.loggerDefaultVerbose,
|
"logdefaultverbose" : bb.msg.loggerDefaultVerbose,
|
||||||
|
|
|
@ -197,10 +197,11 @@ class SignatureGeneratorBasic(SignatureGenerator):
|
||||||
#d.setVar("BB_TASKHASH_task-%s" % task, taskhash[task])
|
#d.setVar("BB_TASKHASH_task-%s" % task, taskhash[task])
|
||||||
return h
|
return h
|
||||||
|
|
||||||
def set_taskdata(self, hashes, deps, checksums):
|
def get_taskdata(self):
|
||||||
self.runtaskdeps = deps
|
return (self.runtaskdeps, self.taskhash, self.file_checksum_values)
|
||||||
self.taskhash = hashes
|
|
||||||
self.file_checksum_values = checksums
|
def set_taskdata(self, data):
|
||||||
|
self.runtaskdeps, self.taskhash, self.file_checksum_values = data
|
||||||
|
|
||||||
def dump_sigtask(self, fn, task, stampbase, runtime):
|
def dump_sigtask(self, fn, task, stampbase, runtime):
|
||||||
k = fn + "." + task
|
k = fn + "." + task
|
||||||
|
|
Loading…
Reference in New Issue