diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2014-11-17 02:27:36 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-20 14:15:32 +0000 |
| commit | c09e56168ea5a9e4ff3e7f38d7da79e5d883021b (patch) | |
| tree | 5c987833c57afea7bb138e858bf2c36c6b1967c1 /bitbake | |
| parent | 7d559fcca8ac552770e20d0831ed755a75f3a9fd (diff) | |
| download | ast2050-yocto-poky-c09e56168ea5a9e4ff3e7f38d7da79e5d883021b.zip ast2050-yocto-poky-c09e56168ea5a9e4ff3e7f38d7da79e5d883021b.tar.gz | |
bitbake: bitbake-worker: exit normally when SIGHUP
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>
Diffstat (limited to 'bitbake')
| -rwxr-xr-x | bitbake/bin/bitbake-worker | 9 | ||||
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 7 |
2 files changed, 14 insertions, 2 deletions
diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker index dde2c9c..371c99a 100755 --- a/bitbake/bin/bitbake-worker +++ b/bitbake/bin/bitbake-worker @@ -147,6 +147,8 @@ def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, taskdepdat pipein.close() 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 # events @@ -266,9 +268,14 @@ class BitbakeWorker(object): self.build_pipes = {} 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): - 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) signal.signal(signal.SIGTERM, signal.SIG_DFL) os.kill(os.getpid(), signal.SIGTERM) diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 087f72f..a08c14b 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -153,9 +153,14 @@ class BBCooker: self.parser = None 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): - 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 def setFeatures(self, features): |
