From: Kamalesh Babulal Date: Sat, 1 Jun 2024 15:01:36 +0000 (+0530) Subject: ftests/consts: Add cpu,pid controllers output lists X-Git-Tag: v3.2.0~113 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d38cf11919635633a926a7de3ac038112018e0b;p=thirdparty%2Flibcgroup.git ftests/consts: Add cpu,pid controllers output lists Add cpu and pid controllers expected output lists to consts. It helps in maintaining the controller output(s) list as a single list, lowering the maintenance overhead for every new Kernels and also removes the duplication across the test cases. Signed-off-by: Kamalesh Babulal Signed-off-by: Tom Hromatka --- diff --git a/tests/ftests/consts.py b/tests/ftests/consts.py index 7891aace..c9f3fa34 100644 --- a/tests/ftests/consts.py +++ b/tests/ftests/consts.py @@ -33,4 +33,133 @@ TEST_SKIPPED = 'skipped' CGRULES_FILE = '/etc/cgrules.conf' +EXPECTED_CPU_OUT_V1 = [ + '''cpu.cfs_period_us: 100000 + cpu.stat: nr_periods 0 + nr_throttled 0 + throttled_time 0 + cpu.shares: 1024 + cpu.cfs_quota_us: -1 + cpu.uclamp.min: 0.00 + cpu.uclamp.max: max''', + # cfs_bandwidth without cpu.stat nr_busts, burst_time + '''cpu.cfs_burst_us: 0 + cpu.cfs_period_us: 100000 + cpu.stat: nr_periods 0 + nr_throttled 0 + throttled_time 0 + cpu.shares: 1024 + cpu.idle: 0 + cpu.cfs_quota_us: -1 + cpu.uclamp.min: 0.00 + cpu.uclamp.max: max''', + # cfs_bandwidth with cpu.stat nr_busts, burst_time + '''cpu.cfs_burst_us: 0 + cpu.cfs_period_us: 100000 + cpu.stat: nr_periods 0 + nr_throttled 0 + throttled_time 0 + nr_bursts 0 + burst_time 0 + cpu.shares: 1024 + cpu.idle: 0 + cpu.cfs_quota_us: -1 + cpu.uclamp.min: 0.00 + cpu.uclamp.max: max''' +] + +EXPECTED_CPU_OUT_V2 = [ + '''cpu.weight: 100 + cpu.stat: usage_usec 0 + user_usec 0 + system_usec 0 + nr_periods 0 + nr_throttled 0 + throttled_usec 0 + cpu.weight.nice: 0 + cpu.pressure: some avg10=0.00 avg60=0.00 avg300=0.00 total=0 + cpu.max: max 100000 + cpu.uclamp.min: 0.00 + cpu.uclamp.max: max''', + # with PSI + '''cpu.weight: 100 + cpu.stat: usage_usec 0 + user_usec 0 + system_usec 0 + nr_periods 0 + nr_throttled 0 + throttled_usec 0 + cpu.weight.nice: 0 + cpu.pressure: some avg10=0.00 avg60=0.00 avg300=0.00 total=0 + full avg10=0.00 avg60=0.00 avg300=0.00 total=0 + cpu.max: max 100000 + cpu.uclamp.min: 0.00 + cpu.uclamp.max: max''', + # with PSI, cfs_bandwidth without cpu.stat nr_busts, burst_time + '''cpu.weight: 100 + cpu.stat: usage_usec 0 + user_usec 0 + system_usec 0 + nr_periods 0 + nr_throttled 0 + throttled_usec 0 + cpu.weight.nice: 0 + cpu.pressure: some avg10=0.00 avg60=0.00 avg300=0.00 total=0 + full avg10=0.00 avg60=0.00 avg300=0.00 total=0 + cpu.idle: 0 + cpu.max.burst: 0 + cpu.max: max 100000 + cpu.uclamp.min: 0.00 + cpu.uclamp.max: max''', + # with PSI, cfs_bandwidth with cpu.stat nr_busts, burst_time + '''cpu.weight: 100 + cpu.stat: usage_usec 0 + user_usec 0 + system_usec 0 + nr_periods 0 + nr_throttled 0 + throttled_usec 0 + nr_bursts 0 + burst_usec 0 + cpu.weight.nice: 0 + cpu.pressure: some avg10=0.00 avg60=0.00 avg300=0.00 total=0 + full avg10=0.00 avg60=0.00 avg300=0.00 total=0 + cpu.idle: 0 + cpu.max.burst: 0 + cpu.max: max 100000 + cpu.uclamp.min: 0.00 + cpu.uclamp.max: max''', + # with PSI, cfs_bandwidth with cpu.stat nr_busts, burst_time, force_idle + '''cpu.weight: 100 + cpu.stat: usage_usec 0 + user_usec 0 + system_usec 0 + core_sched.force_idle_usec 0 + nr_periods 0 + nr_throttled 0 + throttled_usec 0 + nr_bursts 0 + burst_usec 0 + cpu.weight.nice: 0 + cpu.pressure: some avg10=0.00 avg60=0.00 avg300=0.00 total=0 + full avg10=0.00 avg60=0.00 avg300=0.00 total=0 + cpu.idle: 0 + cpu.max.burst: 0 + cpu.max: max 100000 + cpu.uclamp.min: 0.00 + cpu.uclamp.max: max''' +] + +EXPECTED_PIDS_OUT = [ + '''pids.current: 0 + pids.events: max 0 + pids.max: max + ''', + '''pids.current: 0 + pids.events: max 0 + pids.max: max + pids.peak: 0 + ''' +] + # vim: set et ts=4 sw=4: