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

Move RT check into its own method, and save value.

Browse Source
This commit is contained in:
Bob Lantz
2014-11-04 16:27:34 -08:00
parent 658761d953
commit a562ca1be3
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/node.py
+19 -10
View File
@@ -166,7 +166,7 @@ class Node( object ):
for directory in self.privateDirs: for directory in self.privateDirs:
if isinstance( directory, tuple ): if isinstance( directory, tuple ):
# mount given private directory # mount given private directory
privateDir = directory[ 1 ] % self.__dict__ privateDir = directory[ 1 ] % self.__dict__
mountPoint = directory[ 0 ] mountPoint = directory[ 0 ]
self.cmd( 'mkdir -p %s' % privateDir ) self.cmd( 'mkdir -p %s' % privateDir )
self.cmd( 'mkdir -p %s' % mountPoint ) self.cmd( 'mkdir -p %s' % mountPoint )
@@ -174,7 +174,7 @@ class Node( object ):
( privateDir, mountPoint ) ) ( privateDir, mountPoint ) )
else: else:
# mount temporary filesystem on directory # mount temporary filesystem on directory
self.cmd( 'mkdir -p %s' % directory ) self.cmd( 'mkdir -p %s' % directory )
self.cmd( 'mount -n -t tmpfs tmpfs %s' % directory ) self.cmd( 'mount -n -t tmpfs tmpfs %s' % directory )
def unmountPrivateDirs( self ): def unmountPrivateDirs( self ):
@@ -640,13 +640,9 @@ class CPULimitedHost( Host ):
# still does better with larger period values. # still does better with larger period values.
self.period_us = kwargs.get( 'period_us', 100000 ) self.period_us = kwargs.get( 'period_us', 100000 )
self.sched = sched self.sched = sched
if self.sched == 'rt': if sched == 'rt':
release = quietRun( 'uname -r' ).strip('\r\n') self.checkRtGroupSched()
output = quietRun( 'grep CONFIG_RT_GROUP_SCHED /boot/config-%s' % release ) self.rtprio = 20
if output == '# CONFIG_RT_GROUP_SCHED is not set\n':
error( '\n*** error: please enable RT_GROUP_SCHED in your kernel\n' )
exit( 1 )
self.rtprio = 20
def cgroupSet( self, param, value, resource='cpu' ): def cgroupSet( self, param, value, resource='cpu' ):
"Set a cgroup parameter and return its value" "Set a cgroup parameter and return its value"
@@ -710,6 +706,19 @@ class CPULimitedHost( Host ):
quota = int( self.period_us * f ) quota = int( self.period_us * f )
return pstr, qstr, self.period_us, quota return pstr, qstr, self.period_us, quota
_rtGroupSched = False # internal class var: Is CONFIG_RT_GROUP_SCHED set?
@classmethod
def checkRtGroupSched( cls ):
"Check (Ubuntu,Debian) kernel config for CONFIG_RT_GROUP_SCHED for RT"
if not cls._rtGroupSched:
release = quietRun( 'uname -r' ).strip('\r\n')
output = quietRun( 'grep CONFIG_RT_GROUP_SCHED /boot/config-%s' % release )
if output == '# CONFIG_RT_GROUP_SCHED is not set\n':
error( '\n*** error: please enable RT_GROUP_SCHED in your kernel\n' )
exit( 1 )
cls._rtGroupSched = True
def cfsInfo( self, f): def cfsInfo( self, f):
"Internal method: return parameters for CFS bandwidth" "Internal method: return parameters for CFS bandwidth"
pstr, qstr = 'cfs_period_us', 'cfs_quota_us' pstr, qstr = 'cfs_period_us', 'cfs_quota_us'
@@ -1370,7 +1379,7 @@ class RYU( Controller ):
Controller.__init__( self, name, Controller.__init__( self, name,
command='ryu-manager', command='ryu-manager',
cargs='--ofp-tcp-listen-port %s ' + cargs='--ofp-tcp-listen-port %s ' +
' '.join( ryuArgs ), ' '.join( ryuArgs ),
cdir=ryuCoreDir, cdir=ryuCoreDir,
**kwargs ) **kwargs )