mirror of https://gitee.com/openkylin/linux.git
perf annotate: Show group details on the title line
To match what is shown in the main 'perf report/top' title lines, i.e.
if a group is being shown, either a real group (recorded with "-e
'{a,b,c}') or a forced group (using 'perf report --group' for a
perf.data file recorded without {}) we will show multiple columns,
one per event, but we were failing to show the group details, so, for:
# perf report --header-only | grep cmdline
# cmdline : /home/acme/bin/perf record -e {cycles,instructions,cache-misses}
# perf report --group
The first line was showing just "cycles", now it shows the correct line,
which is:
Samples: 578 of events 'anon group { cycles, instructions, cache-misses }', 4000 Hz, Event count (approx.): 487421794
syscall_return_via_sysret /lib/modules/4.16.0-rc7/build/vmlinux
0.22 2.97 0.00 │ ↓ jmp 6c
│ mov %cr3,%rdi
1.33 10.89 4.00 │ ↓ jmp 62
│ mov %rdi,%rax
<SNIP>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: 6920e2854e
("perf annotate browser: Show extra title line with event information")
Link: https://lkml.kernel.org/n/tip-i41tqh17c2dabnyzjh99r1oz@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
0d75f123a6
commit
c0459a0925
|
@ -2600,7 +2600,7 @@ int __annotation__scnprintf_samples_period(struct annotation *notes,
|
|||
bool show_freq)
|
||||
{
|
||||
const char *ev_name = perf_evsel__name(evsel);
|
||||
char ref[30] = " show reference callgraph, ";
|
||||
char buf[1024], ref[30] = " show reference callgraph, ";
|
||||
char sample_freq_str[64] = "";
|
||||
unsigned long nr_samples = 0;
|
||||
int nr_members = 1;
|
||||
|
@ -2609,8 +2609,11 @@ int __annotation__scnprintf_samples_period(struct annotation *notes,
|
|||
char unit;
|
||||
int i;
|
||||
|
||||
if (perf_evsel__is_group_event(evsel))
|
||||
if (perf_evsel__is_group_event(evsel)) {
|
||||
perf_evsel__group_desc(evsel, buf, sizeof(buf));
|
||||
ev_name = buf;
|
||||
nr_members = evsel->nr_members;
|
||||
}
|
||||
|
||||
for (i = 0; i < nr_members; i++) {
|
||||
struct sym_hist *ah = annotation__histogram(notes, evsel->idx + i);
|
||||
|
|
Loading…
Reference in New Issue