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

perf thread_map: Reduce exposure of libperf internal API 



Remove unnecessary include of internal threadmap.h and refcount.h in
thread_map.h. Switch to using public APIs when possible or including
the internal header file in the C file. Fix a transitive dependency in
openat-syscall.c broken by the clean up.

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-13-irogers@google.com


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

tools/perf/builtin-stat.c

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


#include <linux/ctype.h>

#include <perf/evlist.h>

#include <internal/threadmap.h>



#define DEFAULT_SEPARATOR	" "

#define FREEZE_ON_SMI_PATH	"devices/cpu/freeze_on_smi"

tools/perf/builtin-trace.c

+2 −2
Original line number Diff line number Diff line
@@ -4095,7 +4095,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 
	}



	trace->multiple_threads = perf_thread_map__pid(evlist->core.threads, 0) == -1 ||

				  evlist->core.threads->nr > 1 ||

		perf_thread_map__nr(evlist->core.threads) > 1 ||

		evlist__first(evlist)->core.attr.inherit;



	/*

tools/perf/tests/openat-syscall.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <sys/types.h>

#include <sys/stat.h>

#include <fcntl.h>

#include <unistd.h>

#include "thread_map.h"

#include "evsel.h"

#include "debug.h"

tools/perf/tests/thread-map.c

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

#include <linux/zalloc.h>

#include <perf/event.h>

#include <internal/threadmap.h>



struct perf_sample;

struct perf_tool;

tools/perf/util/bpf_counter.c

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static int bperf__load(struct evsel *evsel, struct target *target) 


		if (filter_type == BPERF_FILTER_PID ||

		    filter_type == BPERF_FILTER_TGID)

			key = evsel->core.threads->map[i].pid;

			key = perf_thread_map__pid(evsel->core.threads, i);

		else if (filter_type == BPERF_FILTER_CPU)

			key = evsel->core.cpus->map[i].cpu;

		else