diff --git a/lib/bb/build.py b/lib/bb/build.py index 82d22f7..beb53dd 100644 --- a/lib/bb/build.py +++ b/lib/bb/build.py @@ -88,6 +88,10 @@ class TaskBase(event.Event): class TaskStarted(TaskBase): """Task execution started""" + def __init__(self, t, d): + self.logfile = d.getVar("BB_LOGFILE", True) or ""; + super(TaskStarted, self).__init__(t, d) + class TaskSucceeded(TaskBase): """Task execution completed""" diff --git a/lib/bb/ui/crumbs/multilogtail.py b/lib/bb/ui/crumbs/multilogtail.py new file mode 100644 index 0000000..da8ae68 --- /dev/null +++ b/lib/bb/ui/crumbs/multilogtail.py @@ -0,0 +1,135 @@ +# +# Multipile Log Tail for real time logging +# +# Copyright (C) 2012 Wind River Systems, Inc. +# +# Authored by Jason Wessel +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import re +import time +import sys + +class LogTail(object): + """Tail a single log file""" + + def __init__(self): + self.file = None + self.offset = 0 + self.filterLines = True + self.limit = 8192 + self.cnt = 0 + self.storedLine = "" + + def openLog(self, filename, filterLines=True, limit=8192): + try: + self.file = open(filename, 'rb') + self.limit = limit + self.filterLines = filterLines + except: + return False + return True + + def getLeftLine(self): + (left, right) = self.storedLine.split('\r',1) + self.storedLine = right + self.cnt = len(right) + return left + + def getLine(self): + if self.cnt > 0 and '\r' in self.storedLine: + return self.getLeftLine() + while 1: + self.offset = self.file.tell() + line = self.file.readline() + if line: + if self.filterLines: + line = line.replace('\r\n','\r'); + line = line.replace('\n','\r'); + self.storedLine += line + self.cnt = len(self.storedLine) + if (self.cnt > self.limit): + if not '\r' in self.storedLine: + self.storedLine += '\r' + return self.getLeftLine() + if '\r' in self.storedLine: + return self.getLeftLine() + continue + else: + return line + self.file.seek(self.offset) + return None + + def closeLog(self): + if self.file: + self.file.close() + self.file = None + + def __del__(self): + self.closeLog() + +class MultiLogTail(object): + """Tail mulitple log files""" + + def __init__(self, printPid=True): + self.filelist = [] + self.trackPid = [] + self.printPid = printPid + + def openLog(self, filename, pid=0, limit=8192): + logtail = LogTail() + if logtail.openLog(filename, True, limit): + self.filelist.append((logtail, filename, pid)) + else: + if pid > 0: + self.trackPid.append(pid) + + def displayLogs(self): + for (logtail, filename, pid) in self.filelist: + while 1: + output = logtail.getLine() + if output == None: + break + if self.printPid: + print " " + str(pid) + ":" + output + else: + print output + + def closeLogs(self): + while 1: + try: + (logtail, filename, pid) = self.filelist.pop() + logtail.closeLog() + except: + break + + def closeLog(self, rm_filename): + for (logtail, filename, pid) in self.filelist: + if filename == rm_filename: + self.filelist.remove((logtail, filename, pid)) + logtail.closeLog() + return + raise Exception("File %s not in the list" % rm_filename) + + def closeLogPid(self, rm_pid): + for (logtail, filename, pid) in self.filelist: + if pid == rm_pid: + self.filelist.remove((logtail, filename, pid)) + logtail.closeLog() + return + if rm_pid in self.trackPid: + self.trackPid.remove(rm_pid) + return + print "ERROR: PID %s not in the list" % rm_pid diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index d81ad5d..d412192 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -22,6 +22,7 @@ from __future__ import division import os import sys +import select import xmlrpclib import logging import progressbar @@ -32,6 +33,7 @@ import fcntl import struct import copy from bb.ui import uihelper +from bb.ui.crumbs.multilogtail import MultiLogTail logger = logging.getLogger("BitBake") interactive = sys.stdout.isatty() @@ -211,6 +213,25 @@ class TerminalFilter(object): fd = sys.stdin.fileno() self.termios.tcsetattr(fd, self.termios.TCSADRAIN, self.stdinbackup) +class RtLogLevel: + def __init__(self, mlt): + self.displaytail = False + self.mlt = mlt + + def displayLogs(self): + if self.displaytail: + self.mlt.displayLogs() + + def setLevel(self, input, verbose): + if input == "1": + if verbose: + print "NOTE: Turning off real time log tail" + self.displaytail = False + elif input == "2": + if verbose: + print "NOTE: Turning on real time log tail" + self.displaytail = True + def main(server, eventHandler, tf = TerminalFilter): # Get values of variables which control our output @@ -222,11 +243,22 @@ def main(server, eventHandler, tf = TerminalFilter): else: log_exec_tty = False + # MultiTail affected varialbles + numthreads = server.runCommand(["getVariable", "BB_NUMBER_THREADS"]) + if numthreads is None or numthreads == "1": + mlt = MultiLogTail(False) + else: + mlt = MultiLogTail(True) + helper = uihelper.BBUIHelper() console = logging.StreamHandler(sys.stdout) format = bb.msg.BBLogFormatter("%(levelname)s: %(message)s") bb.msg.addDefaultlogFilter(console) + rtloglevel = RtLogLevel(mlt) + bb_rt_loglevel = server.runCommand(["getVariable", "BB_RT_LOGLEVEL"]) + if bb_rt_loglevel and bb_rt_loglevel != "": + rtloglevel.setLevel(bb_rt_loglevel, False) console.setFormatter(format) logger.addHandler(console) if consolelogfile: @@ -267,11 +299,23 @@ def main(server, eventHandler, tf = TerminalFilter): try: termfilter.updateFooter() event = eventHandler.waitEvent(0.25) + # Always try printing any accumulated log files first + rtloglevel.displayLogs() if event is None: if main.shutdown > 1: break continue helper.eventHandler(event) + if isinstance(event, bb.build.TaskStarted): + mlt.openLog(event.logfile, event.pid) + rtloglevel.displayLogs() + + if isinstance(event, bb.build.TaskSucceeded): + mlt.closeLogPid(event.pid) + + if isinstance(event, bb.build.TaskFailed): + mlt.closeLogPid(event.pid) + if isinstance(event, bb.runqueue.runQueueExitWait): if not main.shutdown: main.shutdown = 1