[PATCH 16/59] libperf: Move weak_group to perf_evsel
From: Jiri Olsa <hidden>
Date: 2021-11-08 13:39:01
Subsystem:
performance events subsystem, the rest · Maintainers:
Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo, Namhyung Kim, Linus Torvalds
Moving weak_group to perf_evsel struct. Signed-off-by: Jiri Olsa <jolsa@kernel.org> --- tools/lib/perf/include/internal/evsel.h | 1 + tools/perf/builtin-record.c | 2 +- tools/perf/builtin-stat.c | 2 +- tools/perf/util/evsel.c | 2 +- tools/perf/util/evsel.h | 1 - tools/perf/util/parse-events.c | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/lib/perf/include/internal/evsel.h b/tools/lib/perf/include/internal/evsel.h
index 0d14cbebae3a..8374dc8365cb 100644
--- a/tools/lib/perf/include/internal/evsel.h
+++ b/tools/lib/perf/include/internal/evsel.h@@ -72,6 +72,7 @@ struct perf_evsel { int exclude_GH; int sample_read; bool precise_max; + bool weak_group; }; };
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index d5b899b235be..d232de3e72ac 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c@@ -929,7 +929,7 @@ static int record__open(struct record *rec) } if ((errno == EINVAL || errno == EBADF) && pos->core.leader != &pos->core && - pos->weak_group) { + pos->core.weak_group) { pos = evlist__reset_weak_group(evlist, pos, true); goto try_again; }
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index f57a366b7a1a..8b39f3f3b3b8 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c@@ -842,7 +842,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) */ if ((errno == EINVAL || errno == EBADF) && evsel__leader(counter) != counter && - counter->weak_group) { + counter->core.weak_group) { evlist__reset_weak_group(evsel_list, counter, false); assert(counter->reset_group); second_pass = true;
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index d1bb784a4310..aafd91805870 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c@@ -435,7 +435,7 @@ struct evsel *evsel__clone(struct evsel *orig) evsel->core.sample_read = orig->core.sample_read; evsel->core.auto_merge_stats = orig->core.auto_merge_stats; evsel->collect_stat = orig->collect_stat; - evsel->weak_group = orig->weak_group; + evsel->core.weak_group = orig->core.weak_group; evsel->use_config_name = orig->use_config_name; if (evsel__copy_config_terms(evsel, orig) < 0)
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 79dd9ea5bf85..22f579e0e862 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h@@ -68,7 +68,6 @@ struct evsel { bool use_uncore_alias; bool is_libpfm_event; bool collect_stat; - bool weak_group; bool bpf_counter; bool use_config_name; int bpf_fd;
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index dc70ff74b357..7a3a27f45644 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c@@ -2052,7 +2052,7 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add) evsel->core.exclude_GH = mod.exclude_GH; evsel->core.sample_read = mod.sample_read; evsel->core.precise_max = mod.precise_max; - evsel->weak_group = mod.weak; + evsel->core.weak_group = mod.weak; evsel->bpf_counter = mod.bpf_counter; if (evsel__is_group_leader(evsel)) {
--
2.31.1