summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-27 21:56:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-28 11:14:54 +0100
commit0a950ee14fce3a0cb938c22d7c717dc93ce6e25f (patch)
treed098a78a997d6eca5c72d3e2820d0a6760522581
parent5f892d9b083550e20e37576070ec7d1a94cc88fe (diff)
downloadbitbake-0a950ee14fce3a0cb938c22d7c717dc93ce6e25f.tar.gz
knotty: Allow displaying of status when no tasks are active
The console can appear to hang when no tasks are executing even if bitbake is iterating through a large number of tasks behind the scenes. This patch tweaks the footer code to display a status even when no tasks are active to give the user better feedback about what is happening. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/ui/knotty.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py
index d81ad5d54..3799018fe 100644
--- a/lib/bb/ui/knotty.py
+++ b/lib/bb/ui/knotty.py
@@ -183,11 +183,11 @@ class TerminalFilter(object):
activetasks = self.helper.running_tasks
failedtasks = self.helper.failed_tasks
runningpids = self.helper.running_pids
- if self.footer_present and (self.lastpids == runningpids):
+ if self.footer_present and (self.lastcount == self.helper.tasknumber_current) and (self.lastpids == runningpids):
return
if self.footer_present:
self.clearFooter()
- if not activetasks:
+ if not self.helper.tasknumber_total or self.helper.tasknumber_current == self.helper.tasknumber_total:
return
tasks = []
for t in runningpids:
@@ -195,6 +195,8 @@ class TerminalFilter(object):
if self.main.shutdown:
content = "Waiting for %s running tasks to finish:" % len(activetasks)
+ elif not len(activetasks):
+ content = "No currently running tasks (%s of %s)" % (self.helper.tasknumber_current, self.helper.tasknumber_total)
else:
content = "Currently %s running tasks (%s of %s):" % (len(activetasks), self.helper.tasknumber_current, self.helper.tasknumber_total)
print content
@@ -205,6 +207,7 @@ class TerminalFilter(object):
lines = lines + 1 + int(len(content) / (self.columns + 1))
self.footer_present = lines
self.lastpids = runningpids[:]
+ self.lastcount = self.helper.tasknumber_current
def finish(self):
if self.stdinbackup: