mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: runqueue: Simplify _execute_runqueue logic

Browse Source 
Cleanup to the _execute_runqueue logic to reduce indentation, drop the
dummy executor class concept and prepare for further changes.

(Bitbake rev: 726e3c61a69fef16e605ba9b911a17cd99f1a2c3)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2019-07-03 17:36:19 +01:00
parent d3d7163ab6
commit b4c6a2d059
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/runqueue.py
+24 -22
View File
@@ -1420,15 +1420,16 @@ class RunQueue:
self.state = runQueueComplete self.state = runQueueComplete
else: else:
self.state = runQueueSceneInit self.state = runQueueSceneInit
self.rqdata.init_progress_reporter.next_stage()
# we are ready to run, emit dependency info to any UI or class which
# needs it
depgraph = self.cooker.buildDependTree(self, self.rqdata.taskData)
self.rqdata.init_progress_reporter.next_stage()
bb.event.fire(bb.event.DepTreeGenerated(depgraph), self.cooker.data)
if self.state is runQueueSceneInit: if self.state is runQueueSceneInit:
self.rqdata.init_progress_reporter.next_stage()
# we are ready to run, emit dependency info to any UI or class which
# needs it
depgraph = self.cooker.buildDependTree(self, self.rqdata.taskData)
self.rqdata.init_progress_reporter.next_stage()
bb.event.fire(bb.event.DepTreeGenerated(depgraph), self.cooker.data)
if not self.dm_event_handler_registered: if not self.dm_event_handler_registered:
res = bb.event.register(self.dm_event_handler_name, res = bb.event.register(self.dm_event_handler_name,
lambda x: self.dm.check(self) if self.state in [runQueueSceneRun, runQueueRunning, runQueueCleanUp] else False, lambda x: self.dm.check(self) if self.state in [runQueueSceneRun, runQueueRunning, runQueueCleanUp] else False,
@@ -1444,13 +1445,13 @@ class RunQueue:
if 'printdiff' in dump: if 'printdiff' in dump:
self.write_diffscenetasks(invalidtasks) self.write_diffscenetasks(invalidtasks)
self.state = runQueueComplete self.state = runQueueComplete
else:
self.rqdata.init_progress_reporter.next_stage() if self.state is runQueueSceneInit:
self.start_worker() self.rqdata.init_progress_reporter.next_stage()
self.rqdata.init_progress_reporter.next_stage() self.start_worker()
if not self.rqexe: self.rqdata.init_progress_reporter.next_stage()
self.rqexe = RunQueueExecute(self) self.rqexe = RunQueueExecute(self)
start_scenequeue_tasks(self.rqexe) start_scenequeue_tasks(self.rqexe)
if self.state is runQueueSceneRun: if self.state is runQueueSceneRun:
retval = self.rqexe.sq_execute() retval = self.rqexe.sq_execute()
@@ -1458,14 +1459,15 @@ class RunQueue:
if self.state is runQueueRunInit: if self.state is runQueueRunInit:
if self.cooker.configuration.setsceneonly: if self.cooker.configuration.setsceneonly:
self.state = runQueueComplete self.state = runQueueComplete
else:
# Just in case we didn't setscene if self.state is runQueueRunInit:
self.rqdata.init_progress_reporter.finish() # Just in case we didn't setscene
logger.info("Executing RunQueue Tasks") self.rqdata.init_progress_reporter.finish()
if not self.rqexe: logger.info("Executing RunQueue Tasks")
self.rqexe = RunQueueExecute(self) if not self.rqexe:
start_runqueue_tasks(self.rqexe) self.rqexe = RunQueueExecute(self)
self.state = runQueueRunning start_runqueue_tasks(self.rqexe)
self.state = runQueueRunning
if self.state is runQueueRunning: if self.state is runQueueRunning:
retval = self.rqexe.execute() retval = self.rqexe.execute()