diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-08 16:38:14 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-09 22:15:49 +0000 |
| commit | 1aae44787cf09a997e3a9ab8b4d64a417a4ee49e (patch) | |
| tree | 13cb88b364d7eba5e291eed9c895f37ee9a32b66 /bitbake/lib/bb/runqueue.py | |
| parent | eb2ea6fd2d2dc626ead13de1ec334d4220651612 (diff) | |
| download | openembedded-core-contrib-1aae44787cf09a997e3a9ab8b4d64a417a4ee49e.tar.gz | |
bitbake: runqueue: Fix 100% cpu use after keyboard interrupt
After Ctrl+C is pressed to interrupt bitbake, it loops continually, running
at 100% cpu. This patch selects on the correct file descriptors resolving
the excess cpu usage.
(Bitbake rev: 497404e8484b7ca7c11e459bf0845642156eb677)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 22dd7a7285..c503980666 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -1064,7 +1064,7 @@ class RunQueue: retval = self.rqexe.execute() if self.state is runQueueCleanUp: - self.rqexe.finish() + retval = self.rqexe.finish() if (self.state is runQueueComplete or self.state is runQueueFailed) and self.rqexe: self.teardown_workers() @@ -1306,15 +1306,14 @@ class RunQueueExecute: if self.stats.active > 0: bb.event.fire(runQueueExitWait(self.stats.active), self.cfgData) self.rq.read_workers() - - return + return self.rq.active_fds() if len(self.failed_fnids) != 0: self.rq.state = runQueueFailed - return + return True self.rq.state = runQueueComplete - return + return True def check_dependencies(self, task, taskdeps, setscene = False): if not self.rq.depvalidate: |