Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5710fcad authored by Stephane Eranian's avatar Stephane Eranian Committed by Frederic Weisbecker
Browse files

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: default avatarStephane 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: default avatarFrederic Weisbecker <fweisbec@gmail.com>
parent e4cef1f6

tools/perf/util/parse-events.c

+7 −6
Original line number Diff line number Diff line
@@ -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;

}