Commit c6c13be7 authored Jul 26, 2017 by Arnaldo Carvalho de Melo

perf annotate: Do not overwrite perf_sample->weight

When we parse an event we may get a value from the kernel in response to
PERF_SAMPLE_WEIGHT being set in perf_event_attr->sample_type, and if it
is not set, then perf_sample->weight will be set to zero, which should
be ok according to a discussion with Andi Kleen [1]:

1: https://lkml.kernel.org/r/20170724174637.GS3044@two.firstfloor.org



Acked-by: Andi Kleen <andi@firstfloor.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Taeung Song <treeze.taeung@gmail.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-8ev8ufk3lzmvgz37yg9nv3qz@git.kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 82bf311e

tools/perf/builtin-annotate.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -177,8 +177,6 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel,
		*/
		process_branch_stack(sample->branch_stack, al, sample);

		sample->weight = 1;

		he = hists__add_entry(hists, al, NULL, NULL, NULL, sample, true);
		if (he == NULL)
		return -ENOMEM;