diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-06-23 22:59:09 +1200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-05 13:38:16 +0100 |
| commit | de682015a3fefeff36ddc4197641a700f3fb558d (patch) | |
| tree | ec310a74054c2ad7be4d303c9b7de77c4f67e1a6 /lib/bb/ui | |
| parent | 070ae856da0715dbaf4c560c837ea796ffc29f00 (diff) | |
| download | bitbake-contrib-de682015a3fefeff36ddc4197641a700f3fb558d.tar.gz | |
knotty: show task progress bar
In addition to the "currently running n tasks (x of y)" message, show a
progress bar for another view on how much of the build is left. We have
to take care to reset it when moving from the scenequeue to the
runqueue, and explicitly don't include an ETA since not all tasks take
equal time and thus it isn't possible to estimate the time remaining
with the information available.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/ui')
| -rw-r--r-- | lib/bb/ui/knotty.py | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index 6fdaafedb..c245c22dc 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -89,6 +89,7 @@ class NonInteractiveProgress(object): def __init__(self, msg, maxval): self.msg = msg self.maxval = maxval + self.finished = False def start(self, update=True): self.fobj.write("%s..." % self.msg) @@ -99,8 +100,11 @@ class NonInteractiveProgress(object): pass def finish(self): + if self.finished: + return self.fobj.write("done.\n") self.fobj.flush() + self.finished = True def new_progress(msg, maxval): if interactive: @@ -204,6 +208,8 @@ class TerminalFilter(object): console.addFilter(InteractConsoleLogFilter(self, format)) errconsole.addFilter(InteractConsoleLogFilter(self, format)) + self.main_progress = None + def clearFooter(self): if self.footer_present: lines = self.footer_present @@ -246,11 +252,20 @@ 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) + print(content) else: - content = "Currently %s running tasks (%s of %s):" % (len(activetasks), self.helper.tasknumber_current, self.helper.tasknumber_total) - print(content) + if not len(activetasks): + content = "No currently running tasks (%s of %s)" % (self.helper.tasknumber_current, self.helper.tasknumber_total) + else: + content = "Currently %2s running tasks (%s of %s)" % (len(activetasks), self.helper.tasknumber_current, self.helper.tasknumber_total) + maxtask = self.helper.tasknumber_total + 1 + if not self.main_progress or self.main_progress.maxval != maxtask: + widgets = [' ', progressbar.Percentage(), ' ', progressbar.Bar()] + self.main_progress = BBProgress("Running tasks", maxtask, widgets=widgets) + self.main_progress.start(False) + self.main_progress.setmessage(content) + self.main_progress.update(self.helper.tasknumber_current) + print('') lines = 1 + int(len(content) / (self.columns + 1)) for tasknum, task in enumerate(tasks[:(self.rows - 2)]): if isinstance(task, tuple): |