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 01/18] perf evlist: Introduce force_leader() method
Date: Wed, 23 May 2018 17:20:49 -0300 [thread overview]
Message-ID: <20180523202106.17286-2-acme@kernel.org> (raw)
In-Reply-To: <20180523202106.17286-1-acme@kernel.org>
From: Jin Yao <yao.jin@linux.intel.com>
For non-explicit group (e.g. those created with -e '{eventA,eventB}'),
'perf report' supports a option '--group' which can enable group output.
We also need to support 'perf annotate' with the same '--group'.
Create a new function perf_evlist__force_leader() which contains common
code to force setting the group leader.
Signed-off-by: Jin Yao <yao.jin@linux.intel.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/1526914666-31839-2-git-send-email-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/evlist.c | 15 +++++++++++++++
tools/perf/util/evlist.h | 3 +++
2 files changed, 18 insertions(+)
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index a59281d64368..e7a4b31a84fb 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1795,3 +1795,18 @@ bool perf_evlist__exclude_kernel(struct perf_evlist *evlist)
return true;
}
+
+/*
+ * Events in data file are not collect in groups, but we still want
+ * the group display. Set the artificial group and set the leader's
+ * forced_leader flag to notify the display code.
+ */
+void perf_evlist__force_leader(struct perf_evlist *evlist)
+{
+ if (!evlist->nr_groups) {
+ struct perf_evsel *leader = perf_evlist__first(evlist);
+
+ perf_evlist__set_leader(evlist);
+ leader->forced_leader = true;
+ }
+}
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 6c41b2f78713..dc66436add98 100644
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -309,4 +309,7 @@ struct perf_evsel *perf_evlist__event2evsel(struct perf_evlist *evlist,
union perf_event *event);
bool perf_evlist__exclude_kernel(struct perf_evlist *evlist);
+
+void perf_evlist__force_leader(struct perf_evlist *evlist);
+
#endif /* __PERF_EVLIST_H */
--
2.14.3
next prev 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 ` Arnaldo Carvalho de Melo [this message]
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 ` [PATCH 10/18] perf annotate: Show group event string for stdio Arnaldo Carvalho de Melo
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-2-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).