summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-29 12:10:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-01 11:32:08 +0000
commitc5ca140d3813dcac6606090fde7298bf275b0c5d (patch)
tree7da7c20636ffcfd14f7c413afa14154d1af81a42 /bitbake/lib/bb
parent3be7080d82a63325db51e816d42a2808bdd66124 (diff)
downloadpoky-c5ca140d3813dcac6606090fde7298bf275b0c5d.tar.gz
bitbake: runqueue: Ensure disk monitor is started when no setscene tasks are run
Currently if there are no setscene tasks, the disk monitor isn't started. Move the startup code to somewhere to ensure it always is started. This issue would partially explain occasional selftest failures. (Bitbake rev: 5ba83ee25c1c9cba349edb68a22476b1d5fca6ce) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/runqueue.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 9ce06c4085..4d5d876797 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1409,6 +1409,12 @@ class RunQueue:
1409 bb.event.fire(bb.event.DepTreeGenerated(depgraph), self.cooker.data) 1409 bb.event.fire(bb.event.DepTreeGenerated(depgraph), self.cooker.data)
1410 1410
1411 if self.state is runQueueSceneInit: 1411 if self.state is runQueueSceneInit:
1412 if not self.dm_event_handler_registered:
1413 res = bb.event.register(self.dm_event_handler_name,
1414 lambda x: self.dm.check(self) if self.state in [runQueueSceneRun, runQueueRunning, runQueueCleanUp] else False,
1415 ('bb.event.HeartbeatEvent',))
1416 self.dm_event_handler_registered = True
1417
1412 dump = self.cooker.configuration.dump_signatures 1418 dump = self.cooker.configuration.dump_signatures
1413 if dump: 1419 if dump:
1414 self.rqdata.init_progress_reporter.finish() 1420 self.rqdata.init_progress_reporter.finish()
@@ -1425,11 +1431,6 @@ class RunQueue:
1425 self.rqexe = RunQueueExecuteScenequeue(self) 1431 self.rqexe = RunQueueExecuteScenequeue(self)
1426 1432
1427 if self.state is runQueueSceneRun: 1433 if self.state is runQueueSceneRun:
1428 if not self.dm_event_handler_registered:
1429 res = bb.event.register(self.dm_event_handler_name,
1430 lambda x: self.dm.check(self) if self.state in [runQueueSceneRun, runQueueRunning, runQueueCleanUp] else False,
1431 ('bb.event.HeartbeatEvent',))
1432 self.dm_event_handler_registered = True
1433 retval = self.rqexe.execute() 1434 retval = self.rqexe.execute()
1434 1435
1435 if self.state is runQueueRunInit: 1436 if self.state is runQueueRunInit: