mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
749ca68709
The recent change to Queue up events before the UI is spawned (in
26eda93337) broke the xmlrpc server because the
uievent implementation of BBUIEventQueue expects pickled strings for its
queue_event() method.
This is because the RPC exposed event.send() method must accept pickled
strings, but for xmlrpc event.send() is just mapped to queue_event().
Work around this by adding a send_event method which unpickles strings and
hands them off to queue_event() which can then be used for the remapping.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
128 lines
3.8 KiB
Python
128 lines
3.8 KiB
Python
# ex:ts=4:sw=4:sts=4:et
|
|
# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
|
|
#
|
|
# Copyright (C) 2006 - 2007 Michael 'Mickey' Lauer
|
|
# Copyright (C) 2006 - 2007 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.
|
|
|
|
|
|
"""
|
|
Use this class to fork off a thread to recieve event callbacks from the bitbake
|
|
server and queue them for the UI to process. This process must be used to avoid
|
|
client/server deadlocks.
|
|
"""
|
|
|
|
import socket, threading, pickle
|
|
from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler
|
|
|
|
class BBUIEventQueue:
|
|
def __init__(self, BBServer):
|
|
|
|
self.eventQueue = []
|
|
self.eventQueueLock = threading.Lock()
|
|
self.eventQueueNotify = threading.Event()
|
|
|
|
self.BBServer = BBServer
|
|
|
|
self.t = threading.Thread()
|
|
self.t.setDaemon(True)
|
|
self.t.run = self.startCallbackHandler
|
|
self.t.start()
|
|
|
|
def getEvent(self):
|
|
|
|
self.eventQueueLock.acquire()
|
|
|
|
if len(self.eventQueue) == 0:
|
|
self.eventQueueLock.release()
|
|
return None
|
|
|
|
item = self.eventQueue.pop(0)
|
|
|
|
if len(self.eventQueue) == 0:
|
|
self.eventQueueNotify.clear()
|
|
|
|
self.eventQueueLock.release()
|
|
return item
|
|
|
|
def waitEvent(self, delay):
|
|
self.eventQueueNotify.wait(delay)
|
|
return self.getEvent()
|
|
|
|
def queue_event(self, event):
|
|
self.eventQueueLock.acquire()
|
|
self.eventQueue.append(event)
|
|
self.eventQueueNotify.set()
|
|
self.eventQueueLock.release()
|
|
|
|
def send_event(self, event):
|
|
self.queue_event(pickle.loads(event))
|
|
|
|
def startCallbackHandler(self):
|
|
|
|
server = UIXMLRPCServer()
|
|
self.host, self.port = server.socket.getsockname()
|
|
|
|
server.register_function( self.system_quit, "event.quit" )
|
|
server.register_function( self.send_event, "event.send" )
|
|
server.socket.settimeout(1)
|
|
|
|
self.EventHandle = self.BBServer.registerEventHandler(self.host, self.port)
|
|
|
|
self.server = server
|
|
while not server.quit:
|
|
server.handle_request()
|
|
server.server_close()
|
|
|
|
def system_quit( self ):
|
|
"""
|
|
Shut down the callback thread
|
|
"""
|
|
try:
|
|
self.BBServer.unregisterEventHandler(self.EventHandle)
|
|
except:
|
|
pass
|
|
self.server.quit = True
|
|
|
|
class UIXMLRPCServer (SimpleXMLRPCServer):
|
|
|
|
def __init__( self, interface = ("localhost", 0) ):
|
|
self.quit = False
|
|
SimpleXMLRPCServer.__init__( self,
|
|
interface,
|
|
requestHandler=SimpleXMLRPCRequestHandler,
|
|
logRequests=False, allow_none=True)
|
|
|
|
def get_request(self):
|
|
while not self.quit:
|
|
try:
|
|
sock, addr = self.socket.accept()
|
|
sock.settimeout(1)
|
|
return (sock, addr)
|
|
except socket.timeout:
|
|
pass
|
|
return (None, None)
|
|
|
|
def close_request(self, request):
|
|
if request is None:
|
|
return
|
|
SimpleXMLRPCServer.close_request(self, request)
|
|
|
|
def process_request(self, request, client_address):
|
|
if request is None:
|
|
return
|
|
SimpleXMLRPCServer.process_request(self, request, client_address)
|
|
|