diff options
| author | Andi Kleen <ak@linux.intel.com> | 2018-09-18 08:32:10 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-09-19 14:25:51 -0400 |
| commit | a78cdee6fbb136694334ade4cedb331a9d0b4d5e (patch) | |
| tree | ada7ded5d84ba82b47b41b054defc1cb3004fedf | |
| parent | 37fed3de555199733805a2d3e03aee7727c09ea4 (diff) | |
perf script: Print DSO for callindent
Now that we don't need to print the IP/ADDR for callindent the DSO is
also not printed. It's useful for some cases, so add an own DSO printout
for callindent for the case when IP/ADDR is not enabled.
Before:
% perf script --itrace=cr -F +callindent,-ip,-sym,-symoff,-addr
swapper 0 [000] 3377.917072: 1 branches: pt_config
swapper 0 [000] 3377.917072: 1 branches: pt_config
swapper 0 [000] 3377.917072: 1 branches: pt_event_add
swapper 0 [000] 3377.917072: 1 branches: perf_pmu_enable
swapper 0 [000] 3377.917072: 1 branches: perf_pmu_nop_void
swapper 0 [000] 3377.917072: 1 branches: event_sched_in.isra.107
swapper 0 [000] 3377.917072: 1 branches: __x86_indirect_thunk_rax
swapper 0 [000] 3377.917072: 1 branches: perf_pmu_nop_int
swapper 0 [000] 3377.917072: 1 branches: group_sched_in
swapper 0 [000] 3377.917072: 1 branches: event_filter_match
swapper 0 [000] 3377.917072: 1 branches: event_filter_match
swapper 0 [000] 3377.917072: 1 branches: group_sched_in
After:
swapper 0 [000] 3377.917072: 1 branches: ([unknown]) pt_config
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) pt_config
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) pt_event_add
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) perf_pmu_enable
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) perf_pmu_nop_void
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) event_sched_in.isra.107
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) __x86_indirect_thunk_rax
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) perf_pmu_nop_int
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) group_sched_in
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) event_filter_match
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) event_filter_match
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) group_sched_in
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) __x86_indirect_thunk_rax
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) perf_pmu_nop_txn
swapper 0 [000] 3377.917072: 1 branches: ([kernel.kallsyms]) event_sched_in.isra.107
(in the kernel case of course it's not very useful, but it's important
with user programs where symbols are not unique)
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kim Phillips <kim.phillips@arm.com>
Link: http://lkml.kernel.org/r/20180918123214.26728-6-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
| -rw-r--r-- | tools/perf/builtin-script.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 7aa59696e97a..7732346bd9dd 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c | |||
| @@ -1115,6 +1115,7 @@ static int perf_sample__fprintf_callindent(struct perf_sample *sample, | |||
| 1115 | const char *name = NULL; | 1115 | const char *name = NULL; |
| 1116 | static int spacing; | 1116 | static int spacing; |
| 1117 | int len = 0; | 1117 | int len = 0; |
| 1118 | int dlen = 0; | ||
| 1118 | u64 ip = 0; | 1119 | u64 ip = 0; |
| 1119 | 1120 | ||
| 1120 | /* | 1121 | /* |
| @@ -1141,6 +1142,12 @@ static int perf_sample__fprintf_callindent(struct perf_sample *sample, | |||
| 1141 | ip = sample->ip; | 1142 | ip = sample->ip; |
| 1142 | } | 1143 | } |
| 1143 | 1144 | ||
| 1145 | if (PRINT_FIELD(DSO) && !(PRINT_FIELD(IP) || PRINT_FIELD(ADDR))) { | ||
| 1146 | dlen += fprintf(fp, "("); | ||
| 1147 | dlen += map__fprintf_dsoname(al->map, fp); | ||
| 1148 | dlen += fprintf(fp, ")\t"); | ||
| 1149 | } | ||
| 1150 | |||
| 1144 | if (name) | 1151 | if (name) |
| 1145 | len = fprintf(fp, "%*s%s", (int)depth * 4, "", name); | 1152 | len = fprintf(fp, "%*s%s", (int)depth * 4, "", name); |
| 1146 | else if (ip) | 1153 | else if (ip) |
| @@ -1159,7 +1166,7 @@ static int perf_sample__fprintf_callindent(struct perf_sample *sample, | |||
| 1159 | if (len < spacing) | 1166 | if (len < spacing) |
| 1160 | len += fprintf(fp, "%*s", spacing - len, ""); | 1167 | len += fprintf(fp, "%*s", spacing - len, ""); |
| 1161 | 1168 | ||
| 1162 | return len; | 1169 | return len + dlen; |
| 1163 | } | 1170 | } |
| 1164 | 1171 | ||
| 1165 | static int perf_sample__fprintf_insn(struct perf_sample *sample, | 1172 | static int perf_sample__fprintf_insn(struct perf_sample *sample, |