aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavi Merino <javi.merino@arm.com>2016-09-13 14:28:16 +0100
committerJavi Merino <javi.merino@arm.com>2016-09-13 14:28:16 +0100
commit4989982db05b8c7af331bf1aaf46aaea57977aa1 (patch)
tree0e479d7f4798862327df414f49a83ca4c6390a20
parent8ca15c03e50f5cf4653940e57bf47219ba359dd7 (diff)
downloadtrappy-4989982db05b8c7af331bf1aaf46aaea57977aa1.tar.gz
sched: make sched_migrate_task parse the normal trace from trace-cmd
The EAS patchset includes an enhancement of sched_migrate_task that includes a enum field printed with __print_symbolic that only gets parsed in the trace.txt and not in the trace.raw.txt. Remove the instances of sched_migrate_task from the trace_empty file to keep the tests testing a trace that is "empty", that is, no event in it is parsed.
-rw-r--r--tests/trace_empty.txt2
-rw-r--r--trappy/sched.py3
2 files changed, 1 insertions, 4 deletions
diff --git a/tests/trace_empty.txt b/tests/trace_empty.txt
index 10f1a9c..26e18be 100644
--- a/tests/trace_empty.txt
+++ b/tests/trace_empty.txt
@@ -67,7 +67,6 @@ cpus=5
rcuos/0-9 [001] 34.899877: sched_switch: rcuos/0:9 [120] S ==> swapper/1:0 [120]
<idle>-0 [000] 34.899884: cpu_idle: state=4294967295 cpu_id=0
<idle>-0 [001] 34.899903: cpu_idle: state=1 cpu_id=1
- <idle>-0 [000] 34.899984: sched_migrate_task: comm=sshd pid=2450 prio=120 orig_cpu=0 dest_cpu=1
<idle>-0 [000] 34.899988: sched_stat_sleep: comm=sshd pid=2450 delay=1003959 [ns]
<idle>-0 [000] 34.899995: sched_wakeup: sshd:2450 [120] success=1 CPU:001
<idle>-0 [000] 34.900052: sched_stat_wait: comm=rcu_sched pid=7 delay=0 [ns]
@@ -83,7 +82,6 @@ cpus=5
<idle>-0 [000] 34.901131: cpu_idle: state=4294967295 cpu_id=0
<idle>-0 [000] 34.901148: sched_stat_wait: comm=in:imuxsock pid=1767 delay=0 [ns]
<idle>-0 [000] 34.901155: sched_switch: swapper/0:0 [120] R ==> in:imuxsock:1767 [120]
- in:imuxsock-1767 [000] 34.901238: sched_migrate_task: comm=rs:main Q:Reg pid=1769 prio=120 orig_cpu=4 dest_cpu=0
in:imuxsock-1767 [000] 34.901243: sched_stat_runtime: comm=in:imuxsock pid=1767 runtime=496084 [ns] vruntime=6079305987 [ns]
in:imuxsock-1767 [000] 34.901250: sched_stat_sleep: comm=rs:main Q:Reg pid=1769 delay=1925639660 [ns]
in:imuxsock-1767 [000] 34.901256: sched_wakeup: rs:main Q:Reg:1769 [120] success=1 CPU:000
diff --git a/trappy/sched.py b/trappy/sched.py
index 39f2470..e618bf0 100644
--- a/trappy/sched.py
+++ b/trappy/sched.py
@@ -135,5 +135,4 @@ class SchedCpuFrequency(Base):
register_ftrace_parser(SchedCpuFrequency, "sched")
-register_dynamic_ftrace("SchedMigrateTask", "sched_migrate_task:", "sched",
- parse_raw=True)
+register_dynamic_ftrace("SchedMigrateTask", "sched_migrate_task:", "sched")