From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@kernel.org>,
LKML <linux-kernel@vger.kernel.org>, Jiri Olsa <jolsa@redhat.com>,
Stephane Eranian <eranian@google.com>,
David Ahern <dsahern@gmail.com>,
Namhyung Kim <namhyung.kim@lge.com>
Subject: [PATCH 06/16] perf evlist: Add perf_evlist__recalc_nr_groups
Date: Wed, 26 Sep 2012 16:47:33 +0900 [thread overview]
Message-ID: <1348645663-25303-7-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1348645663-25303-1-git-send-email-namhyung@kernel.org>
From: Namhyung Kim <namhyung.kim@lge.com>
During the event parsing, perf_evlist can have leader-only groups
which has nr_members as 1. Since they has no difference than a normal
non-group event don't count them as a event group.
Add perf_evlist__recalc_nr_groups to count actual group numbers.
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Stephane Eranian <eranian@google.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/builtin-record.c | 3 +++
tools/perf/util/evlist.c | 16 ++++++++++++++++
tools/perf/util/evlist.h | 1 +
3 files changed, 20 insertions(+)
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 2cb74343de3e..99ad5234e6ff 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -212,6 +212,9 @@ static int perf_record__open(struct perf_record *rec)
if (opts->group)
perf_evlist__set_leader(evlist);
+ if (evlist->nr_groups)
+ perf_evlist__recalc_nr_groups(evlist);
+
list_for_each_entry(pos, &evlist->entries, node) {
struct perf_event_attr *attr = &pos->attr;
/*
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 199b6f1c3b22..0dcc443716b7 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -133,6 +133,22 @@ void perf_evlist__set_leader(struct perf_evlist *evlist)
}
}
+void perf_evlist__recalc_nr_groups(struct perf_evlist *evlist)
+{
+ int count = 0;
+ struct perf_evsel *evsel;
+
+ list_for_each_entry(evsel, &evlist->entries, node) {
+ /*
+ * Don't count leader-only groups for simplicity.
+ */
+ if (perf_evsel__is_group_leader(evsel) &&
+ evsel->nr_members > 0)
+ count++;
+ }
+ evlist->nr_groups = count;
+}
+
int perf_evlist__add_default(struct perf_evlist *evlist)
{
struct perf_event_attr attr = {
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 946a6ada817b..439b1375c4ea 100644
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -120,6 +120,7 @@ int perf_evlist__set_filters(struct perf_evlist *evlist);
void __perf_evlist__set_leader(struct list_head *list);
void perf_evlist__set_leader(struct perf_evlist *evlist);
+void perf_evlist__recalc_nr_groups(struct perf_evlist *evlist);
u64 perf_evlist__sample_type(struct perf_evlist *evlist);
bool perf_evlist__sample_id_all(struct perf_evlist *evlist);
--
1.7.11.4
next prev parent reply other threads:[~2012-09-26 7:59 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-26 7:47 [PATCH 00/16] perf report: Add suppport for event group view (v2) Namhyung Kim
2012-09-26 7:47 ` [PATCH 01/16] perf hists: Add missing period_* fields when collapsing a hist entry Namhyung Kim
2012-09-28 16:37 ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-09-26 7:47 ` [PATCH 02/16] perf hists: Introduce struct he_stat Namhyung Kim
2012-09-26 7:47 ` [PATCH 03/16] perf hists: Move he->stat.nr_events initialization to a template Namhyung Kim
2012-09-26 7:47 ` [PATCH 04/16] perf hists: Add more helpers for hist entry stat Namhyung Kim
2012-09-26 7:47 ` [PATCH 05/16] perf tools: Keep group information Namhyung Kim
2012-09-27 17:03 ` Jiri Olsa
2012-09-28 4:49 ` Namhyung Kim
2012-09-26 7:47 ` Namhyung Kim [this message]
2012-09-26 7:47 ` [PATCH 07/16] perf header: Add HEADER_GROUP_DESC feature Namhyung Kim
2012-09-26 7:47 ` [PATCH 08/16] perf hists: Collapse group hist_entries to a leader Namhyung Kim
2012-09-26 7:47 ` [PATCH 09/16] perf hists: Maintain total periods of group members in the leader Namhyung Kim
2012-09-26 7:47 ` [PATCH 10/16] perf report: Make another loop for output resorting Namhyung Kim
2012-09-26 7:47 ` [PATCH 11/16] perf ui/hist: Add support for event group view Namhyung Kim
2012-09-26 7:47 ` [PATCH 12/16] perf ui/browser: " Namhyung Kim
2012-09-26 7:47 ` [PATCH 13/16] perf ui/gtk: " Namhyung Kim
2012-09-26 7:47 ` [PATCH 14/16] perf report: Bypass non-leader events when event group is enabled Namhyung Kim
2012-09-26 7:47 ` [PATCH 15/16] perf report: Show group description " Namhyung Kim
2012-09-26 7:47 ` [PATCH 16/16] perf report: Add --group option Namhyung Kim
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=1348645663-25303-7-git-send-email-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=paulus@samba.org \
/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).