mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: bitbake-worker: exit normally when SIGHUP

Browse Source 
Fixed:
1) Run "bitbake recipe" in the terminal
2) Close the terminal while building
3) $ ps aux | grep bitbake-worker
There will be many processes, and they will keep the resources (e.g.,
memory), and won't exit unless kill or kill -9.

(Bitbake rev: 40d2ae0723de2bf5fee343faafb4afda40546839)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
2014-11-17 02:27:36 -08:00
committed by Richard Purdie
parent 7d559fcca8
commit c09e56168e
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/bin/bitbake-worker
+8 -1
View File
@@ -147,6 +147,8 @@ def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, taskdepdat
pipein.close() pipein.close()
signal.signal(signal.SIGTERM, sigterm_handler) signal.signal(signal.SIGTERM, sigterm_handler)
# Let SIGHUP exit as SIGTERM
signal.signal(signal.SIGHUP, sigterm_handler)
# Save out the PID so that the event can include it the # Save out the PID so that the event can include it the
# events # events
@@ -266,9 +268,14 @@ class BitbakeWorker(object):
self.build_pipes = {} self.build_pipes = {}
signal.signal(signal.SIGTERM, self.sigterm_exception) signal.signal(signal.SIGTERM, self.sigterm_exception)
# Let SIGHUP exit as SIGTERM
signal.signal(signal.SIGHUP, self.sigterm_exception)
def sigterm_exception(self, signum, stackframe): def sigterm_exception(self, signum, stackframe):
bb.warn("Worker recieved SIGTERM, shutting down...") if signum == signal.SIGTERM:
bb.warn("Worker recieved SIGTERM, shutting down...")
elif signum == signal.SIGHUP:
bb.warn("Worker recieved SIGHUP, shutting down...")
self.handle_finishnow(None) self.handle_finishnow(None)
signal.signal(signal.SIGTERM, signal.SIG_DFL) signal.signal(signal.SIGTERM, signal.SIG_DFL)
os.kill(os.getpid(), signal.SIGTERM) os.kill(os.getpid(), signal.SIGTERM)
bitbake/lib/bb/cooker.py
+6 -1
View File
@@ -153,9 +153,14 @@ class BBCooker:
self.parser = None self.parser = None
signal.signal(signal.SIGTERM, self.sigterm_exception) signal.signal(signal.SIGTERM, self.sigterm_exception)
# Let SIGHUP exit as SIGTERM
signal.signal(signal.SIGHUP, self.sigterm_exception)
def sigterm_exception(self, signum, stackframe): def sigterm_exception(self, signum, stackframe):
bb.warn("Cooker recieved SIGTERM, shutting down...") if signum == signal.SIGTERM:
bb.warn("Cooker recieved SIGTERM, shutting down...")
elif signum == signal.SIGHUP:
bb.warn("Cooker recieved SIGHUP, shutting down...")
self.state = state.forceshutdown self.state = state.forceshutdown
def setFeatures(self, features): def setFeatures(self, features):