Add cgroup2 support (#1166)

util.py: replace mountCgroups with checkCgroups, which
         returns the cgroup version (cgroup, cgroup2)

node.py: handle cpu.max='quota period' for cgroup2
         vs. cpu.{cfs_quota_us,cfs_period_us} for cgroup

net.py: make _iperfVals more robust in the case of a missing
        UDP ACK

examples/cpu.py: user _iperfVals to handle new iperf behavior
                 of no output from telnet
This commit is contained in:
lantz
2023-04-22 15:31:40 -07:00
committed by GitHub
parent 4840bc20c5
commit b762d0bf96
4 changed files with 61 additions and 36 deletions
+6 -4
View File
@@ -789,8 +789,11 @@ class Mininet( object ):
"""
fields = 'date cip cport sip sport ipver interval sent rate'
lines = iperfcsv.strip().split('\n')
if lines:
line = lines[ -1 ].split( ',' )
svals = {}
for line in lines:
if ',' not in line:
continue
line = line.split( ',' )
svals = dict( zip( fields.split(), line ) )
# Return client in cip:cport, server in sip:sport
if svals[ 'cip' ] == serverip:
@@ -798,8 +801,7 @@ class Mininet( object ):
svals[ 'sip' ], svals[ 'cip' ] )
svals[ 'cport' ], svals[ 'sport' ] = (
svals[ 'sport' ], svals[ 'cport' ] )
return svals
return {}
return svals
# XXX This should be cleaned up