From b9d488f58ab2a72b5909a14a057b63adf7861da0 Mon Sep 17 00:00:00 2001 From: Javi Merino Date: Wed, 13 Jul 2016 20:17:43 +0100 Subject: [PATCH] tests: simplify stune's boosted utilization signal test Trappy 5.7 knows how to filter traces. We can get rid of the .add_parsed_event() workaround and let the grammar filter the event for us. --- tests/stune/smoke_test_ramp.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/stune/smoke_test_ramp.py b/tests/stune/smoke_test_ramp.py index 478626dd9..a439c1d63 100644 --- a/tests/stune/smoke_test_ramp.py +++ b/tests/stune/smoke_test_ramp.py @@ -78,14 +78,11 @@ class STune(LisaTest): first_task_name = first_task_params.keys()[0] rta_task_name = "task_{}".format(first_task_name) - sbt_dfr = ftrace.sched_boost_task.data_frame - boost_task_rtapp = sbt_dfr[sbt_dfr.comm == rta_task_name] - ftrace.add_parsed_event("boost_task_rtapp", boost_task_rtapp) - # Avoid the first period as the task starts with a very # high load and it overutilizes the CPU rtapp_period = first_task_params[first_task_name]["params"]["period_ms"] - task_start = boost_task_rtapp.index[0] + sbt_dfr = ftrace.sched_boost_task.data_frame + task_start = sbt_dfr[sbt_dfr.comm == rta_task_name].index[0] after_first_period = task_start + (rtapp_period / 1000.) boost = tc["cgroups"]["conf"]["schedtune"]["/stune"]["boost"] @@ -94,8 +91,9 @@ class STune(LisaTest): "BOOST": boost, } analyzer = Analyzer(ftrace, analyzer_const, - window=(after_first_period, None)) - statement = "(((SCHED_LOAD_SCALE - boost_task_rtapp:util) * BOOST) // 100) == boost_task_rtapp:margin" + window=(after_first_period, None), + filters={"comm": rta_task_name}) + statement = "(((SCHED_LOAD_SCALE - sched_boost_task:util) * BOOST) // 100) == sched_boost_task:margin" error_msg = "task was not boosted to the expected margin: {:.2f}"\ .format(boost / 100.) self.assertTrue(analyzer.assertStatement(statement), msg=error_msg) -- GitLab