[patch] 0.5 second window before SIGTERM followed by 0.5 second window before SIGKILL

sigterm-timeout.patch (text/plain), 1.14 KB, created by Jason Stubbs (RETIRED) on 2005-10-23 00:57:43 UTC

Index: pym/portage_exec.py
===================================================================
--- pym/portage_exec.py	(revision 2150)
+++ pym/portage_exec.py	(working copy)
@@ -4,7 +4,7 @@
 # $Id: /var/cvsroot/gentoo-src/portage/pym/portage_exec.py,v 1.13.2.4 2005/04/17 09:01:56 jstubbs Exp $
 
 
-import os,types,atexit,string,stat
+import os,types,atexit,string,stat,time
 import signal
 import portage_data
 import portage_util
@@ -180,15 +180,19 @@
 		retval=os.waitpid(mypid[-1],0)[1]
 		if retval != 0:
 			for x in mypid[0:-1]:
-				try:
-					os.kill(x,signal.SIGTERM)
-					if os.waitpid(x,os.WNOHANG)[1] == 0:
-						# feisty bugger, still alive.
-						os.kill(x,signal.SIGKILL)
+				for sig in (signal.SIGTERM, signal.SIGKILL):
+					timeout = 50
+					while timeout:
+						if os.waitpid(x, os.WNOHANG) != (0,0):
+							break
+						time.sleep(0.01)
+						timeout -= 1
+					if not timeout:
+						os.kill(x,sig)
+					else:
+						break
+				if not timeout:
 					os.waitpid(x,0)
-				except OSError, oe:
-					if oe.errno not in (10,3):
-						raise oe
 			
 			# at this point we've killed all other kid pids generated via this call.
 			# return now.