diff options
author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2014-01-09 15:11:59 +0000 |
---|---|---|
committer | Alexandru DAMIAN <alexandru.damian@intel.com> | 2014-03-24 18:32:19 +0000 |
commit | a9cfa3eacfc99550e1ad3f8bb61b2a0bc9b44332 (patch) | |
tree | 95e72f7b97769454a0d7b1b81737090b05a9c079 /bin | |
parent | 6f22e02614adcc642fe011e5e31ca4936d1cb19d (diff) | |
download | bitbake-a9cfa3eacfc99550e1ad3f8bb61b2a0bc9b44332.tar.gz |
toaster: clean exit on bb server shutdown
This patch adds the capability to have the Toaster UI
detect when the Bitbake server exited and cleanly
trigger a clean shutdown of the system through the toaster
starting script.
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/toaster | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/bin/toaster b/bin/toaster index 9c0a15ff6..b27f7c28b 100755 --- a/bin/toaster +++ b/bin/toaster @@ -68,11 +68,16 @@ function addtoConfiguration() echo $1 >> ${BUILDDIR}/conf/$2 } +INSTOPSYSTEM=0 + # define the stop command function stop_system() { + # prevent reentry + if [ $INSTOPSYSTEM == 1 ]; then return; fi + INSTOPSYSTEM=1 if [ -f ${BUILDDIR}/.toasterui.pid ]; then - kill $(< ${BUILDDIR}/.toasterui.pid ) + kill $(< ${BUILDDIR}/.toasterui.pid ) 2>/dev/null rm ${BUILDDIR}/.toasterui.pid fi BBSERVER=localhost:8200 bitbake -m @@ -80,8 +85,24 @@ function stop_system() webserverKillAll # force stop any misbehaving bitbake server lsof bitbake.lock | awk '{print $2}' | grep "[0-9]\+" | xargs -n1 -r kill + trap - SIGHUP + trap - SIGCHLD + INSTOPSYSTEM=0 +} + +function check_pidbyfile() { + [ -e $1 ] && kill -0 $(< $1) 2>/dev/null } + +function notify_chldexit() { + if [ $NOTOASTERUI == 0 ]; then + check_pidbyfile ${BUILDDIR}/.toasterui.pid && return + stop_system + fi +} + + # We make sure we're running in the current shell and in a good environment if [ -z "$ZSH_NAME" ] && [ `basename \"$0\"` = `basename \"$BASH_SOURCE\"` ]; then @@ -179,10 +200,13 @@ case $CMD in stop_system echo "Failed ${CMD}." fi + # stop system on terminal exit + set -o monitor + trap stop_system SIGHUP + trap notify_chldexit SIGCHLD ;; stop ) stop_system - trap '' SIGHUP echo "Successful ${CMD}." ;; esac |