summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui/uihelper.py
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-06-23 22:59:05 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-08 09:57:26 +0100
commitac5e720575dd3c8f86514a7a646de82c8cc28e17 (patch)
tree9c0cec5d764f1b9fb8f33d5f094d87a8fbc89ab5 /bitbake/lib/bb/ui/uihelper.py
parent1cf6e14a6c5ddb4daec1c1e0cce113eea8570545 (diff)
downloadpoky-ac5e720575dd3c8f86514a7a646de82c8cc28e17.tar.gz
bitbake: lib: implement basic task progress support
For long-running tasks where we have some output from the task that gives us some idea of the progress of the task (such as a percentage complete), provide the means to scrape the output for that progress information and show it to the user in the default knotty terminal output in the form of a progress bar. This is implemented using a new TaskProgress event as well as some code we can insert to do output scanning/filtering. Any task can fire TaskProgress events; however, if you have a shell task whose output you wish to scan for progress information, you just need to set the "progress" varflag on the task. This can be set to: * "percent" to just look for a number followed by a % sign * "percent:<regex>" to specify your own regex matching a percentage value (must have a single group which matches the percentage number) * "outof:<regex>" to look for the specified regex matching x out of y items completed (must have two groups - first group needs to be x, second y). We can potentially extend this in future but this should be a good start. Part of the implementation for [YOCTO #5383]. (Bitbake rev: 0d275fc5b6531957a6189069b04074065bb718a0) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/uihelper.py')
-rw-r--r--bitbake/lib/bb/ui/uihelper.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/bitbake/lib/bb/ui/uihelper.py b/bitbake/lib/bb/ui/uihelper.py
index db70b763f3..1915e47703 100644
--- a/bitbake/lib/bb/ui/uihelper.py
+++ b/bitbake/lib/bb/ui/uihelper.py
@@ -18,6 +18,7 @@
18# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 18# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19 19
20import bb.build 20import bb.build
21import time
21 22
22class BBUIHelper: 23class BBUIHelper:
23 def __init__(self): 24 def __init__(self):
@@ -31,7 +32,7 @@ class BBUIHelper:
31 32
32 def eventHandler(self, event): 33 def eventHandler(self, event):
33 if isinstance(event, bb.build.TaskStarted): 34 if isinstance(event, bb.build.TaskStarted):
34 self.running_tasks[event.pid] = { 'title' : "%s %s" % (event._package, event._task) } 35 self.running_tasks[event.pid] = { 'title' : "%s %s" % (event._package, event._task), 'starttime' : time.time() }
35 self.running_pids.append(event.pid) 36 self.running_pids.append(event.pid)
36 self.needUpdate = True 37 self.needUpdate = True
37 if isinstance(event, bb.build.TaskSucceeded): 38 if isinstance(event, bb.build.TaskSucceeded):
@@ -52,6 +53,10 @@ class BBUIHelper:
52 self.tasknumber_current = event.stats.completed + event.stats.active + event.stats.failed + 1 53 self.tasknumber_current = event.stats.completed + event.stats.active + event.stats.failed + 1
53 self.tasknumber_total = event.stats.total 54 self.tasknumber_total = event.stats.total
54 self.needUpdate = True 55 self.needUpdate = True
56 if isinstance(event, bb.build.TaskProgress):
57 self.running_tasks[event.pid]['progress'] = event.progress
58 self.running_tasks[event.pid]['rate'] = event.rate
59 self.needUpdate = True
55 60
56 def getTasks(self): 61 def getTasks(self):
57 self.needUpdate = False 62 self.needUpdate = False