diff options
| -rwxr-xr-x | bin/bitbake | 6 | ||||
| -rw-r--r-- | lib/bb/server/none.py | 203 |
2 files changed, 3 insertions, 206 deletions
diff --git a/bin/bitbake b/bin/bitbake index ac35b94e3..a868557a1 100755 --- a/bin/bitbake +++ b/bin/bitbake @@ -167,7 +167,7 @@ class BitBakeConfigParameters(cookerdata.ConfigParameters): parser.add_option("-u", "--ui", help = "userinterface to use", action = "store", dest = "ui") - parser.add_option("-t", "--servertype", help = "Choose which server to use, none, process or xmlrpc", + parser.add_option("-t", "--servertype", help = "Choose which server to use, process or xmlrpc", action = "store", dest = "servertype") parser.add_option("", "--revisions-changed", help = "Set the exit code depending on whether upstream floating revisions have changed or not", @@ -191,7 +191,7 @@ def main(): ui_main = get_ui(configuration) - # Server type can be xmlrpc, process or none currently, if nothing is specified, + # Server type can be xmlrpc or process currently, if nothing is specified, # the default server is process if configParams.servertype: server_type = configParams.servertype @@ -203,7 +203,7 @@ def main(): server = getattr(module, server_type) except AttributeError: sys.exit("FATAL: Invalid server type '%s' specified.\n" - "Valid interfaces: xmlrpc, process [default], none." % servertype) + "Valid interfaces: xmlrpc, process [default]." % servertype) if configParams.server_only: if configParams.servertype != "xmlrpc": diff --git a/lib/bb/server/none.py b/lib/bb/server/none.py deleted file mode 100644 index f5fd4d4f7..000000000 --- a/lib/bb/server/none.py +++ /dev/null @@ -1,203 +0,0 @@ -# -# BitBake 'dummy' Passthrough Server -# -# Copyright (C) 2006 - 2007 Michael 'Mickey' Lauer -# Copyright (C) 2006 - 2008 Richard Purdie -# -# 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. - -""" - This module implements a passthrough server for BitBake. - - Use register_idle_function() to add a function which the server - calls from within idle_commands when no requests are pending. Make sure - that those functions are non-blocking or else you will introduce latency - in the server's main loop. -""" - -import time -import bb -import signal - -DEBUG = False - -import inspect, select - -class BitBakeServerCommands(): - def __init__(self, server): - self.server = server - - def runCommand(self, command): - """ - Run a cooker command on the server - """ - #print "Running Command %s" % command - return self.cooker.command.runCommand(command) - - def terminateServer(self): - """ - Trigger the server to quit - """ - self.server.server_exit() - #print "Server (cooker) exitting" - return - - def ping(self): - """ - Dummy method which can be used to check the server is still alive - """ - return True - -eventQueue = [] - -class BBUIEventQueue: - class event: - def __init__(self, parent): - self.parent = parent - @staticmethod - def send(event): - bb.server.none.eventQueue.append(event) - @staticmethod - def quit(): - return - - def __init__(self, BBServer): - self.eventQueue = bb.server.none.eventQueue - self.BBServer = BBServer - self.EventHandle = bb.event.register_UIHhandler(self) - - def __popEvent(self): - if len(self.eventQueue) == 0: - return None - return self.eventQueue.pop(0) - - def getEvent(self): - if len(self.eventQueue) == 0: - self.BBServer.idle_commands(0) - return self.__popEvent() - - def waitEvent(self, delay): - event = self.__popEvent() - if event: - return event - self.BBServer.idle_commands(delay) - return self.__popEvent() - - def queue_event(self, event): - self.eventQueue.append(event) - - def system_quit( self ): - bb.event.unregister_UIHhandler(self.EventHandle) - -# Dummy signal handler to ensure we break out of sleep upon SIGCHLD -def chldhandler(signum, stackframe): - pass - -class BitBakeNoneServer(): - # remove this when you're done with debugging - # allow_reuse_address = True - - def __init__(self): - self._idlefuns = {} - self.commands = BitBakeServerCommands(self) - - def addcooker(self, cooker): - self.cooker = cooker - self.commands.cooker = cooker - - def register_idle_function(self, function, data): - """Register a function to be called while the server is idle""" - assert hasattr(function, '__call__') - self._idlefuns[function] = data - - def idle_commands(self, delay): - #print "Idle queue length %s" % len(self._idlefuns) - #print "Idle timeout, running idle functions" - #if len(self._idlefuns) == 0: - nextsleep = delay - for function, data in self._idlefuns.items(): - try: - retval = function(self, data, False) - #print "Idle function returned %s" % (retval) - if retval is False: - del self._idlefuns[function] - elif retval is True: - nextsleep = None - elif nextsleep is None: - continue - elif retval < nextsleep: - nextsleep = retval - except SystemExit: - raise - except: - import traceback - traceback.print_exc() - self.commands.runCommand(["stateShutdown"]) - pass - if nextsleep is not None: - #print "Sleeping for %s (%s)" % (nextsleep, delay) - signal.signal(signal.SIGCHLD, chldhandler) - time.sleep(nextsleep) - signal.signal(signal.SIGCHLD, signal.SIG_DFL) - - def server_exit(self): - # Tell idle functions we're exiting - for function, data in self._idlefuns.items(): - try: - retval = function(self, data, True) - except: - pass - -class BitBakeServerConnection(): - def __init__(self, server): - self.server = server.server - self.connection = self.server.commands - self.events = bb.server.none.BBUIEventQueue(self.server) - for event in bb.event.ui_queue: - self.events.queue_event(event) - - def terminate(self): - try: - self.events.system_quit() - except: - pass - try: - self.connection.terminateServer() - except: - pass - -class BitBakeServer(object): - def initServer(self): - self.server = BitBakeNoneServer() - - def addcooker(self, cooker): - self.cooker = cooker - self.server.addcooker(cooker) - - def getServerIdleCB(self): - return self.server.register_idle_function - - def saveConnectionDetails(self): - return - - def detach(self): - return - - def establishConnection(self): - self.connection = BitBakeServerConnection(self) - return self.connection - - def launchUI(self, uifunc, *args): - return bb.cooker.server_main(self.cooker, uifunc, *args) - |