mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-29 07:36:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake none/xmlrpc servers: Only send pickled events to the xmlrpc server

Browse Source 
Only the xmlrpc server needs pickled events. Use the function names
to signify this requirement.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2011-06-08 11:19:40 +01:00
parent cd3c4292e7
commit b34d66225f
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bitbake/lib/bb/event.py
View File

@@ -119,7 +119,10 @@ def fire_ui_handlers(event, d):
# We use pickle here since it better handles object instances # We use pickle here since it better handles object instances
# which xmlrpc's marshaller does not. Events *must* be serializable # which xmlrpc's marshaller does not. Events *must* be serializable
# by pickle. # by pickle.
_ui_handlers[h].event.send((pickle.dumps(event))) if hasattr(_ui_handlers[h].event, "sendpickle"):
_ui_handlers[h].event.sendpickle((pickle.dumps(event)))
else:
_ui_handlers[h].event.send(event)
except: except:
errors.append(h) errors.append(h)
for h in errors: for h in errors:

3
bitbake/lib/bb/server/none.py
View File

@@ -28,7 +28,6 @@
import time import time
import bb import bb
import pickle
import signal import signal
DEBUG = False DEBUG = False
@@ -68,7 +67,7 @@ class BBUIEventQueue:
self.parent = parent self.parent = parent
@staticmethod @staticmethod
def send(event): def send(event):
bb.server.none.eventQueue.append(pickle.loads(event)) bb.server.none.eventQueue.append(event)
@staticmethod @staticmethod
def quit(): def quit():
return return

2
bitbake/lib/bb/ui/uievent.py
View File

@@ -76,7 +76,7 @@ class BBUIEventQueue:
self.host, self.port = server.socket.getsockname() self.host, self.port = server.socket.getsockname()
server.register_function( self.system_quit, "event.quit" ) server.register_function( self.system_quit, "event.quit" )
server.register_function( self.send_event, "event.send" ) server.register_function( self.send_event, "event.sendpickle" )
server.socket.settimeout(1) server.socket.settimeout(1)
self.EventHandle = self.BBServer.registerEventHandler(self.host, self.port) self.EventHandle = self.BBServer.registerEventHandler(self.host, self.port)