78c8558354
[ Upstream commit e4d9b04b973b2dbce7b42af95ea70d07da1c936d ] Noticed with gcc 10 (fedora rawhide) that those variables were not being declared as static, so end up with: ld: /tmp/build/perf/bench/epoll-wait.o:/git/perf/tools/perf/bench/epoll-wait.c:93: multiple definition of `end'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here ld: /tmp/build/perf/bench/epoll-wait.o:/git/perf/tools/perf/bench/epoll-wait.c:93: multiple definition of `start'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here ld: /tmp/build/perf/bench/epoll-wait.o:/git/perf/tools/perf/bench/epoll-wait.c:93: multiple definition of `runtime'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here ld: /tmp/build/perf/bench/epoll-ctl.o:/git/perf/tools/perf/bench/epoll-ctl.c:38: multiple definition of `end'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here ld: /tmp/build/perf/bench/epoll-ctl.o:/git/perf/tools/perf/bench/epoll-ctl.c:38: multiple definition of `start'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here ld: /tmp/build/perf/bench/epoll-ctl.o:/git/perf/tools/perf/bench/epoll-ctl.c:38: multiple definition of `runtime'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here make[4]: *** [/git/perf/tools/build/Makefile.build:145: /tmp/build/perf/bench/perf-in.o] Error 1 Prefix those with bench__ and add them to bench/bench.h, so that we can share those on the tools needing to access those variables from signal handlers. Acked-by: Thomas Gleixner <tglx@linutronix.de> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Davidlohr Bueso <dave@stgolabs.net> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Link: http://lore.kernel.org/lkml/20200303155811.GD13702@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
56 lines
1.5 KiB
C
56 lines
1.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef BENCH_H
|
|
#define BENCH_H
|
|
|
|
#include <sys/time.h>
|
|
|
|
extern struct timeval bench__start, bench__end, bench__runtime;
|
|
|
|
/*
|
|
* The madvise transparent hugepage constants were added in glibc
|
|
* 2.13. For compatibility with older versions of glibc, define these
|
|
* tokens if they are not already defined.
|
|
*
|
|
* PA-RISC uses different madvise values from other architectures and
|
|
* needs to be special-cased.
|
|
*/
|
|
#ifdef __hppa__
|
|
# ifndef MADV_HUGEPAGE
|
|
# define MADV_HUGEPAGE 67
|
|
# endif
|
|
# ifndef MADV_NOHUGEPAGE
|
|
# define MADV_NOHUGEPAGE 68
|
|
# endif
|
|
#else
|
|
# ifndef MADV_HUGEPAGE
|
|
# define MADV_HUGEPAGE 14
|
|
# endif
|
|
# ifndef MADV_NOHUGEPAGE
|
|
# define MADV_NOHUGEPAGE 15
|
|
# endif
|
|
#endif
|
|
|
|
int bench_numa(int argc, const char **argv);
|
|
int bench_sched_messaging(int argc, const char **argv);
|
|
int bench_sched_pipe(int argc, const char **argv);
|
|
int bench_mem_memcpy(int argc, const char **argv);
|
|
int bench_mem_memset(int argc, const char **argv);
|
|
int bench_futex_hash(int argc, const char **argv);
|
|
int bench_futex_wake(int argc, const char **argv);
|
|
int bench_futex_wake_parallel(int argc, const char **argv);
|
|
int bench_futex_requeue(int argc, const char **argv);
|
|
/* pi futexes */
|
|
int bench_futex_lock_pi(int argc, const char **argv);
|
|
|
|
#define BENCH_FORMAT_DEFAULT_STR "default"
|
|
#define BENCH_FORMAT_DEFAULT 0
|
|
#define BENCH_FORMAT_SIMPLE_STR "simple"
|
|
#define BENCH_FORMAT_SIMPLE 1
|
|
|
|
#define BENCH_FORMAT_UNKNOWN -1
|
|
|
|
extern int bench_format;
|
|
extern unsigned int bench_repeat;
|
|
|
|
#endif
|