[PATCH v2 7/7] perf metricgroup: Remove unnecessary ',' from events

Ian Rogers
2020-05-20T18:20:42Z

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 | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
index 50d22f6b60c0..f787161e54ba 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)
--
2.26.2.761.g0e0b3e54be-goog