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

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

perf report: Remove some needless container_of usage 

Since all it wants is to get the 'struct record' from the received
'struct perf_tool', and this is already done at the callers of these
functions, short circuit it.

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


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

tools/perf/builtin-report.c

+6 −9
Original line number Diff line number Diff line
@@ -75,10 +75,9 @@ static int report__config(const char *var, const char *value, void *cb) 
	return perf_default_config(var, value, cb);

}



static int report__add_mem_hist_entry(struct perf_tool *tool, struct addr_location *al,

static int report__add_mem_hist_entry(struct report *rep, struct addr_location *al,

				      struct perf_sample *sample, struct perf_evsel *evsel)

{

	struct report *rep = container_of(tool, struct report, tool);

	struct symbol *parent = NULL;

	struct hist_entry *he;

	struct mem_info *mi, *mx;
@@ -127,10 +126,9 @@ out: 
	return err;

}



static int report__add_branch_hist_entry(struct perf_tool *tool, struct addr_location *al,

static int report__add_branch_hist_entry(struct report *rep, struct addr_location *al,

					 struct perf_sample *sample, struct perf_evsel *evsel)

{

	struct report *rep = container_of(tool, struct report, tool);

	struct symbol *parent = NULL;

	unsigned i;

	struct hist_entry *he;
@@ -181,10 +179,9 @@ out: 
	return err;

}



static int report__add_hist_entry(struct perf_tool *tool, struct perf_evsel *evsel,

static int report__add_hist_entry(struct report *rep, struct perf_evsel *evsel,

				  struct addr_location *al, struct perf_sample *sample)

{

	struct report *rep = container_of(tool, struct report, tool);

	struct symbol *parent = NULL;

	struct hist_entry *he;

	int err = sample__resolve_callchain(sample, &parent, evsel, al, rep->max_stack);
@@ -233,18 +230,18 @@ static int process_sample_event(struct perf_tool *tool, 
		return 0;



	if (sort__mode == SORT_MODE__BRANCH) {

		ret = report__add_branch_hist_entry(tool, &al, sample, evsel);

		ret = report__add_branch_hist_entry(rep, &al, sample, evsel);

		if (ret < 0)

			pr_debug("problem adding lbr entry, skipping event\n");

	} else if (rep->mem_mode == 1) {

		ret = report__add_mem_hist_entry(tool, &al, sample, evsel);

		ret = report__add_mem_hist_entry(rep, &al, sample, evsel);

		if (ret < 0)

			pr_debug("problem adding mem entry, skipping event\n");

	} else {

		if (al.map != NULL)

			al.map->dso->hit = 1;



		ret = report__add_hist_entry(tool, evsel, &al, sample);

		ret = report__add_hist_entry(rep, evsel, &al, sample);

		if (ret < 0)

			pr_debug("problem incrementing symbol period, skipping event\n");

	}