[PATCH] perf: fix initialization bug in parse_single_tracepoint_event()

[Stephane Eranian]

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 <era...@google.com>
--
parse-events.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 3b4ec67..82b8b7f 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,
u64 id;
int fd;

- attr->sample_type |= PERF_SAMPLE_RAW;
- attr->sample_type |= PERF_SAMPLE_TIME;
- attr->sample_type |= PERF_SAMPLE_CPU;
-
- attr->sample_period = 1;
-
snprintf(evt_path, MAXPATHLEN, "%s/%s/%s/id", debugfs_path,
sys_name, evt_name);

@@ -442,6 +436,13 @@ parse_single_tracepoint_event(char *sys_name,
attr->type = PERF_TYPE_TRACEPOINT;
*strp = evt_name + evt_length;

+ attr->sample_type |= PERF_SAMPLE_RAW;
+ attr->sample_type |= PERF_SAMPLE_TIME;
+ attr->sample_type |= PERF_SAMPLE_CPU;
+
+ attr->sample_period = 1;
+
+
return EVT_HANDLED;
}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[Frederic Weisbecker]

On Wed, Apr 21, 2010 at 06:06:01PM +0200, Stephane Eranian wrote:
>
> 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 <era...@google.com>

Acked-by: Frederic Weisbecker <fwei...@gmail.com>

[Frederic Weisbecker]

On Wed, Apr 21, 2010 at 06:06:01PM +0200, Stephane Eranian wrote:
>

> 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 <era...@google.com>

In fact I'm queueing it.

Thanks.

[tip-bot for Stephane Eranian]

Commit-ID: 5710fcad7c367adefe5634dc998f1f88780a8457
Gitweb: http://git.kernel.org/tip/5710fcad7c367adefe5634dc998f1f88780a8457
Author: Stephane Eranian <era...@google.com>
AuthorDate: Wed, 21 Apr 2010 18:06:01 +0200
Committer: Frederic Weisbecker <fwei...@gmail.com>
CommitDate: Sat, 24 Apr 2010 03:24:09 +0200

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 <era...@google.com>
Cc: Peter Zijlstra <a.p.zi...@chello.nl>
Cc: Arnaldo Carvalho de Melo <ac...@redhat.com>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Ingo Molnar <mi...@elte.hu>
LKML-Reference: <4bcf232b.698fd8...@mx.google.com>
Signed-off-by: Frederic Weisbecker <fwei...@gmail.com>
---
tools/perf/util/parse-events.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 3b4ec67..600d327 100644