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

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

perf tools: Shorten sample symbol resolving function signature 

Since three of the parameters come from the same 'struct addr_location',
rename machine__resolve_mem() to sample__resolve_mem() and pass the
that addr_location instead.

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-3f5otpssefh9l5hi1t259h8n@git.kernel.org


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

tools/perf/builtin-report.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static int report__add_mem_hist_entry(struct perf_tool *tool, struct addr_locati 
	if (err)

		return err;



	mi = machine__resolve_mem(al->machine, al->thread, sample, al->cpumode);

	mi = sample__resolve_mem(sample, al);

	if (!mi)

		return -ENOMEM;

tools/perf/util/hist.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static struct hist_entry *add_hist_entry(struct hists *hists, 
			he_stat__add_period(&he->stat, period, weight);



			/*

			 * This mem info was allocated from machine__resolve_mem

			 * This mem info was allocated from sample__resolve_mem

			 * and will not be used anymore.

			 */

			zfree(&entry->mem_info);

tools/perf/util/machine.c

+5 −6
Original line number Diff line number Diff line
@@ -1238,18 +1238,17 @@ static void ip__resolve_data(struct machine *machine, struct thread *thread, 
	ams->map = al.map;

}



struct mem_info *machine__resolve_mem(struct machine *machine,

				      struct thread *thr,

				      struct perf_sample *sample,

				      u8 cpumode)

struct mem_info *sample__resolve_mem(struct perf_sample *sample,

				     struct addr_location *al)

{

	struct mem_info *mi = zalloc(sizeof(*mi));



	if (!mi)

		return NULL;



	ip__resolve_ams(machine, thr, &mi->iaddr, sample->ip);

	ip__resolve_data(machine, thr, cpumode, &mi->daddr, sample->addr);

	ip__resolve_ams(al->machine, al->thread, &mi->iaddr, sample->ip);

	ip__resolve_data(al->machine, al->thread, al->cpumode,

			 &mi->daddr, sample->addr);

	mi->data_src.val = sample->data_src;



	return mi;

tools/perf/util/machine.h

+2 −3
Original line number Diff line number Diff line
@@ -94,9 +94,8 @@ void machine__delete(struct machine *machine); 
struct branch_info *machine__resolve_bstack(struct machine *machine,

					    struct thread *thread,

					    struct branch_stack *bs);

struct mem_info *machine__resolve_mem(struct machine *machine,

				      struct thread *thread,

				      struct perf_sample *sample, u8 cpumode);

struct mem_info *sample__resolve_mem(struct perf_sample *sample,

				     struct addr_location *al);

int machine__resolve_callchain(struct machine *machine,

			       struct perf_evsel *evsel,

			       struct thread *thread,