Commit c4d9d95f authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf cpumap: Tidy libperf includes 



Use public API when possible, don't include internal API in header
files in evsel.h. Fix any related breakages.

Committer note:

There was one missing case, when building for arm64:

  arch/arm64/util/pmu.c: In function 'pmu_events_table__find':
  arch/arm64/util/pmu.c:18:30: error: invalid use of undefined type 'struct perf_cpu_map'
     18 |                 if (pmu->cpus->nr != cpu__max_cpu().cpu)
        |                              ^~

Fix it by adding one more exception, including <internal/cpumap.h>

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Nicolas Schier <nicolas@fjasle.eu>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: bpf@vger.kernel.org
Link: http://lore.kernel.org/lkml/20221109184914.1357295-14-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent fd3f518f

tools/perf/arch/arm64/util/pmu.c

+1 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#include <internal/cpumap.h>

#include "../../../util/cpumap.h"

#include "../../../util/pmu.h"

tools/perf/tests/cpumap.c

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include "util/synthetic-events.h"

#include <string.h>

#include <linux/bitops.h>

#include <perf/cpumap.h>

#include <internal/cpumap.h>

#include "debug.h"



struct machine;

tools/perf/util/auxtrace.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/list.h>

#include <linux/perf_event.h>

#include <linux/types.h>

#include <internal/cpumap.h>

#include <perf/cpumap.h>

#include <asm/bitsperlong.h>

#include <asm/barrier.h>

tools/perf/util/cpumap.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <linux/ctype.h>

#include <linux/zalloc.h>

#include <internal/cpumap.h>



static struct perf_cpu max_cpu_num;

static struct perf_cpu max_present_cpu_num;

tools/perf/util/cpumap.h

+1 −1
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 


#include <stdbool.h>

#include <stdio.h>

#include <internal/cpumap.h>

#include <perf/cpumap.h>

#include <linux/refcount.h>



/** Identify where counts are aggregated, -1 implies not to aggregate. */

struct aggr_cpu_id {