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

Commit 00e55218 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf hists: Leave symbol addr hist bucket auto alloc to symbol layer 



Since now symbol__addr_inc_samples() does the auto alloc, no need to do
it prior to calling hist_entry__inc_addr_samples.

Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-6ife7xq2kef1nn017m04b3id@git.kernel.org


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

tools/perf/builtin-annotate.c

+1 −9
Original line number Diff line number Diff line
@@ -69,15 +69,7 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel, 
	if (he == NULL)

		return -ENOMEM;



	ret = 0;

	if (he->ms.sym != NULL) {

		struct annotation *notes = symbol__annotation(he->ms.sym);

		if (notes->src == NULL && symbol__alloc_hist(he->ms.sym) < 0)

			return -ENOMEM;



	ret = hist_entry__inc_addr_samples(he, evsel->idx, al->addr);

	}



	evsel->hists.stats.total_period += sample->period;

	hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);

	return ret;

tools/perf/builtin-report.c

+4 −34
Original line number Diff line number Diff line
@@ -122,23 +122,9 @@ static int perf_report__add_mem_hist_entry(struct perf_tool *tool, 
	if (!he)

		return -ENOMEM;



	/*

	 * In the TUI browser, we are doing integrated annotation,

	 * so we don't allocate the extra space needed because the stdio

	 * code will not use it.

	 */

	if (sort__has_sym && he->ms.sym && use_browser > 0) {

		struct annotation *notes = symbol__annotation(he->ms.sym);



		assert(evsel != NULL);



		if (notes->src == NULL && symbol__alloc_hist(he->ms.sym) < 0)

			goto out;



	err = hist_entry__inc_addr_samples(he, evsel->idx, al->addr);

	if (err)

		goto out;

	}



	mx = he->mem_info;

	err = symbol__inc_addr_samples(mx->daddr.sym, mx->daddr.map,
@@ -259,26 +245,10 @@ static int perf_evsel__add_hist_entry(struct perf_tool *tool, 
		if (err)

			return err;

	}

	/*

	 * Only in the TUI browser we are doing integrated annotation,

	 * so we don't allocated the extra space needed because the stdio

	 * code will not use it.

	 */

	if (he->ms.sym != NULL && use_browser == 1 && sort__has_sym) {

		struct annotation *notes = symbol__annotation(he->ms.sym);



		assert(evsel != NULL);



		err = -ENOMEM;

		if (notes->src == NULL && symbol__alloc_hist(he->ms.sym) < 0)

			goto out;



	err = hist_entry__inc_addr_samples(he, evsel->idx, al->addr);

	}



	evsel->hists.stats.total_period += sample->period;

	hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);

out:

	return err;

}