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

perf python: Remove PYTHON_PERF ifdefs 



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: 9dabf400 ("perf python: Switch module to linking libraries from building source")
Signed-off-by: default avatarIan 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 0fe881f1

tools/perf/util/evsel_fprintf.c

+0 −2
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ int evsel__fprintf(struct evsel *evsel, struct perf_attr_details *details, FILE 
	return ++printed;

}



#ifndef PYTHON_PERF

int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,

			      unsigned int print_opts, struct callchain_cursor *cursor,

			      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;

}
 
#endif /* PYTHON_PERF */

tools/perf/util/mmap.c

+0 −4
Original line number Diff line number Diff line
@@ -230,9 +230,7 @@ void mmap__munmap(struct mmap *map) 
{

	bitmap_free(map->affinity_mask.bits);



#ifndef PYTHON_PERF

	zstd_fini(&map->zstd_data);

#endif



	perf_mmap__aio_munmap(map);

	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;



#ifndef PYTHON_PERF

	if (zstd_init(&map->zstd_data, mp->comp_level)) {

		pr_debug2("failed to init mmap compressor, error %d\n", errno);

		return -1;

	}

#endif



	if (mp->comp_level && !perf_mmap__aio_enabled(map)) {

		map->data = mmap(NULL, mmap__mmap_len(map), PROT_READ|PROT_WRITE,