Commit 8066be5f authored Jul 22, 2014 by Adrian Hunter Committed by Arnaldo Carvalho de Melo Jul 23, 2014

perf script: Improve srcline display for BTS



Change the order of the output to put the srcline last.

It puts the branch 'from address' and 'to address' on the same line,
which is how it would be without the source line reference.

So it makes it consistent and much easier to read.

E.g. old format:

          4028fc main+0x2c (/bin/ls)
  /build/buildd/coreutils-8.20/src/ls.c:1269 =>           40d8a0 set_program_name+0x0 (/bin/ls)

new format:

          4028fc main+0x2c (/bin/ls) =>           40d8a0 set_program_name+0x0 (/bin/ls)
  /build/buildd/coreutils-8.20/src/ls.c:1269

Signed-off-by: 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: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1406035081-14301-7-git-send-email-adrian.hunter@intel.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent deaff8b6

tools/perf/builtin-script.c

+15 −5

Original line number	Diff line number	Diff line
		@@ -427,15 +427,22 @@ static void print_sample_bts(union perf_event *event,
		struct addr_location *al)
		{
		struct perf_event_attr *attr = &evsel->attr;
		bool print_srcline_last = false;

		/* print branch_from information */
		if (PRINT_FIELD(IP)) {
		if (!symbol_conf.use_callchain)
		printf(" ");
		else
		unsigned int print_opts = output[attr->type].print_ip_opts;

		if (symbol_conf.use_callchain && sample->callchain) {
		printf("\n");
		perf_evsel__print_ip(evsel, sample, al,
		output[attr->type].print_ip_opts,
		} else {
		printf(" ");
		if (print_opts & PRINT_IP_OPT_SRCLINE) {
		print_srcline_last = true;
		print_opts &= ~PRINT_IP_OPT_SRCLINE;
		}
		}
		perf_evsel__print_ip(evsel, sample, al, print_opts,
		PERF_MAX_STACK_DEPTH);
		}

		@@ -447,6 +454,9 @@ static void print_sample_bts(union perf_event *event,
		!output[attr->type].user_set))
		print_sample_addr(event, sample, al->machine, thread, attr);

		if (print_srcline_last)
		map__fprintf_srcline(al->map, al->addr, "\n ", stdout);

		printf("\n");
		}