Skip to content

Commit 88f14e9

Browse files
authored
2.3.1b4 (mininet#1184)
Including changes to mnexec -c to reduce the number of close() system calls, which may help with performance in containers on Ubuntu 22.04. Note that systemd-udevd also seems to be a cause of performance issues and should probably be disabled while running Mininet. Adding dbeug logging to test_simpleperf because it is failing intermittently. (Note with packet loss it can fail, but this is not how we should be testing it.)
1 parent 0cefa0b commit 88f14e9

File tree

5 files changed

+17
-8
lines changed

5 files changed

+17
-8
lines changed

INSTALL

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Mininet Installation/Configuration Notes
33
----------------------------------------
44

5-
Mininet 2.3.1b3
5+
Mininet 2.3.1b4
66
---
77

88
The supported installation methods for Mininet are 1) using a

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Mininet: Rapid Prototyping for Software Defined Networks
22
========================================================
33
*The best way to emulate almost any network on your laptop!*
44

5-
Mininet 2.3.1b3
5+
Mininet 2.3.1b4
66

77
[![Build Status][1]](https://github.com/mininet/mininet/actions)
88

@@ -70,7 +70,7 @@ Mininet includes:
7070

7171
### Python 3 Support
7272

73-
- Mininet 2.3.1b3 supports Python 3 and Python 2
73+
- Mininet 2.3.1b4 supports Python 3 and Python 2
7474

7575
- You can install both the Python 3 and Python 2 versions of
7676
Mininet side by side, but the most recent installation will

examples/simpleperf.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,19 @@ def perfTest( lossy=True ):
4949
net.start()
5050
info( "Dumping host connections\n" )
5151
dumpNodeConnections(net.hosts)
52-
info( "Testing bandwidth between h1 and h4\n" )
52+
info( "Testing bandwidth between h1 and h4 (lossy=%s)\n" % lossy )
5353
h1, h4 = net.getNodeByName('h1', 'h4')
5454
net.iperf( ( h1, h4 ), l4Type='UDP' )
55+
# Debugging
56+
h1.cmd('jobs')
57+
h4.cmd('jobs')
5558
net.stop()
5659

5760

5861
if __name__ == '__main__':
5962
setLogLevel( 'info' )
63+
# Debug for now
64+
if 'testmode' in argv:
65+
setLogLevel( 'debug' )
6066
# Prevent test_simpleperf from failing due to packet loss
6167
perfTest( lossy=( 'testmode' not in argv ) )

examples/test/test_simpleperf.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@ def testE2E( self ):
1919
# 10 Mb/s, plus or minus 20% tolerance
2020
BW = 10
2121
TOLERANCE = .2
22-
p = pexpect.spawn( 'python -m mininet.examples.simpleperf testmode' )
22+
p = pexpect.spawn(
23+
'python -m mininet.examples.simpleperf testmode' )
24+
# Log since this seems to be failing intermittently
25+
p.logfile = sys.stdout
2326
# check iperf results
24-
p.expect( "Results: \['10M', '([\d\.]+) .bits/sec", timeout=480 )
27+
p.expect( "Results: \['10M', '([\d\.]+) .bits/sec", timeout=90 )
2528
measuredBw = float( p.match.group( 1 ) )
2629
lowerBound = BW * ( 1 - TOLERANCE )
2730
upperBound = BW + ( 1 + TOLERANCE )
@@ -30,5 +33,5 @@ def testE2E( self ):
3033
p.wait()
3134

3235
if __name__ == '__main__':
33-
setLogLevel( 'warning' )
36+
setLogLevel( 'debug' )
3437
unittest.main()

mininet/net.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
from mininet.term import cleanUpScreens, makeTerms
110110

111111
# Mininet version: should be consistent with README and LICENSE
112-
VERSION = "2.3.1b3"
112+
VERSION = "2.3.1b4"
113113

114114
class Mininet( object ):
115115
"Network emulation with hosts spawned in network namespaces."

0 commit comments

Comments
 (0)