100 lines
3.2 KiB
Diff
100 lines
3.2 KiB
Diff
From e55faa87583d6afabe8506954c5f0ace70c5051a Mon Sep 17 00:00:00 2001
|
|
From: Jiri Olsa <jolsa@kernel.org>
|
|
Date: Tue, 2 Jun 2020 23:47:31 +0200
|
|
Subject: [PATCH 092/201] perf tests: Factor check_parse_id function
|
|
|
|
mainline inclusion
|
|
from mainline-v5.9-rc1
|
|
commit 34bacc9578de2893ab6301cea89ea001d8e4cf5b
|
|
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=34bacc9578de2893ab6301cea89ea001d8e4cf5b
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Separating the generic part of check_parse_id function,
|
|
so it can be used in following changes for the new test.
|
|
|
|
Committer notes:
|
|
|
|
Fix this error:
|
|
|
|
tests/pmu-events.c:413:40: error: missing field 'idx' initializer [-Werror,-Wmissing-field-initializers]
|
|
struct parse_events_error error = { 0 };
|
|
|
|
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
|
|
Acked-by: Ian Rogers <irogers@google.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: Michael Petlan <mpetlan@redhat.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Stephane Eranian <eranian@google.com>
|
|
Link: http://lore.kernel.org/lkml/20200602214741.1218986-4-jolsa@kernel.org
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
|
|
Conflicts:
|
|
tools/perf/tests/pmu-events.c
|
|
---
|
|
tools/perf/tests/pmu-events.c | 20 ++++++++++++++------
|
|
1 file changed, 14 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c
|
|
index 41dab7e36761..7269bdeeda2c 100644
|
|
--- a/tools/perf/tests/pmu-events.c
|
|
+++ b/tools/perf/tests/pmu-events.c
|
|
@@ -390,9 +390,8 @@ static bool is_number(const char *str)
|
|
return errno == 0 && end_ptr != str;
|
|
}
|
|
|
|
-static int check_parse_id(const char *id, bool same_cpu, struct pmu_event *pe)
|
|
+static int check_parse_id(const char *id, struct parse_events_error *error)
|
|
{
|
|
- struct parse_events_error error;
|
|
struct perf_evlist *evlist;
|
|
int ret;
|
|
|
|
@@ -401,8 +400,18 @@ static int check_parse_id(const char *id, bool same_cpu, struct pmu_event *pe)
|
|
return 0;
|
|
|
|
evlist = perf_evlist__new();
|
|
- memset(&error, 0, sizeof(error));
|
|
- ret = parse_events(evlist, id, &error);
|
|
+ if (!evlist)
|
|
+ return -ENOMEM;
|
|
+ ret = parse_events(evlist, id, error);
|
|
+ perf_evlist__delete(evlist);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static int check_parse_cpu(const char *id, bool same_cpu, struct pmu_event *pe)
|
|
+{
|
|
+ struct parse_events_error error = { .idx = 0, };
|
|
+
|
|
+ int ret = check_parse_id(id, &error);
|
|
if (ret && same_cpu) {
|
|
pr_warning("Parse event failed metric '%s' id '%s' expr '%s'\n",
|
|
pe->metric_name, id, pe->metric_expr);
|
|
@@ -413,7 +422,6 @@ static int check_parse_id(const char *id, bool same_cpu, struct pmu_event *pe)
|
|
id, pe->metric_name, pe->metric_expr);
|
|
ret = 0;
|
|
}
|
|
- perf_evlist__delete(evlist);
|
|
free(error.str);
|
|
free(error.help);
|
|
return ret;
|
|
@@ -472,7 +480,7 @@ static int test_parsing(void)
|
|
expr__add_id(&ctx, strdup(cur->key), k++);
|
|
|
|
hashmap__for_each_entry((&ctx.ids), cur, bkt) {
|
|
- if (check_parse_id(cur->key, map == cpus_map,
|
|
+ if (check_parse_cpu(cur->key, map == cpus_map,
|
|
pe))
|
|
ret++;
|
|
}
|
|
--
|
|
2.27.0
|
|
|