From 0d39f11034b2d28cf68c5cc7a0d888fa0ea4ef18 Mon Sep 17 00:00:00 2001 From: Cody Burkard Date: Mon, 16 Jun 2014 17:39:24 -0700 Subject: [PATCH 1/2] added code to kill stale mininet processes --- mininet/clean.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/mininet/clean.py b/mininet/clean.py index 675c7d7..9b0d6aa 100755 --- a/mininet/clean.py +++ b/mininet/clean.py @@ -69,4 +69,18 @@ def cleanup(): if link: sh( "ip link del " + link ) + info( "*** Killing stale mininet node processes\n" ) + sh( 'pkill -9 -f mininet:' ) + # Make sure they are gone + while True: + try: + pids = co( 'pgrep -f mininet:'.split() ) + except: + pids = '' + if pids: + sh( 'pkill -f 9 mininet:' ) + sleep( .5 ) + else: + break + info( "*** Cleanup complete.\n" ) From 3c3344e1f5df164eb87a8e4a1a6060a1dd0f6e68 Mon Sep 17 00:00:00 2001 From: Cody Burkard Date: Fri, 20 Jun 2014 23:31:45 -0700 Subject: [PATCH 2/2] imported check_output --- mininet/clean.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mininet/clean.py b/mininet/clean.py index 9b0d6aa..49e32ea 100755 --- a/mininet/clean.py +++ b/mininet/clean.py @@ -10,7 +10,7 @@ It may also get rid of 'false positives', but hopefully nothing irreplaceable! """ -from subprocess import Popen, PIPE +from subprocess import Popen, PIPE, check_output as co import time from mininet.log import info