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

Commit 644f2df2 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Shorten sample symbol resolving function signature 

Since two of the parameters come from the same 'struct
addr_location', rename machine__resolve_bstack() to sample__resolve_bstack()
and pass the that addr_location instead.

This is also for consistency with the same change that resulted in the
sample__resolve_mem() function.

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-99ecqt8jiyyksiyx3se7l5ia@git.kernel.org


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

tools/perf/builtin-report.c

+1 −2
Original line number Diff line number Diff line
@@ -140,8 +140,7 @@ static int report__add_branch_hist_entry(struct perf_tool *tool, struct addr_loc 
	if (err)

		return err;



	bi = machine__resolve_bstack(al->machine, al->thread,

				     sample->branch_stack);

	bi = sample__resolve_bstack(sample, al);

	if (!bi)

		return -ENOMEM;

tools/perf/util/hist.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template) 
		if (he->branch_info) {

			/*

			 * This branch info is (a part of) allocated from

			 * machine__resolve_bstack() and will be freed after

			 * sample__resolve_bstack() and will be freed after

			 * adding new entries.  So we need to save a copy.

			 */

			he->branch_info = malloc(sizeof(*he->branch_info));

tools/perf/util/machine.c

+6 −7
Original line number Diff line number Diff line
@@ -1254,20 +1254,19 @@ struct mem_info *sample__resolve_mem(struct perf_sample *sample, 
	return mi;

}



struct branch_info *machine__resolve_bstack(struct machine *machine,

					    struct thread *thr,

					    struct branch_stack *bs)

struct branch_info *sample__resolve_bstack(struct perf_sample *sample,

					   struct addr_location *al)

{

	struct branch_info *bi;

	unsigned int i;

	const struct branch_stack *bs = sample->branch_stack;

	struct branch_info *bi = calloc(bs->nr, sizeof(struct branch_info));



	bi = calloc(bs->nr, sizeof(struct branch_info));

	if (!bi)

		return NULL;



	for (i = 0; i < bs->nr; i++) {

		ip__resolve_ams(machine, thr, &bi[i].to, bs->entries[i].to);

		ip__resolve_ams(machine, thr, &bi[i].from, bs->entries[i].from);

		ip__resolve_ams(al->machine, al->thread, &bi[i].to, bs->entries[i].to);

		ip__resolve_ams(al->machine, al->thread, &bi[i].from, bs->entries[i].from);

		bi[i].flags = bs->entries[i].flags;

	}

	return bi;

tools/perf/util/machine.h

+2 −3
Original line number Diff line number Diff line
@@ -91,9 +91,8 @@ void machine__delete_dead_threads(struct machine *machine); 
void machine__delete_threads(struct machine *machine);

void machine__delete(struct machine *machine);



struct branch_info *machine__resolve_bstack(struct machine *machine,

					    struct thread *thread,

					    struct branch_stack *bs);

struct branch_info *sample__resolve_bstack(struct perf_sample *sample,

					   struct addr_location *al);

struct mem_info *sample__resolve_mem(struct perf_sample *sample,

				     struct addr_location *al);

int machine__resolve_callchain(struct machine *machine,