Skip to contentSkip to conversation

perf tools: Fix build with libpfm

PATCH In review Namhyung Kim 2 participants 2 messages Jul 12, 2021 – Jul 13, 2021 perf events

lore
Share & tools
lore

Namhyung Kim

author maintainer
#0 lore raw

PATCH 1/1 perf tools: Fix build with libpfm

It missed to update the parse_libpfm_events_option() to use a new helper function to set the event group leader.

  $ make LIBPFM4=1
  ...
    CC      util/pfm.o
  util/pfm.c: In function ‘parse_libpfm_events_option’:
  util/pfm.c:103:9: error: ‘struct evsel’ has no member named ‘leader’
    103 |    evsel->leader = grp_leader;
        |         ^~
  make[4]: *** [tools/build/Makefile.build:96: util/pfm.o] Error 1
Fixes fba7c86601e2 ("libperf: Move 'leader' from tools/perf to perf_evsel::leader")
---
 tools/perf/util/pfm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/pfm.c +1 -1
index dd9ed56e0504..756295dedccc 100644
@@ -99,7 +99,7 @@ int parse_libpfm_events_option(const struct option *opt, const char *str,
 			grp_leader = evsel;
 
 		if (grp_evt > -1) {
-			evsel->leader = grp_leader;
+			evsel__set_leader(evsel, grp_leader);
 			grp_leader->core.nr_members++;
 			grp_evt++;
 		}
Signature · 1 line
2.32.0.93.g670b81a890-goog
reviewer Acked-by on v1 1/1
#1 lore raw
Quoted 13 lines · Namhyung Kim

It missed to update the parse_libpfm_events_option() to use a new helper function to set the event group leader.

  $ make LIBPFM4=1
  ...
    CC      util/pfm.o
  util/pfm.c: In function ‘parse_libpfm_events_option’:
  util/pfm.c:103:9: error: ‘struct evsel’ has no member named ‘leader’
    103 |    evsel->leader = grp_leader;
        |         ^~
  make[4]: *** [tools/build/Makefile.build:96: util/pfm.o] Error 1
Quoted 2 lines
Fixes fba7c86601e2 ("libperf: Move 'leader' from tools/perf to perf_evsel::leader")

Thanks,
Ian

Quoted 20 lines
---
 tools/perf/util/pfm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/pfm.c +1 -2
index dd9ed56e0504..756295dedccc 100644
@@ -99,7 +99,7 @@ int parse_libpfm_events_option(const struct option *opt, const char *str,
                        grp_leader = evsel;
 
                if (grp_evt > -1) {
-                       evsel->leader = grp_leader;
+                       evsel__set_leader(evsel, grp_leader);
                        grp_leader->core.nr_members++;
                        grp_evt++;
                }
--

2.32.0.93.g670b81a890-goog