71 lines
2.5 KiB
Diff
71 lines
2.5 KiB
Diff
From 5c7b42272956bf76e7e0c7bbb0c8a752e246e9ee Mon Sep 17 00:00:00 2001
|
|
From: Ian Rogers <irogers@google.com>
|
|
Date: Wed, 20 May 2020 11:20:11 -0700
|
|
Subject: [PATCH 085/201] perf metricgroup: Remove unnecessary ',' from events
|
|
|
|
mainline inclusion
|
|
from mainline-v5.8-rc1
|
|
commit e2ce1059b0b3d032aa07cc51c24d28ec498feb5f
|
|
category: feature
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e2ce1059b0b3d032aa07cc51c24d28ec498feb5f
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
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>
|
|
Acked-by: Jiri Olsa <jolsa@redhat.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: Andrii Nakryiko <andriin@fb.com>
|
|
Cc: Cong Wang <xiyou.wangcong@gmail.com>
|
|
Cc: Jin Yao <yao.jin@linux.intel.com>
|
|
Cc: John Garry <john.garry@huawei.com>
|
|
Cc: Kajol Jain <kjain@linux.ibm.com>
|
|
Cc: Kan Liang <kan.liang@linux.intel.com>
|
|
Cc: Kim Phillips <kim.phillips@amd.com>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Paul Clarke <pc@us.ibm.com>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Song Liu <songliubraving@fb.com>
|
|
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
|
|
Cc: Stephane Eranian <eranian@google.com>
|
|
Cc: Vince Weaver <vincent.weaver@maine.edu>
|
|
Cc: bpf@vger.kernel.org
|
|
Cc: netdev@vger.kernel.org
|
|
Link: http://lore.kernel.org/lkml/20200520182011.32236-8-irogers@google.com
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.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 249233acb715..8fa4b98f6231 100644
|
|
--- a/tools/perf/util/metricgroup.c
|
|
+++ b/tools/perf/util/metricgroup.c
|
|
@@ -511,9 +511,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.27.0
|
|
|