sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: bitbake: Always use separate process for PR Service 

Using the threading module interacts badly with multiprocessing used elsewhere
in bitbake under certain machine loads. This was leading to bitbake hanging on
Ctrl+C when the PR Server was being used.

This patch converts it to always use the daemonize code which
then means the threading code isn't required.

[YOCTO #3742]

(Bitbake rev: 2d0bbd9398ab839bd2d1e29e50b25d52efb1ce2a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2013-02-06 15:59:07 +00:00
parent afd24faa00
commit bdfc5207a0
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitbake/lib/bb/server/process.py
View File

@ -266,5 +266,5 @@ class BitBakeServer(object):
return self.connection return self.connection
def launchUI(self, uifunc, *args): def launchUI(self, uifunc, *args):
return bb.cooker.server_main(self.cooker, uifunc, *args) return uifunc(*args)

31
bitbake/lib/prserv/serv.py
View File

@ -97,16 +97,7 @@ class PRServer(SimpleXMLRPCServer):
return return
def start(self): def start(self):
if self.daemon is True: self.daemonize()
logger.info("PRServer: try to start daemon...")
self.daemonize()
else:
atexit.register(self.delpid)
pid = str(os.getpid())
pf = file(self.pidfile, 'w+')
pf.write("%s\n" % pid)
pf.close()
self.work_forever()
def delpid(self): def delpid(self):
os.remove(self.pidfile) os.remove(self.pidfile)
@ -118,6 +109,7 @@ class PRServer(SimpleXMLRPCServer):
try: try:
pid = os.fork() pid = os.fork()
if pid > 0: if pid > 0:
os.waitpid(pid, 0)
#parent return instead of exit to give control #parent return instead of exit to give control
return return
except OSError as e: except OSError as e:
@ -131,7 +123,7 @@ class PRServer(SimpleXMLRPCServer):
try: try:
pid = os.fork() pid = os.fork()
if pid > 0: #parent if pid > 0: #parent
sys.exit(0) os._exit(0)
except OSError as e: except OSError as e:
raise Exception("%s [%d]" % (e.strerror, e.errno)) raise Exception("%s [%d]" % (e.strerror, e.errno))
@ -155,7 +147,7 @@ class PRServer(SimpleXMLRPCServer):
pf.close() pf.close()
self.work_forever() self.work_forever()
sys.exit(0) os._exit(0)
class PRServSingleton(): class PRServSingleton():
def __init__(self, dbfile, logfile, interface): def __init__(self, dbfile, logfile, interface):
@ -164,21 +156,14 @@ class PRServSingleton():
self.interface = interface self.interface = interface
self.host = None self.host = None
self.port = None self.port = None
self.event = threading.Event()
def _work(self):
self.prserv = PRServer(self.dbfile, self.logfile, self.interface, False)
self.host, self.port = self.prserv.getinfo()
self.event.set()
self.prserv.work_forever()
del self.prserv.db
def start(self): def start(self):
self.working_thread = threading.Thread(target=self._work) self.prserv = PRServer(self.dbfile, self.logfile, self.interface)
self.working_thread.start() self.prserv.start()
self.host, self.port = self.prserv.getinfo()
del self.prserv.db
def getinfo(self): def getinfo(self):
self.event.wait()
return (self.host, self.port) return (self.host, self.port)
class PRServerConnection(): class PRServerConnection():