summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-23 22:41:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-06 11:21:31 +0100
commit53bb93938310243250eab1b0ae34f469bbec6fd6 (patch)
treea739068f8f37615f6772e97d633a5f142bc56ea8 /bitbake/lib
parent5f56244092d658764700bd2483173b6f577bba30 (diff)
downloadpoky-53bb93938310243250eab1b0ae34f469bbec6fd6.tar.gz
bitbake: runqueue: Improve scenequeue processing logic
Rather than a special copy of the data structure which we change, compute the logic using set operations from other data we have. This means we can add tasks back into the scenequeue without having to worry about reversing operations on this variable with all the potential bugs that might involve. (Bitbake rev: b707d0cbc25fa336a1e95ff588f1ea37eee063eb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/runqueue.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 6a2de240cc..9883a982c2 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -2206,12 +2206,9 @@ class RunQueueExecute:
2206 logger.debug(2, "%s was unavailable and is a hard dependency of %s so skipping" % (task, dep)) 2206 logger.debug(2, "%s was unavailable and is a hard dependency of %s so skipping" % (task, dep))
2207 self.sq_task_failoutright(dep) 2207 self.sq_task_failoutright(dep)
2208 continue 2208 continue
2209 if task not in self.sqdata.sq_revdeps2[dep]: 2209 if self.sqdata.sq_revdeps[dep].issubset(self.scenequeue_covered | self.scenequeue_notcovered):
2210 # May already have been removed by the fail case above 2210 if dep not in self.sq_buildable:
2211 continue 2211 self.sq_buildable.add(dep)
2212 self.sqdata.sq_revdeps2[dep].remove(task)
2213 if len(self.sqdata.sq_revdeps2[dep]) == 0:
2214 self.sq_buildable.add(dep)
2215 2212
2216 next = set([task]) 2213 next = set([task])
2217 while next: 2214 while next:
@@ -2377,8 +2374,6 @@ class SQData(object):
2377 self.sq_deps = {} 2374 self.sq_deps = {}
2378 # SceneQueue reverse dependencies 2375 # SceneQueue reverse dependencies
2379 self.sq_revdeps = {} 2376 self.sq_revdeps = {}
2380 # Copy of reverse dependencies used by sq processing code
2381 self.sq_revdeps2 = {}
2382 # Injected inter-setscene task dependencies 2377 # Injected inter-setscene task dependencies
2383 self.sq_harddeps = {} 2378 self.sq_harddeps = {}
2384 # Cache of stamp files so duplicates can't run in parallel 2379 # Cache of stamp files so duplicates can't run in parallel
@@ -2537,7 +2532,6 @@ def build_scenequeue_data(sqdata, rqdata, rq, cooker, stampcache, sqrq):
2537 # bb.warn("Task %s_setscene: is %s " % (tid, data)) 2532 # bb.warn("Task %s_setscene: is %s " % (tid, data))
2538 2533
2539 sqdata.sq_revdeps = sq_revdeps_squash 2534 sqdata.sq_revdeps = sq_revdeps_squash
2540 sqdata.sq_revdeps2 = copy.deepcopy(sqdata.sq_revdeps)
2541 sqdata.sq_covered_tasks = sq_collated_deps 2535 sqdata.sq_covered_tasks = sq_collated_deps
2542 2536
2543 # Build reverse version of revdeps to populate deps structure 2537 # Build reverse version of revdeps to populate deps structure