Add functionality to allow UIs to update and change the types of events they
recieve. To do this we need to add a new command and also need to be able
to obtain the current event hander ID. In the case of xmlrpc, this is
straightforward, in the case of the process server we need to save the result
in a multiprocessing.Value() so we can retrive it. An excplit command
was added to the server API to facilitate this.
The same function can also be used to mask or unmask specific log messages,
allowing the UI to optionally differ from the standard set of message
filtering.
Based upon work by Cristiana Voicu <cristiana.voicu@intel.com>
(Bitbake rev:
ba5a6c88785d9889d4172ec79937ac2a5555327e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
name = params[0]
command.cooker.createConfigFile(name)
+ def setEventMask(self, command, params):
+ handlerNum = params[0]
+ llevel = params[1]
+ debug_domains = params[2]
+ mask = params[3]
+ return bb.event.set_UIHmask(handlerNum, llevel, debug_domains, mask)
+
class CommandsAsync:
"""
A class of asynchronous commands
else:
_handlers[name] = handler
- if not mask:
+ if not mask or '*' in mask:
_catchall_handlers[name] = True
else:
for m in mask:
self.update(None, level, debug_domains)
def update(self, eventmask, level, debug_domains):
- self.eventmask = None
+ self.eventmask = eventmask
self.stdlevel = level
self.debug_domains = debug_domains
if event.name in self.debug_domains and event.levelno >= self.debug_domains[event.name]:
return True
return False
- # Implement other event masking here on self.eventmask
+ eid = str(event.__class__)[8:-2]
+ if eid not in self.eventmask:
+ return False
return True
+def set_UIHmask(handlerNum, level, debug_domains, mask):
+ if not handlerNum in _ui_handlers:
+ return False
+ if '*' in mask:
+ _ui_logfilters[handlerNum].update(None, level, debug_domains)
+ else:
+ _ui_logfilters[handlerNum].update(mask, level, debug_domains)
+ return True
+
def getName(e):
"""Returns the name of a class or class instance"""
if getattr(e, "__name__", None) == None:
logger = logging.getLogger('BitBake')
class ServerCommunicator():
- def __init__(self, connection):
+ def __init__(self, connection, event_handle):
self.connection = connection
+ self.event_handle = event_handle
def runCommand(self, command):
# @todo try/except
except KeyboardInterrupt:
pass
+ def getEventHandle(self):
+ return self.event_handle.value
class EventAdapter():
"""
self.keep_running = Event()
self.keep_running.set()
+ self.event_handle = multiprocessing.Value("i")
def run(self):
for event in bb.event.ui_queue:
self.event_queue.put(event)
- self.event_handle = bb.event.register_UIHhandler(self)
+ self.event_handle.value = bb.event.register_UIHhandler(self)
bb.cooker.server_main(self.cooker, self.main)
def main(self):
logger.exception('Running command %s', command)
self.event_queue.close()
- bb.event.unregister_UIHhandler(self.event_handle)
+ bb.event.unregister_UIHhandler(self.event_handle.value)
self.command_channel.close()
self.cooker.stop()
self.idle_commands(.1)
self.procserver = serverImpl
self.ui_channel = ui_channel
self.event_queue = event_queue
- self.connection = ServerCommunicator(self.ui_channel)
+ self.connection = ServerCommunicator(self.ui_channel, self.procserver.event_handle)
self.events = self.event_queue
def terminate(self):
"""
s, t = _create_server(host, port)
- return bb.event.register_UIHhandler(s)
+ self.event_handle = bb.event.register_UIHhandler(s)
+ return self.event_handle
def unregisterEventHandler(self, handlerNum):
"""
"""
return self.cooker.command.runCommand(command, self.server.readonly)
+ def getEventHandle(self):
+ return self.event_handle
+
def terminateServer(self):
"""
Trigger the server to quit
raise BaseException(error)
return includelogs, loglines, consolelogfile
+_evt_list = [ "bb.runqueue.runQueueExitWait", "bb.event.LogExecTTY", "logging.LogRecord",
+ "bb.build.TaskFailed", "bb.build.TaskBase", "bb.event.ParseStarted",
+ "bb.event.ParseProgress", "bb.event.ParseCompleted", "bb.event.CacheLoadStarted",
+ "bb.event.CacheLoadProgress", "bb.event.CacheLoadCompleted", "bb.command.CommandFailed",
+ "bb.command.CommandExit", "bb.command.CommandCompleted", "bb.cooker.CookerExit",
+ "bb.event.MultipleProviders", "bb.event.NoProvider", "bb.runqueue.sceneQueueTaskStarted",
+ "bb.runqueue.runQueueTaskStarted", "bb.runqueue.runQueueTaskFailed", "bb.runqueue.sceneQueueTaskFailed",
+ "bb.event.BuildBase", "bb.build.TaskStarted", "bb.build.TaskSucceeded", "bb.build.TaskFailedSilent"]
+
def main(server, eventHandler, params, tf = TerminalFilter):
includelogs, loglines, consolelogfile = _log_settings_from_server(server)
consolelog.setFormatter(conlogformat)
logger.addHandler(consolelog)
+ llevel, debug_domains = bb.msg.constructLogOptions()
+ server.runCommand(["setEventMask", server.getEventHandle(), llevel, debug_domains, _evt_list])
+
if not params.observe_only:
params.updateFromServer(server)
cmdline = params.parseActions()