From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Song Liu <songliubraving@fb.com>,
Andrii Nakryiko <andriin@fb.com>,
Kajol Jain <kjain@linux.ibm.com>, Andi Kleen <ak@linux.intel.com>,
John Garry <john.garry@huawei.com>,
Jin Yao <yao.jin@linux.intel.com>,
Kan Liang <kan.liang@linux.intel.com>,
Cong Wang <xiyou.wangcong@gmail.com>,
Kim Phillips <kim.phillips@amd.com>, Paul Clarke <pc@us.ibm.com>,
Srikar Dronamraju <srikar@linux.vnet.ibm.com>,
linux-kernel@vger.kernel.org
Cc: netdev@vger.kernel.org, bpf@vger.kernel.org,
linux-perf-users@vger.kernel.org,
Vince Weaver <vincent.weaver@maine.edu>,
Stephane Eranian <eranian@google.com>,
Ian Rogers <irogers@google.com>
Subject: [PATCH 7/7] perf metricgroup: Remove unnecessary ',' from events
Date: Wed, 20 May 2020 00:28:14 -0700 [thread overview]
Message-ID: <20200520072814.128267-8-irogers@google.com> (raw)
In-Reply-To: <20200520072814.128267-1-irogers@google.com>
Remove unnecessary commas from events before they are parsed. This
avoids ',' being echoed by parse-events.l.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/metricgroup.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
index 432ae2e4c7b1..570285132cf6 100644
--- a/tools/perf/util/metricgroup.c
+++ b/tools/perf/util/metricgroup.c
@@ -501,9 +501,14 @@ static void metricgroup__add_metric_non_group(struct strbuf *events,
{
struct hashmap_entry *cur;
size_t bkt;
+ bool first = true;
- hashmap__for_each_entry((&ctx->ids), cur, bkt)
- strbuf_addf(events, ",%s", (const char *)cur->key);
+ hashmap__for_each_entry((&ctx->ids), cur, bkt) {
+ if (!first)
+ strbuf_addf(events, ",");
+ strbuf_addf(events, "%s", (const char *)cur->key);
+ first = false;
+ }
}
static void metricgroup___watchdog_constraint_hint(const char *name, bool foot)
@@ -637,8 +642,10 @@ static int metricgroup__add_metric(const char *metric, bool metric_no_group,
}
}
if (!ret) {
+ bool first = true;
+
list_for_each_entry(eg, group_list, nd) {
- if (events->len > 0)
+ if (events->len > 0 && !first)
strbuf_addf(events, ",");
if (eg->has_constraint) {
@@ -648,6 +655,7 @@ static int metricgroup__add_metric(const char *metric, bool metric_no_group,
metricgroup__add_metric_weak_group(events,
&eg->pctx);
}
+ first = false;
}
}
return ret;
--
2.26.2.761.g0e0b3e54be-goog
next prev parent reply other threads:[~2020-05-20 7:28 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 7:28 [PATCH 0/7] Share events between metrics Ian Rogers
2020-05-20 7:28 ` [PATCH 1/7] perf metricgroup: Change evlist_used to a bitmap Ian Rogers
2020-05-20 13:14 ` Jiri Olsa
2020-05-20 13:35 ` Arnaldo Carvalho de Melo
2020-05-20 7:28 ` [PATCH 2/7] perf metricgroup: Always place duration_time last Ian Rogers
2020-05-20 7:28 ` [PATCH 3/7] perf metricgroup: Delay events string creation Ian Rogers
2020-05-20 13:14 ` Jiri Olsa
2020-05-20 18:22 ` Ian Rogers
2020-05-20 20:34 ` Arnaldo Carvalho de Melo
2020-05-20 22:10 ` Jiri Olsa
2020-05-20 7:28 ` [PATCH 4/7] perf metricgroup: Order event groups by size Ian Rogers
2020-05-20 7:28 ` [PATCH 5/7] perf metricgroup: Remove duped metric group events Ian Rogers
2020-05-20 13:48 ` Jiri Olsa
2020-05-20 16:50 ` Ian Rogers
2020-05-20 22:09 ` Jiri Olsa
2020-05-20 22:42 ` Ian Rogers
2020-05-21 10:54 ` Jiri Olsa
2020-05-21 17:26 ` Ian Rogers
2020-05-21 17:28 ` Arnaldo Carvalho de Melo
2020-05-20 7:28 ` [PATCH 6/7] perf metricgroup: Add options to not group or merge Ian Rogers
2020-05-20 7:28 ` Ian Rogers [this message]
2020-05-20 13:13 ` [PATCH 0/7] Share events between metrics Jiri Olsa
2020-05-20 14:50 ` Ian Rogers
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=20200520072814.128267-8-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=andriin@fb.com \
--cc=bpf@vger.kernel.org \
--cc=eranian@google.com \
--cc=john.garry@huawei.com \
--cc=jolsa@redhat.com \
--cc=kan.liang@linux.intel.com \
--cc=kim.phillips@amd.com \
--cc=kjain@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pc@us.ibm.com \
--cc=peterz@infradead.org \
--cc=songliubraving@fb.com \
--cc=srikar@linux.vnet.ibm.com \
--cc=vincent.weaver@maine.edu \
--cc=xiyou.wangcong@gmail.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).