sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: runqueue: Fix setscene issues with multiconfig 

setscene was being entirelu skipped for multiconfig variants as the tasks
were simply not being spotted. If the default config was also being built
it masked the problem. When this was fixed by using taskfn instead of fn
in lookups against dataCache, several other instances of this problem were
highlighted.

This goes through and corrects the setscene code to correclty use taskfn
instead of fn in the appropriate places meaning setscene tasks for multiconfig
now work correctly.

(Bitbake rev: cead85cf219c07b40aeb7c0d948c25f0429136db)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2016-12-21 13:35:53 +00:00
parent d6799e655e
commit f048db1c64
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
bitbake/lib/bb/runqueue.py
View File

@ -290,8 +290,8 @@ class RunQueueData:
return tid + task_name_suffix return tid + task_name_suffix
def get_short_user_idstring(self, task, task_name_suffix = ""): def get_short_user_idstring(self, task, task_name_suffix = ""):
(mc, fn, taskname, _) = split_tid_mcfn(task) (mc, fn, taskname, taskfn) = split_tid_mcfn(task)
pn = self.dataCaches[mc].pkg_fn[fn] pn = self.dataCaches[mc].pkg_fn[taskfn]
taskname = taskname_from_tid(task) + task_name_suffix taskname = taskname_from_tid(task) + task_name_suffix
return "%s:%s" % (pn, taskname) return "%s:%s" % (pn, taskname)
@ -885,14 +885,14 @@ class RunQueueData:
if not self.cooker.configuration.nosetscene: if not self.cooker.configuration.nosetscene:
for tid in self.runtaskentries: for tid in self.runtaskentries:
(mc, fn, taskname, _) = split_tid_mcfn(tid) (mc, fn, taskname, _) = split_tid_mcfn(tid)
setscenetid = fn + ":" + taskname + "_setscene" setscenetid = tid + "_setscene"
if setscenetid not in taskData[mc].taskentries: if setscenetid not in taskData[mc].taskentries:
continue continue
self.runq_setscene_tids.append(tid) self.runq_setscene_tids.append(tid)
def invalidate_task(tid, error_nostamp): def invalidate_task(tid, error_nostamp):
(mc, fn, taskname, _) = split_tid_mcfn(tid) (mc, fn, taskname, taskfn) = split_tid_mcfn(tid)
taskdep = self.dataCaches[mc].task_deps[fn] taskdep = self.dataCaches[mc].task_deps[taskfn]
if fn + ":" + taskname not in taskData[mc].taskentries: if fn + ":" + taskname not in taskData[mc].taskentries:
logger.warning("Task %s does not exist, invalidating this task will have no effect" % taskname) logger.warning("Task %s does not exist, invalidating this task will have no effect" % taskname)
if 'nostamp' in taskdep and taskname in taskdep['nostamp']: if 'nostamp' in taskdep and taskname in taskdep['nostamp']:
@ -1339,7 +1339,7 @@ class RunQueue:
continue continue
sq_fn.append(fn) sq_fn.append(fn)
sq_hashfn.append(self.rqdata.dataCaches[mc].hashfn[fn]) sq_hashfn.append(self.rqdata.dataCaches[mc].hashfn[taskfn])
sq_hash.append(self.rqdata.runtaskentries[tid].hash) sq_hash.append(self.rqdata.runtaskentries[tid].hash)
sq_taskname.append(taskname) sq_taskname.append(taskname)
sq_task.append(tid) sq_task.append(tid)
@ -1419,8 +1419,8 @@ class RunQueue:
for tid in invalidtasks: for tid in invalidtasks:
(mc, fn, taskname, _) = split_tid_mcfn(tid) (mc, fn, taskname, taskfn) = split_tid_mcfn(tid)
pn = self.rqdata.dataCaches[mc].pkg_fn[fn] pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn]
h = self.rqdata.runtaskentries[tid].hash h = self.rqdata.runtaskentries[tid].hash
matches = bb.siggen.find_siginfo(pn, taskname, [], self.cfgData) matches = bb.siggen.find_siginfo(pn, taskname, [], self.cfgData)
match = None match = None
@ -1523,8 +1523,8 @@ class RunQueueExecute:
taskdata = {} taskdata = {}
taskdeps.add(task) taskdeps.add(task)
for dep in taskdeps: for dep in taskdeps:
(mc, fn, taskname, _) = split_tid_mcfn(dep) (mc, fn, taskname, taskfn) = split_tid_mcfn(dep)
pn = self.rqdata.dataCaches[mc].pkg_fn[fn] pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn]
taskdata[dep] = [pn, taskname, fn] taskdata[dep] = [pn, taskname, fn]
call = self.rq.depvalidate + "(task, taskdata, notneeded, d)" call = self.rq.depvalidate + "(task, taskdata, notneeded, d)"
locs = { "task" : task, "taskdata" : taskdata, "notneeded" : self.scenequeue_notneeded, "d" : self.cooker.data } locs = { "task" : task, "taskdata" : taskdata, "notneeded" : self.scenequeue_notneeded, "d" : self.cooker.data }
@ -1724,7 +1724,7 @@ class RunQueueExecuteTasks(RunQueueExecute):
# Check tasks that are going to run against the whitelist # Check tasks that are going to run against the whitelist
def check_norun_task(tid, showerror=False): def check_norun_task(tid, showerror=False):
(mc, fn, taskname, _) = split_tid_mcfn(tid) (mc, fn, taskname, taskfn) = split_tid_mcfn(tid)
# Ignore covered tasks # Ignore covered tasks
if tid in self.rq.scenequeue_covered: if tid in self.rq.scenequeue_covered:
return False return False
@ -1732,11 +1732,11 @@ class RunQueueExecuteTasks(RunQueueExecute):
if self.rq.check_stamp_task(tid, taskname, cache=self.stampcache): if self.rq.check_stamp_task(tid, taskname, cache=self.stampcache):
return False return False
# Ignore noexec tasks # Ignore noexec tasks
taskdep = self.rqdata.dataCaches[mc].task_deps[fn] taskdep = self.rqdata.dataCaches[mc].task_deps[taskfn]
if 'noexec' in taskdep and taskname in taskdep['noexec']: if 'noexec' in taskdep and taskname in taskdep['noexec']:
return False return False
pn = self.rqdata.dataCaches[mc].pkg_fn[fn] pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn]
if not check_setscene_enforce_whitelist(pn, taskname, self.rqdata.setscenewhitelist): if not check_setscene_enforce_whitelist(pn, taskname, self.rqdata.setscenewhitelist):
if showerror: if showerror:
if tid in self.rqdata.runq_setscene_tids: if tid in self.rqdata.runq_setscene_tids:
@ -1996,8 +1996,8 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
# e.g. do_sometask_setscene[depends] = "targetname:do_someothertask_setscene" # e.g. do_sometask_setscene[depends] = "targetname:do_someothertask_setscene"
# Note that anything explicitly depended upon will have its reverse dependencies removed to avoid circular dependencies # Note that anything explicitly depended upon will have its reverse dependencies removed to avoid circular dependencies
for tid in self.rqdata.runq_setscene_tids: for tid in self.rqdata.runq_setscene_tids:
(mc, fn, taskname, _) = split_tid_mcfn(tid) (mc, fn, taskname, taskfn) = split_tid_mcfn(tid)
realtid = fn + ":" + taskname + "_setscene" realtid = tid + "_setscene"
idepends = self.rqdata.taskData[mc].taskentries[realtid].idepends idepends = self.rqdata.taskData[mc].taskentries[realtid].idepends
for (depname, idependtask) in idepends: for (depname, idependtask) in idepends:
@ -2062,7 +2062,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
for tid in self.sq_revdeps: for tid in self.sq_revdeps:
(mc, fn, taskname, taskfn) = split_tid_mcfn(tid) (mc, fn, taskname, taskfn) = split_tid_mcfn(tid)
taskdep = self.rqdata.dataCaches[mc].task_deps[fn] taskdep = self.rqdata.dataCaches[mc].task_deps[taskfn]
if 'noexec' in taskdep and taskname in taskdep['noexec']: if 'noexec' in taskdep and taskname in taskdep['noexec']:
noexec.append(tid) noexec.append(tid)
@ -2083,7 +2083,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
continue continue
sq_fn.append(fn) sq_fn.append(fn)
sq_hashfn.append(self.rqdata.dataCaches[mc].hashfn[fn]) sq_hashfn.append(self.rqdata.dataCaches[mc].hashfn[taskfn])
sq_hash.append(self.rqdata.runtaskentries[tid].hash) sq_hash.append(self.rqdata.runtaskentries[tid].hash)
sq_taskname.append(taskname) sq_taskname.append(taskname)
sq_task.append(tid) sq_task.append(tid)
@ -2131,8 +2131,8 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
def check_taskfail(self, task): def check_taskfail(self, task):
if self.rqdata.setscenewhitelist: if self.rqdata.setscenewhitelist:
realtask = task.split('_setscene')[0] realtask = task.split('_setscene')[0]
(mc, fn, taskname, _) = split_tid_mcfn(realtask) (mc, fn, taskname, taskfn) = split_tid_mcfn(realtask)
pn = self.rqdata.dataCaches[mc].pkg_fn[fn] pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn]
if not check_setscene_enforce_whitelist(pn, taskname, self.rqdata.setscenewhitelist): if not check_setscene_enforce_whitelist(pn, taskname, self.rqdata.setscenewhitelist):
logger.error('Task %s.%s failed' % (pn, taskname + "_setscene")) logger.error('Task %s.%s failed' % (pn, taskname + "_setscene"))
self.rq.state = runQueueCleanUp self.rq.state = runQueueCleanUp
@ -2262,7 +2262,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
def getsetscenedeps(tid): def getsetscenedeps(tid):
deps = set() deps = set()
(mc, fn, taskname, _) = split_tid_mcfn(tid) (mc, fn, taskname, _) = split_tid_mcfn(tid)
realtid = fn + ":" + taskname + "_setscene" realtid = tid + "_setscene"
idepends = self.rqdata.taskData[mc].taskentries[realtid].idepends idepends = self.rqdata.taskData[mc].taskentries[realtid].idepends
for (depname, idependtask) in idepends: for (depname, idependtask) in idepends:
if depname not in self.rqdata.taskData[mc].build_targets: if depname not in self.rqdata.taskData[mc].build_targets: