Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

perf test bpf: Use epoll_wait() instead of epoll_pwait() 

The prototype for epoll_wait() is available in older distros, so use it
instead of epoll_pwait() (removing the last NULL arg, the sigmask,
makes it the same thing anyway) to avoid breaking the build.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-pwiwizloxt0jujy8em80qut3@git.kernel.org


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

tools/perf/tests/bpf-script-example.c

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ struct bpf_map_def SEC("maps") flip_table = { 
	.max_entries = 1,

};



SEC("func=sys_epoll_pwait")

int bpf_func__sys_epoll_pwait(void *ctx)

SEC("func=sys_epoll_wait")

int bpf_func__sys_epoll_wait(void *ctx)

{

	int ind =0;

	int *flag = bpf_map_lookup_elem(&flip_table, &ind);

tools/perf/tests/bpf.c

+3 −3
Original line number Diff line number Diff line
@@ -13,13 +13,13 @@ 


#ifdef HAVE_LIBBPF_SUPPORT



static int epoll_pwait_loop(void)

static int epoll_wait_loop(void)

{

	int i;



	/* Should fail NR_ITERS times */

	for (i = 0; i < NR_ITERS; i++)

		epoll_pwait(-(i + 1), NULL, 0, 0, NULL);

		epoll_wait(-(i + 1), NULL, 0, 0);

	return 0;

}
@@ -61,7 +61,7 @@ static struct { 
		"[basic_bpf_test]",

		"fix 'perf test LLVM' first",

		"load bpf object failed",

		&epoll_pwait_loop,

		&epoll_wait_loop,

		(NR_ITERS + 1) / 2,

	},

#ifdef HAVE_BPF_PROLOGUE