summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-11-17 10:27:36 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-20 14:15:32 (GMT)
commitc09e56168ea5a9e4ff3e7f38d7da79e5d883021b (patch)
tree5c987833c57afea7bb138e858bf2c36c6b1967c1
parent7d559fcca8ac552770e20d0831ed755a75f3a9fd (diff)
downloadpoky-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>
-rwxr-xr-xbitbake/bin/bitbake-worker9
-rw-r--r--bitbake/lib/bb/cooker.py7
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
147 pipein.close() 147 pipein.close()
148 148
149 signal.signal(signal.SIGTERM, sigterm_handler) 149 signal.signal(signal.SIGTERM, sigterm_handler)
150 # Let SIGHUP exit as SIGTERM
151 signal.signal(signal.SIGHUP, sigterm_handler)
150 152
151 # Save out the PID so that the event can include it the 153 # Save out the PID so that the event can include it the
152 # events 154 # events
@@ -266,9 +268,14 @@ class BitbakeWorker(object):
266 self.build_pipes = {} 268 self.build_pipes = {}
267 269
268 signal.signal(signal.SIGTERM, self.sigterm_exception) 270 signal.signal(signal.SIGTERM, self.sigterm_exception)
271 # Let SIGHUP exit as SIGTERM
272 signal.signal(signal.SIGHUP, self.sigterm_exception)
269 273
270 def sigterm_exception(self, signum, stackframe): 274 def sigterm_exception(self, signum, stackframe):
271 bb.warn("Worker recieved SIGTERM, shutting down...") 275 if signum == signal.SIGTERM:
276 bb.warn("Worker recieved SIGTERM, shutting down...")
277 elif signum == signal.SIGHUP:
278 bb.warn("Worker recieved SIGHUP, shutting down...")
272 self.handle_finishnow(None) 279 self.handle_finishnow(None)
273 signal.signal(signal.SIGTERM, signal.SIG_DFL) 280 signal.signal(signal.SIGTERM, signal.SIG_DFL)
274 os.kill(os.getpid(), signal.SIGTERM) 281 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:
153 self.parser = None 153 self.parser = None
154 154
155 signal.signal(signal.SIGTERM, self.sigterm_exception) 155 signal.signal(signal.SIGTERM, self.sigterm_exception)
156 # Let SIGHUP exit as SIGTERM
157 signal.signal(signal.SIGHUP, self.sigterm_exception)
156 158
157 def sigterm_exception(self, signum, stackframe): 159 def sigterm_exception(self, signum, stackframe):
158 bb.warn("Cooker recieved SIGTERM, shutting down...") 160 if signum == signal.SIGTERM:
161 bb.warn("Cooker recieved SIGTERM, shutting down...")
162 elif signum == signal.SIGHUP:
163 bb.warn("Cooker recieved SIGHUP, shutting down...")
159 self.state = state.forceshutdown 164 self.state = state.forceshutdown
160 165
161 def setFeatures(self, features): 166 def setFeatures(self, features):