From 604ad455ee56b83aaeea08fd3aa2475c4c1f1487 Mon Sep 17 00:00:00 2001
From: cody burkard <cody@onlab.us>
Date: Mon, 18 Aug 2014 23:24:18 -0700
Subject: [PATCH] kill all child processes to avoid race condition and no
controller shutdown
---
mininet/node.py | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/mininet/node.py b/mininet/node.py
index a69eda61..a5ad2bd7 100644
--- a/mininet/node.py
+++ b/mininet/node.py
@@ -205,7 +205,7 @@ def write( self, data ):
def terminate( self ):
"Send kill signal to Node and clean up after it."
if self.shell:
- os.killpg( self.pid, signal.SIGKILL )
+ os.killpg( self.pid, signal.SIGHUP )
self.cleanup()
def stop( self ):
@@ -1269,11 +1269,6 @@ def start( self ):
' 1>' + cout + ' 2>' + cout + '&' )
self.execed = False
- def stop( self ):
- "Stop controller."
- self.cmd( 'kill %' + self.command )
- self.terminate()
-
def IP( self, intf=None ):
"Return IP address of the Controller"
if self.intfs:
--
GitLab