kevin/linux
1
Fork 0
Code

perf python: Remove PYTHON_PERF ifdefs

Browse Source 
When perf code was compiled one way for the binary and another for the
python module, the PYTHON_PERF ifdef was used to remove some code from
the python module.

Since switching to building the perf code as a series of libraries, with
the same libraries being used for the python module, the ifdefs became
unused as PYTHON_PERF is never defined. As such remove the ifdefs.

Fixes: 9dabf40034 ("perf python: Switch module to linking libraries from building source")
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20240731230005.12295-1-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers 2024-07-31 16:00:05 -07:00 committed by Arnaldo Carvalho de Melo
parent 0fe881f10c
commit 7c5dd51bbb
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/util/evsel_fprintf.c
View File

@ -107,7 +107,6 @@ out:
return ++printed; return ++printed;
} }
#ifndef PYTHON_PERF
int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment, int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,
unsigned int print_opts, struct callchain_cursor *cursor, unsigned int print_opts, struct callchain_cursor *cursor,
struct strlist *bt_stop_list, FILE *fp) struct strlist *bt_stop_list, FILE *fp)
@ -248,4 +247,3 @@ int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al,
return printed; return printed;
} }
#endif /* PYTHON_PERF */

4
tools/perf/util/mmap.c
View File

@ -230,9 +230,7 @@ void mmap__munmap(struct mmap *map)
{ {
bitmap_free(map->affinity_mask.bits); bitmap_free(map->affinity_mask.bits);
#ifndef PYTHON_PERF
zstd_fini(&map->zstd_data); zstd_fini(&map->zstd_data);
#endif
perf_mmap__aio_munmap(map); perf_mmap__aio_munmap(map);
if (map->data != NULL) { if (map->data != NULL) {
@ -295,12 +293,10 @@ int mmap__mmap(struct mmap *map, struct mmap_params *mp, int fd, struct perf_cpu
map->core.flush = mp->flush; map->core.flush = mp->flush;
#ifndef PYTHON_PERF
if (zstd_init(&map->zstd_data, mp->comp_level)) { if (zstd_init(&map->zstd_data, mp->comp_level)) {
pr_debug2("failed to init mmap compressor, error %d\n", errno); pr_debug2("failed to init mmap compressor, error %d\n", errno);
return -1; return -1;
} }
#endif
if (mp->comp_level && !perf_mmap__aio_enabled(map)) { if (mp->comp_level && !perf_mmap__aio_enabled(map)) {
map->data = mmap(NULL, mmap__mmap_len(map), PROT_READ|PROT_WRITE, map->data = mmap(NULL, mmap__mmap_len(map), PROT_READ|PROT_WRITE,