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

Commit a2cb3cf2 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf script: Do not call perf_event__preprocess_sample() twice) 



The perf_event__preprocess_sample() function is called in
process_sample_event().  Instead of calling it again in
perf_evsel__print_ip(), pass through the resultant addr_location.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/529F3944.9050007@intel.com


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

tools/perf/builtin-script.c

+6 −5
Original line number Diff line number Diff line
@@ -414,7 +414,8 @@ static void print_sample_bts(union perf_event *event, 
			     struct perf_sample *sample,

			     struct perf_evsel *evsel,

			     struct machine *machine,

			     struct thread *thread)

			     struct thread *thread,

			     struct addr_location *al)

{

	struct perf_event_attr *attr = &evsel->attr;
@@ -424,7 +425,7 @@ static void print_sample_bts(union perf_event *event, 
			printf(" ");

		else

			printf("\n");

		perf_evsel__print_ip(evsel, event, sample, machine,

		perf_evsel__print_ip(evsel, sample, machine, al,

				     output[attr->type].print_ip_opts,

				     PERF_MAX_STACK_DEPTH);

	}
@@ -443,7 +444,7 @@ static void print_sample_bts(union perf_event *event, 
static void process_event(union perf_event *event, struct perf_sample *sample,

			  struct perf_evsel *evsel, struct machine *machine,

			  struct thread *thread,

			  struct addr_location *al __maybe_unused)

			  struct addr_location *al)

{

	struct perf_event_attr *attr = &evsel->attr;
@@ -458,7 +459,7 @@ static void process_event(union perf_event *event, struct perf_sample *sample, 
	}



	if (is_bts_event(attr)) {

		print_sample_bts(event, sample, evsel, machine, thread);

		print_sample_bts(event, sample, evsel, machine, thread, al);

		return;

	}
@@ -474,7 +475,7 @@ static void process_event(union perf_event *event, struct perf_sample *sample, 
		else

			printf("\n");



		perf_evsel__print_ip(evsel, event, sample, machine,

		perf_evsel__print_ip(evsel, sample, machine, al,

				     output[attr->type].print_ip_opts,

				     PERF_MAX_STACK_DEPTH);

	}

tools/perf/util/session.c

+14 −17
Original line number Diff line number Diff line
@@ -1487,11 +1487,10 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session, 
	return NULL;

}



void perf_evsel__print_ip(struct perf_evsel *evsel, union perf_event *event,

			  struct perf_sample *sample, struct machine *machine,

void perf_evsel__print_ip(struct perf_evsel *evsel, struct perf_sample *sample,

			  struct machine *machine, struct addr_location *al,

			  unsigned int print_opts, unsigned int stack_depth)

{

	struct addr_location al;

	struct callchain_cursor_node *node;

	int print_ip = print_opts & PRINT_IP_OPT_IP;

	int print_sym = print_opts & PRINT_IP_OPT_SYM;
@@ -1500,15 +1499,10 @@ void perf_evsel__print_ip(struct perf_evsel *evsel, union perf_event *event, 
	int print_oneline = print_opts & PRINT_IP_OPT_ONELINE;

	char s = print_oneline ? ' ' : '\t';



	if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) {

		error("problem processing %d event, skipping it.\n",

			event->header.type);

		return;

	}



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

		struct addr_location node_al;



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

		if (machine__resolve_callchain(machine, evsel, al->thread,

					       sample, NULL, NULL,

					       PERF_MAX_STACK_DEPTH) != 0) {

			if (verbose)
@@ -1517,6 +1511,9 @@ void perf_evsel__print_ip(struct perf_evsel *evsel, union perf_event *event, 
		}

		callchain_cursor_commit(&callchain_cursor);



		if (print_symoffset)

			node_al = *al;



		while (stack_depth) {

			node = callchain_cursor_current(&callchain_cursor);

			if (!node)
@@ -1531,9 +1528,9 @@ void perf_evsel__print_ip(struct perf_evsel *evsel, union perf_event *event, 
			if (print_sym) {

				printf(" ");

				if (print_symoffset) {

					al.addr = node->ip;

					al.map  = node->map;

					symbol__fprintf_symname_offs(node->sym, &al, stdout);

					node_al.addr = node->ip;

					node_al.map  = node->map;

					symbol__fprintf_symname_offs(node->sym, &node_al, stdout);

				} else

					symbol__fprintf_symname(node->sym, stdout);

			}
@@ -1553,7 +1550,7 @@ void perf_evsel__print_ip(struct perf_evsel *evsel, union perf_event *event, 
		}



	} else {

		if (al.sym && al.sym->ignore)

		if (al->sym && al->sym->ignore)

			return;



		if (print_ip)
@@ -1562,15 +1559,15 @@ void perf_evsel__print_ip(struct perf_evsel *evsel, union perf_event *event, 
		if (print_sym) {

			printf(" ");

			if (print_symoffset)

				symbol__fprintf_symname_offs(al.sym, &al,

				symbol__fprintf_symname_offs(al->sym, al,

							     stdout);

			else

				symbol__fprintf_symname(al.sym, stdout);

				symbol__fprintf_symname(al->sym, stdout);

		}



		if (print_dso) {

			printf(" (");

			map__fprintf_dsoname(al.map, stdout);

			map__fprintf_dsoname(al->map, stdout);

			printf(")");

		}

	}

tools/perf/util/session.h

+2 −2
Original line number Diff line number Diff line
@@ -105,8 +105,8 @@ size_t perf_session__fprintf_nr_events(struct perf_session *session, FILE *fp); 
struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session,

					    unsigned int type);



void perf_evsel__print_ip(struct perf_evsel *evsel, union perf_event *event,

			  struct perf_sample *sample, struct machine *machine,

void perf_evsel__print_ip(struct perf_evsel *evsel, struct perf_sample *sample,

			  struct machine *machine, struct addr_location *al,

			  unsigned int print_opts, unsigned int stack_depth);



int perf_session__cpu_bitmap(struct perf_session *session,