gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-06 06:14:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the unnecessary delays in the killproc function

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@210 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Gerard Beekmans 2001-02-23 18:20:39 +00:00
parent b092e3d7e1
commit 4f3aa1c63b
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
chapter07/functions.xml
View File

@ -36,9 +36,9 @@ FAILURE="echo -en \\033[1;31m"
evaluate_retval() evaluate_retval()
{ {
if [ $? = 0 ] if [ $? = 0 ]
then then
print_status success print_status success
else else
print_status failure print_status failure
fi fi
@ -96,6 +96,7 @@ loadproc()
# #
# If no parameters are given to the print_status function, print usage # If no parameters are given to the print_status function, print usage
# information. # information.
# #
@ -217,6 +218,7 @@ killproc()
# If $pid contains something from the previous for loop it means one or # If $pid contains something from the previous for loop it means one or
# more PID's were found that belongs to the processes to be killed # more PID's were found that belongs to the processes to be killed
# #
if [ -n "$pid" ] if [ -n "$pid" ]
then then
@ -227,18 +229,26 @@ killproc()
if [ "$nolevel" = 1 ] if [ "$nolevel" = 1 ]
then then
/bin/kill -TERM $pid /bin/kill -TERM $pid
/usr/bin/sleep 2
# #
# If after -TERM the PID still exists we'll try killing it with -KILL # If after -TERM the PID still exists we'll wait 2 seconds before
# and wait for 2 seconds again to allow the kill to be completed # trying to kill it with -KILL. If the PID still exist after that, wait
# two more seconds. If the PIDs still exist by then it's safe to assume
# that we cannot kill these PIDs.
# #
if ps h $pid >/dev/null 2>&1 if /bin/ps h $pid >/dev/null 2>&1
then then
/bin/kill -KILL $pid /usr/bin/sleep 2
/usr/bin/sleep 2 if /bin/ps h $pid > /dev/null 2>&1
then
/bin/kill -KILL $pid
if /bin/ps h $pid > /dev/null 2>&1
then
/usr/bin/sleep 2
fi
fi
fi fi
/bin/ps h $pid >/dev/null 2>&1 /bin/ps h $pid >/dev/null 2>&1
if [ $? = 0 ] if [ $? = 0 ]
then then
# #
@ -261,8 +271,11 @@ killproc()
# #
/bin/kill $killlevel $pid /bin/kill $killlevel $pid
/usr/bin/sleep 2 if /bin/ps h $pid > /dev/null 2>&1
/bin/ps h $pid >/dev/null 2>&1 then
/usr/bin/sleep 2
fi
/bin/ps h $pid >/dev/null 2>&1
if [ $? = 0 ] if [ $? = 0 ]
then then
# #
@ -293,6 +306,7 @@ killproc()
# The reloadproc functions sends a signal to a daemon telling it to # The reloadproc functions sends a signal to a daemon telling it to
# reload it's configuration file. This is almost identical to the # reload it's configuration file. This is almost identical to the
# killproc function with the exception that it won't try to kill it with # killproc function with the exception that it won't try to kill it with
# a -KILL signal (aka -9) # a -KILL signal (aka -9)
# #
@ -364,6 +378,7 @@ reloadproc()
# #
# If nolevel was set we will use the default reload signal SIGHUP. # If nolevel was set we will use the default reload signal SIGHUP.
# #
if [ "$nolevel" = 1 ] if [ "$nolevel" = 1 ]