From 4a1cb07df2c93561f82fdf62bf6a2729f3e36add Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 3 Jul 2019 22:57:52 +0100 Subject: 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 --- bitbake/lib/bb/runqueue.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'bitbake/lib/bb/runqueue.py') 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): if self.rq.can_start_task(): return self.next_buildable_task() - def initbuildable(self): - for tid in self.rqdata.runtaskentries: - if tid in self.rq.runq_buildable: - self.buildable.append(tid) - def newbuildable(self, task): self.buildable.append(task) @@ -2504,7 +2499,7 @@ def start_runqueue_tasks(rqexec): # Mark initial buildable tasks for tid in rqexec.rqdata.runtaskentries: if len(rqexec.rqdata.runtaskentries[tid].depends) == 0: - rqexec.runq_buildable.add(tid) + rqexec.setbuildable(tid) if len(rqexec.rqdata.runtaskentries[tid].revdeps) > 0 and rqexec.rqdata.runtaskentries[tid].revdeps.issubset(rqexec.scenequeue_covered): rqexec.scenequeue_covered.add(tid) @@ -2527,8 +2522,6 @@ def start_runqueue_tasks(rqexec): for task in self.rq.scenequeue_notcovered: logger.debug(1, 'Not skipping task %s', task) - rqexec.sched.initbuildable() - class TaskFailure(Exception): """ Exception raised when a task in a runqueue fails -- cgit 1.2.3-korg