summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-04-27 04:24:57 +0200
committerIngo Molnar <mingo@elte.hu>2011-04-26 20:04:55 +0200
commit749141d926faf23ef811686a8050e7cf13dc223f (patch)
tree8db58adb1707ae99602c97686057bd10af25279d /tools
parentperf stat: Fail more clearly when an invalid modifier is specified (diff)
downloadlinux-749141d926faf23ef811686a8050e7cf13dc223f.tar.xz
linux-749141d926faf23ef811686a8050e7cf13dc223f.zip
perf stat: Make all displayed event names parseable as well
Right now we display this by default: 0.202204 task-clock-msecs # 0.282 CPUs 0 context-switches # 0.000 M/sec 0 CPU-migrations # 0.000 M/sec 85 page-faults # 0.420 M/sec The task-clock-msecs event cannot actually be passed back as an event name, the event name we recognize is 'task-clock'. So change the output of the cpu-clock and task-clock events to be idempotent. ( Units should be printed out in the right-side column, if needed. ) Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Link: http://lkml.kernel.org/n/tip-lexrnbzy09asscgd4f7oac4i@git.kernel.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/parse-events.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index b686269427ea..b5bfef12f399 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -70,8 +70,8 @@ static const char *hw_event_names[] = {
};
static const char *sw_event_names[] = {
- "cpu-clock-msecs",
- "task-clock-msecs",
+ "cpu-clock",
+ "task-clock",
"page-faults",
"context-switches",
"CPU-migrations",