diff options
-rw-r--r-- | bitbake/lib/bb/build.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/buildinfohelper.py | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index 52e41493c1..5cb4c06a88 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py | |||
@@ -30,6 +30,7 @@ import sys | |||
30 | import logging | 30 | import logging |
31 | import shlex | 31 | import shlex |
32 | import glob | 32 | import glob |
33 | import time | ||
33 | import bb | 34 | import bb |
34 | import bb.msg | 35 | import bb.msg |
35 | import bb.process | 36 | import bb.process |
@@ -75,6 +76,7 @@ class TaskBase(event.Event): | |||
75 | self.taskfile = d.getVar("FILE", True) | 76 | self.taskfile = d.getVar("FILE", True) |
76 | self.taskname = self._task | 77 | self.taskname = self._task |
77 | self.logfile = logfile | 78 | self.logfile = logfile |
79 | self.time = time.time() | ||
78 | event.Event.__init__(self) | 80 | event.Event.__init__(self) |
79 | self._message = "recipe %s: task %s: %s" % (d.getVar("PF", True), t, self.getDisplayName()) | 81 | self._message = "recipe %s: task %s: %s" % (d.getVar("PF", True), t, self.getDisplayName()) |
80 | 82 | ||
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 15bc069b8f..2084aab96c 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py | |||
@@ -133,10 +133,10 @@ class ORMWrapper(object): | |||
133 | elif outcome_task_setscene == Task.OUTCOME_FAILED: | 133 | elif outcome_task_setscene == Task.OUTCOME_FAILED: |
134 | task_object.sstate_result = Task.SSTATE_FAILED | 134 | task_object.sstate_result = Task.SSTATE_FAILED |
135 | 135 | ||
136 | # mark down duration if we have a start time | 136 | # mark down duration if we have a start time and a current time |
137 | if 'start_time' in task_information.keys(): | 137 | if 'start_time' in task_information.keys() and 'time' in vars(event): |
138 | duration = datetime.datetime.now() - task_information['start_time'] | 138 | duration = event.time - task_information['start_time'] |
139 | task_object.elapsed_time = duration.total_seconds() | 139 | task_object.elapsed_time = duration |
140 | 140 | ||
141 | task_object.save() | 141 | task_object.save() |
142 | return task_object | 142 | return task_object |
@@ -717,6 +717,9 @@ class BuildInfoHelper(object): | |||
717 | recipe = self.orm_wrapper.get_update_recipe_object(recipe_information, True) | 717 | recipe = self.orm_wrapper.get_update_recipe_object(recipe_information, True) |
718 | task_information = self._get_task_information(event,recipe) | 718 | task_information = self._get_task_information(event,recipe) |
719 | 719 | ||
720 | if 'time' in vars(event) and isinstance(event, bb.build.TaskStarted): | ||
721 | self.internal_state['taskdata'][identifier]['start_time'] = event.time | ||
722 | |||
720 | task_information['start_time'] = self.internal_state['taskdata'][identifier]['start_time'] | 723 | task_information['start_time'] = self.internal_state['taskdata'][identifier]['start_time'] |
721 | task_information['outcome'] = self.internal_state['taskdata'][identifier]['outcome'] | 724 | task_information['outcome'] = self.internal_state['taskdata'][identifier]['outcome'] |
722 | 725 | ||