Commit ba35fe93 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools feature: Rename HAVE_EVENTFD to HAVE_EVENTFD_SUPPORT 



To be consistent with other such auto-detected features.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Anand K Mistry <amistry@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f0aef475

tools/perf/Makefile.config

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ ifndef NO_BIONIC 
endif



ifeq ($(feature-eventfd), 1)

  CFLAGS += -DHAVE_EVENTFD

  CFLAGS += -DHAVE_EVENTFD_SUPPORT

endif



ifeq ($(feature-get_current_dir_name), 1)

tools/perf/bench/epoll-ctl.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Benchmark the various operations allowed for epoll_ctl(2).

 * The idea is to concurrently stress a single epoll instance

 */

#ifdef HAVE_EVENTFD

#ifdef HAVE_EVENTFD_SUPPORT

/* For the CLR_() macros */

#include <string.h>

#include <pthread.h>
@@ -412,4 +412,4 @@ int bench_epoll_ctl(int argc, const char **argv) 
errmem:

	err(EXIT_FAILURE, "calloc");

}

#endif // HAVE_EVENTFD
 
#endif // HAVE_EVENTFD_SUPPORT

tools/perf/bench/epoll-wait.c

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

#ifdef HAVE_EVENTFD

#ifdef HAVE_EVENTFD_SUPPORT

/*

 * Copyright (C) 2018 Davidlohr Bueso.

 *
@@ -540,4 +540,4 @@ int bench_epoll_wait(int argc, const char **argv) 
errmem:

	err(EXIT_FAILURE, "calloc");

}

#endif // HAVE_EVENTFD
 
#endif // HAVE_EVENTFD_SUPPORT

tools/perf/builtin-bench.c

+3 −3
Original line number Diff line number Diff line
@@ -67,14 +67,14 @@ static struct bench futex_benchmarks[] = { 
	{ NULL,		NULL,						NULL			}

};



#ifdef HAVE_EVENTFD

#ifdef HAVE_EVENTFD_SUPPORT

static struct bench epoll_benchmarks[] = {

	{ "wait",	"Benchmark epoll concurrent epoll_waits",       bench_epoll_wait	},

	{ "ctl",	"Benchmark epoll concurrent epoll_ctls",        bench_epoll_ctl		},

	{ "all",	"Run all futex benchmarks",			NULL			},

	{ NULL,		NULL,						NULL			}

};

#endif // HAVE_EVENTFD

#endif // HAVE_EVENTFD_SUPPORT



static struct bench internals_benchmarks[] = {

	{ "synthesize", "Benchmark perf event synthesis",	bench_synthesize	},
@@ -95,7 +95,7 @@ static struct collection collections[] = { 
	{ "numa",	"NUMA scheduling and MM benchmarks",		numa_benchmarks		},

#endif

	{"futex",       "Futex stressing benchmarks",                   futex_benchmarks        },

#ifdef HAVE_EVENTFD

#ifdef HAVE_EVENTFD_SUPPORT

	{"epoll",       "Epoll stressing benchmarks",                   epoll_benchmarks        },

#endif

	{ "internals",	"Perf-internals benchmarks",			internals_benchmarks	},

CRA Git | Maintained and supported by SUSTech CRA and CCSE