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

perf expr: Tidy hashmap dependency 



hashmap.h comes from libbpf but isn't installed with its
headers. Always use the header file of the code in util. Change the
hashmap.h dependency in expr.h to a forward declaration, add the
necessary header file includes in the C files.

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


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

tools/perf/tests/expr.c

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

#include "util/debug.h"

#include "util/expr.h"

#include "util/hashmap.h"

#include "util/header.h"

#include "util/smt.h"

#include "tests.h"

tools/perf/tests/pmu-events.c

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

#include "util/evlist.h"

#include "util/expr.h"

#include "util/hashmap.h"

#include "util/parse-events.h"

#include "metricgroup.h"

#include "stat.h"

tools/perf/util/bpf-loader.c

+0 −4
Original line number Diff line number Diff line
@@ -27,11 +27,7 @@ 
#include "util.h"

#include "llvm-utils.h"

#include "c++/clang-c.h"

#ifdef HAVE_LIBBPF_SUPPORT

#include <bpf/hashmap.h>

#else

#include "util/hashmap.h"

#endif

#include "asm/bug.h"



#include <internal/xyarray.h>

tools/perf/util/evsel.c

+0 −4
Original line number Diff line number Diff line
@@ -46,11 +46,7 @@ 
#include "string2.h"

#include "memswap.h"

#include "util.h"

#ifdef HAVE_LIBBPF_SUPPORT

#include <bpf/hashmap.h>

#else

#include "util/hashmap.h"

#endif

#include "pmu-hybrid.h"

#include "off_cpu.h"

#include "../perf-sys.h"

tools/perf/util/expr.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "expr.h"

#include "expr-bison.h"

#include "expr-flex.h"

#include "util/hashmap.h"

#include "smt.h"

#include "tsc.h"

#include <linux/err.h>