mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

Move the runq task start/failed messages to the UI

Browse Source 
(Bitbake rev: ab831e867f09b47001cb8da2f8f060e04febf237)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Chris Larson
2010-12-06 14:58:55 -07:00
committed by Richard Purdie
parent 23735bb765
commit fcba92f354
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/runqueue.py
+4 -11
View File
@@ -1259,13 +1259,10 @@ class RunQueueExecuteTasks(RunQueueExecute):
Called when a task has failed Called when a task has failed
Updates the state engine with the failure Updates the state engine with the failure
""" """
logger.error("Task %s (%s) failed with exit code '%s'", task,
self.rqdata.get_user_idstring(task), exitcode)
self.stats.taskFailed() self.stats.taskFailed()
fnid = self.rqdata.runq_fnid[task] fnid = self.rqdata.runq_fnid[task]
self.failed_fnids.append(fnid) self.failed_fnids.append(fnid)
bb.event.fire(runQueueTaskFailed(task, self.stats, self.rq), self.cfgData) bb.event.fire(runQueueTaskFailed(task, self.stats, exitcode, self.rq), self.cfgData)
if self.rqdata.taskData.abort: if self.rqdata.taskData.abort:
self.rq.state = runQueueCleanUp self.rq.state = runQueueCleanUp
@@ -1308,11 +1305,6 @@ class RunQueueExecuteTasks(RunQueueExecute):
self.task_complete(task) self.task_complete(task)
return True return True
logger.info("Running task %d of %d (ID: %s, %s)" % (self.stats.completed + self.stats.active + self.stats.failed + 1,
self.stats.total,
task,
self.rqdata.get_user_idstring(task)))
pid, pipein, pipeout = self.fork_off_task(fn, task, taskname) pid, pipein, pipeout = self.fork_off_task(fn, task, taskname)
self.build_pids[pid] = task self.build_pids[pid] = task
@@ -1497,7 +1489,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
def task_fail(self, task, result): def task_fail(self, task, result):
self.stats.taskFailed() self.stats.taskFailed()
index = self.rqdata.runq_setscene[task] index = self.rqdata.runq_setscene[task]
bb.event.fire(runQueueTaskFailed(task, self.stats, self), self.cfgData) bb.event.fire(runQueueTaskFailed(task, self.stats, result, self), self.cfgData)
self.scenequeue_notcovered.add(task) self.scenequeue_notcovered.add(task)
self.scenequeue_updatecounters(task) self.scenequeue_updatecounters(task)
@@ -1626,8 +1618,9 @@ class runQueueTaskFailed(runQueueEvent):
""" """
Event notifing a task failed Event notifing a task failed
""" """
def __init__(self, task, stats, rq): def __init__(self, task, stats, exitcode, rq):
runQueueEvent.__init__(self, task, stats, rq) runQueueEvent.__init__(self, task, stats, rq)
self.exitcode = exitcode
self.message = "Task %s failed (%s)" % (task, self.taskstring) self.message = "Task %s failed (%s)" % (task, self.taskstring)
class runQueueTaskCompleted(runQueueEvent): class runQueueTaskCompleted(runQueueEvent):
bitbake/lib/bb/ui/knotty.py
+11
View File
@@ -192,6 +192,17 @@ def main(server, eventHandler):
logger.error("Nothing %sPROVIDES '%s'", r, event._item) logger.error("Nothing %sPROVIDES '%s'", r, event._item)
continue continue
if isinstance(event, bb.runqueue.runQueueTaskStarted):
logger.info("Running task %s of %s (ID: %s, %s)",
event.stats.completed + event.stats.active + event.stats.failed + 1,
event.stats.total, event.taskid, event.taskstring)
continue
if isinstance(event, bb.runqueue.runQueueTaskFailed):
logger.error("Task %s (%s) failed with exit code '%s'",
event.taskid, event.taskstring, event.exitcode)
continue
# ignore # ignore
if isinstance(event, (bb.event.BuildBase, if isinstance(event, (bb.event.BuildBase,
bb.event.StampUpdate, bb.event.StampUpdate,