diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-03 22:57:52 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-15 10:28:12 +0100 |
commit | 4a1cb07df2c93561f82fdf62bf6a2729f3e36add (patch) | |
tree | b57e0b006a1b7492c73c55b6443ff44020a3608f | |
parent | a9e759be656a022df81899e4be600dfcfecaff1e (diff) | |
download | poky-4a1cb07df2c93561f82fdf62bf6a2729f3e36add.tar.gz |
bitbake: runqueue: Further scheduler buildable tasks cleanup
The code for setting up buildable tasks can be simplified.
(Bitbake rev: ce3cd2df5b034f8dbdcf9834e8b9a393b6b01aad)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 78e09945a0..dac0cd9cb9 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -196,11 +196,6 @@ class RunQueueScheduler(object): | |||
196 | if self.rq.can_start_task(): | 196 | if self.rq.can_start_task(): |
197 | return self.next_buildable_task() | 197 | return self.next_buildable_task() |
198 | 198 | ||
199 | def initbuildable(self): | ||
200 | for tid in self.rqdata.runtaskentries: | ||
201 | if tid in self.rq.runq_buildable: | ||
202 | self.buildable.append(tid) | ||
203 | |||
204 | def newbuildable(self, task): | 199 | def newbuildable(self, task): |
205 | self.buildable.append(task) | 200 | self.buildable.append(task) |
206 | 201 | ||
@@ -2504,7 +2499,7 @@ def start_runqueue_tasks(rqexec): | |||
2504 | # Mark initial buildable tasks | 2499 | # Mark initial buildable tasks |
2505 | for tid in rqexec.rqdata.runtaskentries: | 2500 | for tid in rqexec.rqdata.runtaskentries: |
2506 | if len(rqexec.rqdata.runtaskentries[tid].depends) == 0: | 2501 | if len(rqexec.rqdata.runtaskentries[tid].depends) == 0: |
2507 | rqexec.runq_buildable.add(tid) | 2502 | rqexec.setbuildable(tid) |
2508 | if len(rqexec.rqdata.runtaskentries[tid].revdeps) > 0 and rqexec.rqdata.runtaskentries[tid].revdeps.issubset(rqexec.scenequeue_covered): | 2503 | if len(rqexec.rqdata.runtaskentries[tid].revdeps) > 0 and rqexec.rqdata.runtaskentries[tid].revdeps.issubset(rqexec.scenequeue_covered): |
2509 | rqexec.scenequeue_covered.add(tid) | 2504 | rqexec.scenequeue_covered.add(tid) |
2510 | 2505 | ||
@@ -2527,8 +2522,6 @@ def start_runqueue_tasks(rqexec): | |||
2527 | for task in self.rq.scenequeue_notcovered: | 2522 | for task in self.rq.scenequeue_notcovered: |
2528 | logger.debug(1, 'Not skipping task %s', task) | 2523 | logger.debug(1, 'Not skipping task %s', task) |
2529 | 2524 | ||
2530 | rqexec.sched.initbuildable() | ||
2531 | |||
2532 | class TaskFailure(Exception): | 2525 | class TaskFailure(Exception): |
2533 | """ | 2526 | """ |
2534 | Exception raised when a task in a runqueue fails | 2527 | Exception raised when a task in a runqueue fails |