From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Thu, 11 Aug 2011 14:51:32 +0000 (+0200)
Subject: Kill more efficiently
X-Git-Tag: nepi-3.0.0~309
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4ac6f1c92da8f637482f479ce3a3f9ea1dd041b3;p=nepi.git

Kill more efficiently
---

diff --git a/src/nepi/testbeds/planetlab/rspawn.py b/src/nepi/testbeds/planetlab/rspawn.py
index b0af54b6..3d164403 100644
--- a/src/nepi/testbeds/planetlab/rspawn.py
+++ b/src/nepi/testbeds/planetlab/rspawn.py
@@ -204,13 +204,15 @@ def remote_kill(pid, ppid, sudo = False,
     """
     
     cmd = """
-%(sudo)s kill %(pid)d
+%(sudo)s kill -- -%(pid)d || /bin/true
+%(sudo)s kill %(pid)d || /bin/true
 for x in 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 ; do 
     sleep 0.2 
     if [ `ps --ppid %(ppid)d -o pid | grep -c %(pid)d` == '0' ]; then
         break
     else
-        %(sudo)s kill %(pid)d
+        %(sudo)s kill -- -%(pid)d || /bin/true
+        %(sudo)s kill %(pid)d || /bin/true
     fi
     sleep 1.8
 done