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

reverted iperf output and fixed regex

Browse Source
This commit is contained in:
Brian O'Connor
2013-08-16 11:16:28 -07:00
parent f0c123d4c0
commit 32de4c9e7c
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/consoles.py
+12 -6
View File
@@ -315,13 +315,19 @@ class ConsoleApp( Frame ):
def updateGraph( self, _console, output ): def updateGraph( self, _console, output ):
"Update our graph." "Update our graph."
output = output.split('\n')[ 0 ] m = re.search( r'(\d+.?\d*) ([KMG]?bits)/sec', output )
vals = output.split(',') if not m:
if not len(vals) == 9:
return return
self.updates += 1 val, units = float( m.group( 1 ) ), m.group( 2 )
#convert to Gbps #convert to Gbps
self.bw += int( vals[-1] ) * ( 10 ** -9 ) if units[0] == 'M':
val *= 10 ** -3
elif units[0] == 'K':
val *= 10 ** -6
elif units[0] == 'b':
val *= 10 ** -9
self.updates += 1
self.bw += val
if self.updates >= self.hostCount: if self.updates >= self.hostCount:
self.graph.addBar( self.bw ) self.graph.addBar( self.bw )
self.bw = 0 self.bw = 0
@@ -418,7 +424,7 @@ class ConsoleApp( Frame ):
for console in consoles: for console in consoles:
i = ( i + 1 ) % count i = ( i + 1 ) % count
ip = consoles[ i ].node.IP() ip = consoles[ i ].node.IP()
console.sendCmd( 'iperf -t 99999 -i 1 -y c -c ' + ip ) console.sendCmd( 'iperf -t 99999 -i 1 -c ' + ip )
def stop( self, wait=True ): def stop( self, wait=True ):
"Interrupt all hosts." "Interrupt all hosts."