110 lines
3.6 KiB
Diff
110 lines
3.6 KiB
Diff
From fbcb99fb4cc2a8ed5ca7c860006911f6dcb3804c Mon Sep 17 00:00:00 2001
|
|
From: Jin Yao <yao.jin@linux.intel.com>
|
|
Date: Tue, 27 Apr 2021 15:01:16 +0800
|
|
Subject: [PATCH 168/201] perf pmu: Simplify arguments of __perf_pmu__new_alias
|
|
|
|
mainline inclusion
|
|
from mainline-v5.13-rc1
|
|
commit eab35953e67b48c763fbb0e0ffc64dd3152361ea
|
|
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=eab35953e67b48c763fbb0e0ffc64dd3152361ea
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Simplify the arguments of __perf_pmu__new_alias() by passing the whole
|
|
'struct pme_event' pointer.
|
|
|
|
Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
|
|
Reviewed-by: Jiri Olsa <jolsa@kernel.org>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: Ingo Molnar <mingo@redhat.com>
|
|
Cc: Kan Liang <kan.liang@intel.com>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Link: https://lore.kernel.org/r/20210427070139.25256-4-yao.jin@linux.intel.com
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/util/pmu.c | 36 ++++++++++++++++--------------------
|
|
1 file changed, 16 insertions(+), 20 deletions(-)
|
|
|
|
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
|
|
index 529236890a43..bc85c8896db9 100644
|
|
--- a/tools/perf/util/pmu.c
|
|
+++ b/tools/perf/util/pmu.c
|
|
@@ -306,18 +306,25 @@ static bool perf_pmu_merge_alias(struct perf_pmu_alias *newalias,
|
|
}
|
|
|
|
static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name,
|
|
- char *desc, char *val,
|
|
- char *long_desc, char *topic,
|
|
- char *unit, char *perpkg,
|
|
- char *metric_expr,
|
|
- char *metric_name,
|
|
- char *deprecated)
|
|
+ char *desc, char *val, struct pmu_event *pe)
|
|
{
|
|
struct parse_events_term *term;
|
|
struct perf_pmu_alias *alias;
|
|
int ret;
|
|
int num;
|
|
char newval[256];
|
|
+ char *long_desc = NULL, *topic = NULL, *unit = NULL, *perpkg = NULL,
|
|
+ *metric_expr = NULL, *metric_name = NULL, *deprecated = NULL;
|
|
+
|
|
+ if (pe) {
|
|
+ long_desc = (char *)pe->long_desc;
|
|
+ topic = (char *)pe->topic;
|
|
+ unit = (char *)pe->unit;
|
|
+ perpkg = (char *)pe->perpkg;
|
|
+ metric_expr = (char *)pe->metric_expr;
|
|
+ metric_name = (char *)pe->metric_name;
|
|
+ deprecated = (char *)pe->deprecated;
|
|
+ }
|
|
|
|
alias = malloc(sizeof(*alias));
|
|
if (!alias)
|
|
@@ -406,8 +413,7 @@ static int perf_pmu__new_alias(struct list_head *list, char *dir, char *name, FI
|
|
/* Remove trailing newline from sysfs file */
|
|
rtrim(buf);
|
|
|
|
- return __perf_pmu__new_alias(list, dir, name, NULL, buf, NULL, NULL, NULL,
|
|
- NULL, NULL, NULL, NULL);
|
|
+ return __perf_pmu__new_alias(list, dir, name, NULL, buf, NULL);
|
|
}
|
|
|
|
static inline bool pmu_alias_info_file(char *name)
|
|
@@ -882,11 +888,7 @@ void pmu_add_cpu_aliases_map(struct list_head *head, struct perf_pmu *pmu,
|
|
/* need type casts to override 'const' */
|
|
__perf_pmu__new_alias(head, NULL, (char *)pe->name,
|
|
(char *)pe->desc, (char *)pe->event,
|
|
- (char *)pe->long_desc, (char *)pe->topic,
|
|
- (char *)pe->unit, (char *)pe->perpkg,
|
|
- (char *)pe->metric_expr,
|
|
- (char *)pe->metric_name,
|
|
- (char *)pe->deprecated);
|
|
+ pe);
|
|
}
|
|
}
|
|
|
|
@@ -953,13 +955,7 @@ static int pmu_add_sys_aliases_iter_fn(struct pmu_event *pe, void *data)
|
|
(char *)pe->name,
|
|
(char *)pe->desc,
|
|
(char *)pe->event,
|
|
- (char *)pe->long_desc,
|
|
- (char *)pe->topic,
|
|
- (char *)pe->unit,
|
|
- (char *)pe->perpkg,
|
|
- (char *)pe->metric_expr,
|
|
- (char *)pe->metric_name,
|
|
- (char *)pe->deprecated);
|
|
+ pe);
|
|
}
|
|
|
|
return 0;
|
|
--
|
|
2.27.0
|
|
|