lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kill all child processes to avoid race condition and no controller shutdown

Browse Source
This commit is contained in:
cody burkard
2014-08-18 23:24:18 -07:00
parent f72d3dfa32
commit 604ad455ee
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/node.py
+1 -6
View File
@@ -205,7 +205,7 @@ class Node( object ):
def terminate( self ): def terminate( self ):
"Send kill signal to Node and clean up after it." "Send kill signal to Node and clean up after it."
if self.shell: if self.shell:
os.killpg( self.pid, signal.SIGKILL ) os.killpg( self.pid, signal.SIGHUP )
self.cleanup() self.cleanup()
def stop( self ): def stop( self ):
@@ -1269,11 +1269,6 @@ class Controller( Node ):
' 1>' + cout + ' 2>' + cout + '&' ) ' 1>' + cout + ' 2>' + cout + '&' )
self.execed = False self.execed = False
def stop( self ):
"Stop controller."
self.cmd( 'kill %' + self.command )
self.terminate()
def IP( self, intf=None ): def IP( self, intf=None ):
"Return IP address of the Controller" "Return IP address of the Controller"
if self.intfs: if self.intfs: