From 40d2ae0723de2bf5fee343faafb4afda40546839 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 17 Nov 2014 02:27:36 -0800 Subject: [PATCH] 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. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- bin/bitbake-worker | 9 ++++++++- lib/bb/cooker.py | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/bin/bitbake-worker b/bin/bitbake-worker index dde2c9c8fc7..371c99a6770 100755 --- a/bin/bitbake-worker +++ b/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/lib/bb/cooker.py b/lib/bb/cooker.py index 087f72fc569..a08c14bbdc7 100644 --- a/lib/bb/cooker.py +++ b/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): -- 2.47.3