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

Commit a9c34a9f authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Remove unused evsel parameter from machine__resolve_callchain 



Removing unused evsel parameter from machine__resolve_callchain
function. Plus related header file and callers changes.

The evsel parameter is unused since following commit:
  perf callchain: Make callchain cursors TLS
  commit 47260645
  Author: Namhyung Kim <namhyung.kim@lge.com>
  Date:   Thu May 31 14:43:26 2012 +0900

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Arun Sharma <asharma@fb.com>
Cc: Benjamin Redelings <benjamin.redelings@nescent.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Frank Ch. Eigler <fche@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
Cc: Ulrich Drepper <drepper@gmail.com>
Link: http://lkml.kernel.org/r/1339420814-7379-9-git-send-email-jolsa@redhat.com


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

tools/perf/builtin-report.c

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static int perf_report__add_branch_hist_entry(struct perf_tool *tool, 


	if ((sort__has_parent || symbol_conf.use_callchain)

	    && sample->callchain) {

		err = machine__resolve_callchain(machine, evsel, al->thread,

		err = machine__resolve_callchain(machine, al->thread,

						 sample->callchain, &parent);

		if (err)

			return err;
@@ -140,7 +140,7 @@ static int perf_evsel__add_hist_entry(struct perf_evsel *evsel, 
	struct hist_entry *he;



	if ((sort__has_parent || symbol_conf.use_callchain) && sample->callchain) {

		err = machine__resolve_callchain(machine, evsel, al->thread,

		err = machine__resolve_callchain(machine, al->thread,

						 sample->callchain, &parent);

		if (err)

			return err;

tools/perf/builtin-script.c

+2 −2
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static void print_sample_bts(union perf_event *event, 
			printf(" ");

		else

			printf("\n");

		perf_event__print_ip(event, sample, machine, evsel,

		perf_event__print_ip(event, sample, machine,

				     PRINT_FIELD(SYM), PRINT_FIELD(DSO),

				     PRINT_FIELD(SYMOFFSET));

	}
@@ -433,7 +433,7 @@ static void process_event(union perf_event *event __unused, 
			printf(" ");

		else

			printf("\n");

		perf_event__print_ip(event, sample, machine, evsel,

		perf_event__print_ip(event, sample, machine,

				     PRINT_FIELD(SYM), PRINT_FIELD(DSO),

				     PRINT_FIELD(SYMOFFSET));

	}

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ static void perf_event__process_sample(struct perf_tool *tool, 


		if ((sort__has_parent || symbol_conf.use_callchain) &&

		    sample->callchain) {

			err = machine__resolve_callchain(machine, evsel, al.thread,

			err = machine__resolve_callchain(machine, al.thread,

							 sample->callchain, &parent);

			if (err)

				return;

tools/perf/util/map.h

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ void machine__exit(struct machine *self); 
void machine__delete(struct machine *self);



int machine__resolve_callchain(struct machine *machine,

			       struct perf_evsel *evsel, struct thread *thread,

			       struct thread *thread,

			       struct ip_callchain *chain,

			       struct symbol **parent);

int maps__set_kallsyms_ref_reloc_sym(struct map **maps, const char *symbol_name,

tools/perf/util/session.c

+3 −4
Original line number Diff line number Diff line
@@ -289,7 +289,6 @@ struct branch_info *machine__resolve_bstack(struct machine *self, 
}



int machine__resolve_callchain(struct machine *self,

			       struct perf_evsel *evsel __used,

			       struct thread *thread,

			       struct ip_callchain *chain,

			       struct symbol **parent)
@@ -1480,8 +1479,8 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session, 
}



void perf_event__print_ip(union perf_event *event, struct perf_sample *sample,

			  struct machine *machine, struct perf_evsel *evsel,

			  int print_sym, int print_dso, int print_symoffset)

			  struct machine *machine, int print_sym,

			  int print_dso, int print_symoffset)

{

	struct addr_location al;

	struct callchain_cursor_node *node;
@@ -1495,7 +1494,7 @@ void perf_event__print_ip(union perf_event *event, struct perf_sample *sample, 


	if (symbol_conf.use_callchain && sample->callchain) {



		if (machine__resolve_callchain(machine, evsel, al.thread,

		if (machine__resolve_callchain(machine, al.thread,

						sample->callchain, NULL) != 0) {

			if (verbose)

				error("Failed to resolve callchain. Skipping\n");