From 4ac6f1c92da8f637482f479ce3a3f9ea1dd041b3 Mon Sep 17 00:00:00 2001 From: Claudio-Daniel Freire Date: Thu, 11 Aug 2011 16:51:32 +0200 Subject: [PATCH] Kill more efficiently --- src/nepi/testbeds/planetlab/rspawn.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 -- 2.47.0