83 lines
2.6 KiB
Diff
83 lines
2.6 KiB
Diff
From 7a32d75cd3c403586270e9a5750cc5813b341a79 Mon Sep 17 00:00:00 2001
|
|
From: Jiri Olsa <jolsa@kernel.org>
|
|
Date: Sun, 19 Jul 2020 20:13:08 +0200
|
|
Subject: [PATCH 113/201] perf metric: Rename __metricgroup__add_metric to
|
|
__add_metric
|
|
|
|
mainline inclusion
|
|
from mainline-v5.9-rc1
|
|
commit ce39194034008e6736646efb52230627972f1049
|
|
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=ce39194034008e6736646efb52230627972f1049
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Renaming __metricgroup__add_metric to __add_metric to fit in the current
|
|
function names.
|
|
|
|
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
|
|
Reviewed-by: Kajol Jain <kjain@linux.ibm.com>
|
|
Acked-by: Ian Rogers <irogers@google.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: John Garry <john.garry@huawei.com>
|
|
Cc: Michael Petlan <mpetlan@redhat.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Paul Clarke <pc@us.ibm.com>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Stephane Eranian <eranian@google.com>
|
|
Link: http://lore.kernel.org/lkml/20200719181320.785305-8-jolsa@kernel.org
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/util/metricgroup.c | 17 ++++++-----------
|
|
1 file changed, 6 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
|
|
index ecc1f2db1a75..4081999a05af 100644
|
|
--- a/tools/perf/util/metricgroup.c
|
|
+++ b/tools/perf/util/metricgroup.c
|
|
@@ -578,10 +578,10 @@ int __weak arch_get_runtimeparam(void)
|
|
return 1;
|
|
}
|
|
|
|
-static int __metricgroup__add_metric(struct list_head *group_list,
|
|
- struct pmu_event *pe,
|
|
- bool metric_no_group,
|
|
- int runtime)
|
|
+static int __add_metric(struct list_head *group_list,
|
|
+ struct pmu_event *pe,
|
|
+ bool metric_no_group,
|
|
+ int runtime)
|
|
{
|
|
struct egroup *eg;
|
|
|
|
@@ -641,10 +641,7 @@ static int add_metric(struct list_head *group_list,
|
|
pr_debug("metric expr %s for %s\n", pe->metric_expr, pe->metric_name);
|
|
|
|
if (!strstr(pe->metric_expr, "?")) {
|
|
- ret = __metricgroup__add_metric(group_list,
|
|
- pe,
|
|
- metric_no_group,
|
|
- 1);
|
|
+ ret = __add_metric(group_list, pe, metric_no_group, 1);
|
|
} else {
|
|
int j, count;
|
|
|
|
@@ -656,9 +653,7 @@ static int add_metric(struct list_head *group_list,
|
|
*/
|
|
|
|
for (j = 0; j < count && !ret; j++) {
|
|
- ret = __metricgroup__add_metric(
|
|
- group_list, pe,
|
|
- metric_no_group, j);
|
|
+ ret = __add_metric(group_list, pe, metric_no_group, j);
|
|
}
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|