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

Commit 82aa019e authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf callchain: Append callchains only when requested 



The perf report --children can be called with callchain disabled so no
need to append callchains.  Actually the root of callchain tree is not
initialized properly in this case.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1419223455-4362-7-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b11bc8e2

tools/perf/util/hist.c

+4 −3
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template, 
	size_t callchain_size = 0;

	struct hist_entry *he;



	if (symbol_conf.use_callchain || symbol_conf.cumulate_callchain)

	if (symbol_conf.use_callchain)

		callchain_size = sizeof(struct callchain_root);



	he = zalloc(sizeof(*he) + callchain_size);
@@ -737,7 +737,7 @@ iter_add_single_cumulative_entry(struct hist_entry_iter *iter, 
	iter->he = he;

	he_cache[iter->curr++] = he;



	callchain_append(he->callchain, &callchain_cursor, sample->period);

	hist_entry__append_callchain(he, sample);



	/*

	 * We need to re-initialize the cursor since callchain_append()
@@ -810,6 +810,7 @@ iter_add_next_cumulative_entry(struct hist_entry_iter *iter, 
	iter->he = he;

	he_cache[iter->curr++] = he;



	if (symbol_conf.use_callchain)

		callchain_append(he->callchain, &cursor, sample->period);

	return 0;

}