diff options
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 50 |
1 files changed, 18 insertions, 32 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 851e93f5a5e..2d9e18d8886 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -83,7 +83,6 @@ class RunQueueStats: self.skipped = 0 self.failed = 0 self.active = 0 - self.running = [] self.total = total def copy(self): @@ -91,33 +90,20 @@ class RunQueueStats: obj.__dict__.update(self.__dict__) return obj - def _taskRunning(self, task): - self.running.append(task) - - def _taskRemoveRunning(self, task): - try: - self.running.remove(task) - except: - bb.warn('Trying to remove task not on queue...') - - def taskFailed(self, task): + def taskFailed(self): self.active = self.active - 1 self.failed = self.failed + 1 - self._taskRemoveRunning(task) - def taskCompleted(self, task): + def taskCompleted(self): self.active = self.active - 1 self.completed = self.completed + 1 - self._taskRemoveRunning(task) - def taskSkipped(self, task): + def taskSkipped(self): self.active = self.active + 1 self.skipped = self.skipped + 1 - self._taskRunning(task) - def taskActive(self, task): + def taskActive(self): self.active = self.active + 1 - self._taskRunning(task) # These values indicate the next step due to be run in the # runQueue state machine @@ -1911,7 +1897,7 @@ class RunQueueExecuteTasks(RunQueueExecute): logger.debug(1, "Marking task %s as buildable", revdep) def task_complete(self, task): - self.stats.taskCompleted(task) + self.stats.taskCompleted() bb.event.fire(runQueueTaskCompleted(task, self.stats, self.rq), self.cfgData) self.task_completeoutright(task) @@ -1920,7 +1906,7 @@ class RunQueueExecuteTasks(RunQueueExecute): Called when a task has failed Updates the state engine with the failure """ - self.stats.taskFailed(task) + self.stats.taskFailed() self.failed_tids.append(task) bb.event.fire(runQueueTaskFailed(task, self.stats, exitcode, self.rq), self.cfgData) if self.rqdata.taskData[''].abort: @@ -1931,8 +1917,8 @@ class RunQueueExecuteTasks(RunQueueExecute): self.setbuildable(task) bb.event.fire(runQueueTaskSkipped(task, self.stats, self.rq, reason), self.cfgData) self.task_completeoutright(task) - self.stats.taskSkipped(task) - self.stats.taskCompleted(task) + self.stats.taskSkipped() + self.stats.taskCompleted() def execute(self): """ @@ -2011,7 +1997,7 @@ class RunQueueExecuteTasks(RunQueueExecute): noexec=True) bb.event.fire(startevent, self.cfgData) self.runq_running.add(task) - self.stats.taskActive(task) + self.stats.taskActive() if not (self.cooker.configuration.dry_run or self.rqdata.setscene_enforce): bb.build.make_stamp(taskname, self.rqdata.dataCaches[mc], taskfn) self.task_complete(task) @@ -2030,7 +2016,7 @@ class RunQueueExecuteTasks(RunQueueExecute): except OSError as exc: logger.critical("Failed to spawn fakeroot worker to run %s: %s" % (task, str(exc))) self.rq.state = runQueueFailed - self.stats.taskFailed(task) + self.stats.taskFailed() return True self.rq.fakeworker[mc].process.stdin.write(b"<runtask>" + pickle.dumps((taskfn, task, taskname, False, self.cooker.collection.get_file_appends(taskfn), taskdepdata, self.rqdata.setscene_enforce)) + b"</runtask>") self.rq.fakeworker[mc].process.stdin.flush() @@ -2041,7 +2027,7 @@ class RunQueueExecuteTasks(RunQueueExecute): self.build_stamps[task] = bb.build.stampfile(taskname, self.rqdata.dataCaches[mc], taskfn, noextra=True) self.build_stamps2.append(self.build_stamps[task]) self.runq_running.add(task) - self.stats.taskActive(task) + self.stats.taskActive() if self.stats.active < self.number_tasks: return True @@ -2363,12 +2349,12 @@ class RunQueueExecuteScenequeue(RunQueueExecute): self.rq.state = runQueueCleanUp def task_complete(self, task): - self.stats.taskCompleted(task) + self.stats.taskCompleted() bb.event.fire(sceneQueueTaskCompleted(task, self.stats, self.rq), self.cfgData) self.task_completeoutright(task) def task_fail(self, task, result): - self.stats.taskFailed(task) + self.stats.taskFailed() bb.event.fire(sceneQueueTaskFailed(task, self.stats, result, self), self.cfgData) self.scenequeue_notcovered.add(task) self.scenequeue_updatecounters(task, True) @@ -2377,8 +2363,8 @@ class RunQueueExecuteScenequeue(RunQueueExecute): def task_failoutright(self, task): self.runq_running.add(task) self.runq_buildable.add(task) - self.stats.taskSkipped(task) - self.stats.taskCompleted(task) + self.stats.taskSkipped() + self.stats.taskCompleted() self.scenequeue_notcovered.add(task) self.scenequeue_updatecounters(task, True) @@ -2386,8 +2372,8 @@ class RunQueueExecuteScenequeue(RunQueueExecute): self.runq_running.add(task) self.runq_buildable.add(task) self.task_completeoutright(task) - self.stats.taskSkipped(task) - self.stats.taskCompleted(task) + self.stats.taskSkipped() + self.stats.taskCompleted() def execute(self): """ @@ -2455,7 +2441,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute): self.build_stamps[task] = bb.build.stampfile(taskname, self.rqdata.dataCaches[mc], taskfn, noextra=True) self.build_stamps2.append(self.build_stamps[task]) self.runq_running.add(task) - self.stats.taskActive(task) + self.stats.taskActive() if self.stats.active < self.number_tasks: return True |