aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorStephane Eranian <eranian@google.com>2010-04-21 12:06:01 -0400
committerFrederic Weisbecker <fweisbec@gmail.com>2010-04-23 21:24:09 -0400
commit5710fcad7c367adefe5634dc998f1f88780a8457 (patch)
tree43b0658fa9eacad178bbcbd57705b70e9fbd0951 /tools/perf
parente4cef1f65061429c3e8b356233e87dc6653a9da5 (diff)
perf: Fix initialization bug in parse_single_tracepoint_event()
The parse_single_tracepoint_event() was setting some attributes before it validated the event was indeed a tracepoint event. This caused problems with other initialization routines like in the builtin-top.c module whereby sample_period is not set if not 0. Signed-off-by: Stephane Eranian <eranian@google.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Ingo Molnar <mingo@elte.hu> LKML-Reference: <4bcf232b.698fd80a.6fbe.ffffb737@mx.google.com> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/util/parse-events.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 3b4ec6797565..600d32714257 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -418,12 +418,6 @@ parse_single_tracepoint_event(char *sys_name,
418 u64 id; 418 u64 id;
419 int fd; 419 int fd;
420 420
421 attr->sample_type |= PERF_SAMPLE_RAW;
422 attr->sample_type |= PERF_SAMPLE_TIME;
423 attr->sample_type |= PERF_SAMPLE_CPU;
424
425 attr->sample_period = 1;
426
427 snprintf(evt_path, MAXPATHLEN, "%s/%s/%s/id", debugfs_path, 421 snprintf(evt_path, MAXPATHLEN, "%s/%s/%s/id", debugfs_path,
428 sys_name, evt_name); 422 sys_name, evt_name);
429 423
@@ -442,6 +436,13 @@ parse_single_tracepoint_event(char *sys_name,
442 attr->type = PERF_TYPE_TRACEPOINT; 436 attr->type = PERF_TYPE_TRACEPOINT;
443 *strp = evt_name + evt_length; 437 *strp = evt_name + evt_length;
444 438
439 attr->sample_type |= PERF_SAMPLE_RAW;
440 attr->sample_type |= PERF_SAMPLE_TIME;
441 attr->sample_type |= PERF_SAMPLE_CPU;
442
443 attr->sample_period = 1;
444
445
445 return EVT_HANDLED; 446 return EVT_HANDLED;
446} 447}
447 448