linux-perf-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: Clark Williams <williams@redhat.com>,
	linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
	Jin Yao <yao.jin@linux.intel.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Andi Kleen <ak@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>,
	Kan Liang <kan.liang@linux.intel.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 10/18] perf annotate: Show group event string for stdio
Date: Wed, 23 May 2018 17:20:58 -0300	[thread overview]
Message-ID: <20180523202106.17286-11-acme@kernel.org> (raw)
In-Reply-To: <20180523202106.17286-1-acme@kernel.org>

From: Jin Yao <yao.jin@linux.intel.com>

When we enable the group, for tui/stdio2, the output first line includes
the group event string. While for stdio, it will show only one event.

For example,

perf record -e cycles,branches ./div
perf annotate --group --stdio

    Percent |      Source code & Disassembly of div for cycles (44407 samples)
    ......

The first line doesn't include the event 'branches'.

With this patch, it will show the correct group even string.

perf annotate --group --stdio

    Percent |      Source code & Disassembly of div for cycles, branches (44407 samples)
    ......

Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
Suggested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1526989115-14435-1-git-send-email-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/annotate.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 6612c7f90af4..71897689dacf 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1965,6 +1965,7 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map,
 	u64 len;
 	int width = symbol_conf.show_total_period ? 12 : 8;
 	int graph_dotted_len;
+	char buf[512];
 
 	filename = strdup(dso->long_name);
 	if (!filename)
@@ -1977,8 +1978,11 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map,
 
 	len = symbol__size(sym);
 
-	if (perf_evsel__is_group_event(evsel))
+	if (perf_evsel__is_group_event(evsel)) {
 		width *= evsel->nr_members;
+		perf_evsel__group_desc(evsel, buf, sizeof(buf));
+		evsel_name = buf;
+	}
 
 	graph_dotted_len = printf(" %-*.*s|	Source code & Disassembly of %s for %s (%" PRIu64 " samples)\n",
 				  width, width, symbol_conf.show_total_period ? "Period" :
-- 
2.14.3

  parent reply	other threads:[~2018-05-23 20:20 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-23 20:20 [GIT PULL 00/18] perf/core improvements Arnaldo Carvalho de Melo
2018-05-23 20:20 ` [PATCH 01/18] perf evlist: Introduce force_leader() method Arnaldo Carvalho de Melo
2018-05-23 20:20 ` [PATCH 02/18] perf report: Use perf_evlist__force_leader to support '--group' Arnaldo Carvalho de Melo
2018-05-23 20:20 ` [PATCH 03/18] perf annotate: Support '--group' option Arnaldo Carvalho de Melo
2018-05-23 20:20 ` [PATCH 04/18] perf machine: Add nr_cpus_avail() Arnaldo Carvalho de Melo
2018-05-23 20:20 ` [PATCH 05/18] perf machine: Workaround missing maps for x86 PTI entry trampolines Arnaldo Carvalho de Melo
2018-05-23 20:20 ` [PATCH 06/18] perf machine: Fix map_groups__split_kallsyms() for entry trampoline symbols Arnaldo Carvalho de Melo
2018-05-23 20:20 ` [PATCH 07/18] perf machine: Allow for extra kernel maps Arnaldo Carvalho de Melo
2018-05-23 20:20 ` [PATCH 08/18] perf machine: Create maps for x86 PTI entry trampolines Arnaldo Carvalho de Melo
2018-05-23 20:20 ` [PATCH 09/18] perf machine: Synthesize and process mmap events " Arnaldo Carvalho de Melo
2018-05-23 20:20 ` Arnaldo Carvalho de Melo [this message]
2018-05-23 20:20 ` [PATCH 11/18] perf kcore_copy: Keep phdr data in a list Arnaldo Carvalho de Melo
2018-05-23 20:21 ` [PATCH 12/18] perf kcore_copy: Keep a count of phdrs Arnaldo Carvalho de Melo
2018-05-23 20:21 ` [PATCH 13/18] perf kcore_copy: Calculate offset from phnum Arnaldo Carvalho de Melo
2018-05-23 20:21 ` [PATCH 14/18] perf kcore_copy: Layout sections Arnaldo Carvalho de Melo
2018-05-23 20:21 ` [PATCH 15/18] perf kcore_copy: Iterate phdrs Arnaldo Carvalho de Melo
2018-05-23 20:21 ` [PATCH 16/18] perf kcore_copy: Get rid of kernel_map Arnaldo Carvalho de Melo
2018-05-23 20:21 ` [PATCH 17/18] perf kcore_copy: Copy x86 PTI entry trampoline sections Arnaldo Carvalho de Melo
2018-05-23 20:21 ` [PATCH 18/18] perf kcore_copy: Amend the offset of sections that remap kernel text Arnaldo Carvalho de Melo
2018-05-24  5:32 ` [GIT PULL 00/18] perf/core improvements Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180523202106.17286-11-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=ak@linux.intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=jolsa@kernel.org \
    --cc=kan.liang@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=williams@redhat.com \
    --cc=yao.jin@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).