Hi all,
This is a minor update undoing an unneeded change (that also seemed
buggy) that I made while porting.
OK?
Thanks,
Ayaka
Index: patches/patch-mininet_node_py
===================================================================
RCS file: /cvs/ports/net/mininet/patches/patch-mininet_node_py,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-mininet_node_py
--- patches/patch-mininet_node_py 16 Sep 2017 06:03:05 -0000 1.3
+++ patches/patch-mininet_node_py 20 Oct 2017 18:45:38 -0000
@@ -904,24 +904,19 @@ Index: mininet/node.py
pstr = ':%d ' % self.port
clist = servers[ 0:1 ] + [ s for s in servers if pstr in s ]
raise Exception( "Please shut down the controller which is"
-@@ -1405,9 +1026,13 @@ class Controller( Node ):
+@@ -1405,7 +1026,10 @@ class Controller( Node ):
self.execed = False
def stop( self, *args, **kwargs ):
- "Stop controller."
-- self.cmd( 'kill %' + self.command )
-- self.cmd( 'wait %' + self.command )
+ """
+ Stop controller. Find processes associated with the command, and kill
-+ them.
++ them.
+ """
-+ pids = " ".join( self.cmd( 'pgrep ' + self.command ).split( '\n' ) )
-+ self.cmd( 'pkill ' + pids + ' 2>/dev/null' )
-+ self.cmd( 'wait ' + pids )
+ self.cmd( 'kill %' + self.command )
+ self.cmd( 'wait %' + self.command )
super( Controller, self ).stop( *args, **kwargs )
-
- def IP( self, intf=None ):
-@@ -1470,12 +1095,19 @@ class NOX( Controller ):
+@@ -1470,12 +1094,19 @@ class NOX( Controller ):
class Ryu( Controller ):
"Controller to run Ryu application"
@@ -943,7 +938,7 @@ Index: mininet/node.py
if not ryuArgs:
warn( 'warning: no Ryu modules specified; '
'running simple_switch only\n' )
-@@ -1538,7 +1170,50 @@ class RemoteController( Controller ):
+@@ -1538,7 +1169,50 @@ class RemoteController( Controller ):
else:
return True
