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

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

perf evsel: Allow passing a left alignment when printing a symbol 

For callchains, etc where we want it to align just below the syscall
name, for instance, in 'perf trace'

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-uk9ekchd67651c625ltaur5y@git.kernel.org


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

tools/perf/builtin-script.c

+2 −2
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ static void print_sample_bts(struct perf_sample *sample, 
				print_opts &= ~PRINT_IP_OPT_SRCLINE;

			}

		}

		perf_evsel__print_ip(evsel, sample, al, print_opts,

		perf_evsel__print_ip(evsel, sample, al, 0, print_opts,

				     scripting_max_stack, stdout);

	}
@@ -788,7 +788,7 @@ static void process_event(struct perf_script *script, 
		else

			printf("\n");



		perf_evsel__print_ip(evsel, sample, al,

		perf_evsel__print_ip(evsel, sample, al, 0,

				     output[attr->type].print_ip_opts,

				     scripting_max_stack, stdout);

	}

tools/perf/util/session.c

+5 −1
Original line number Diff line number Diff line
@@ -1954,7 +1954,7 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session, 
}



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

			  struct addr_location *al,

			  struct addr_location *al, int left_alignment,

			  unsigned int print_opts, unsigned int stack_depth,

			  FILE *fp)

{
@@ -1992,6 +1992,8 @@ void perf_evsel__print_ip(struct perf_evsel *evsel, struct perf_sample *sample, 
			if (node->sym && node->sym->ignore)

				goto next;



			fprintf(fp, "%-*.*s", left_alignment, left_alignment, " ");



			if (print_ip)

				fprintf(fp, "%c%16" PRIx64, s, node->ip);
@@ -2032,6 +2034,8 @@ void perf_evsel__print_ip(struct perf_evsel *evsel, struct perf_sample *sample, 
		if (al->sym && al->sym->ignore)

			return;



		fprintf(fp, "%-*.*s", left_alignment, left_alignment, " ");



		if (print_ip)

			fprintf(fp, "%16" PRIx64, sample->ip);

tools/perf/util/session.h

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session, 
					    unsigned int type);



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

			  struct addr_location *al,

			  struct addr_location *al, int left_alignment,

			  unsigned int print_opts, unsigned int stack_depth,

			  FILE *fp);