leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2016-07-11 23:22:30 -03:00
parent 12f020338a
commit 4ffde49246
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/perf/tests/bpf-script-example.c
View File

@ -31,8 +31,8 @@ struct bpf_map_def SEC("maps") flip_table = {
.max_entries = 1, .max_entries = 1,
}; };
SEC("func=sys_epoll_pwait") SEC("func=sys_epoll_wait")
int bpf_func__sys_epoll_pwait(void *ctx) int bpf_func__sys_epoll_wait(void *ctx)
{ {
int ind =0; int ind =0;
int *flag = bpf_map_lookup_elem(&flip_table, &ind); int *flag = bpf_map_lookup_elem(&flip_table, &ind);

6
tools/perf/tests/bpf.c
View File

@ -13,13 +13,13 @@
#ifdef HAVE_LIBBPF_SUPPORT #ifdef HAVE_LIBBPF_SUPPORT
static int epoll_pwait_loop(void) static int epoll_wait_loop(void)
{ {
int i; int i;
/* Should fail NR_ITERS times */ /* Should fail NR_ITERS times */
for (i = 0; i < NR_ITERS; i++) for (i = 0; i < NR_ITERS; i++)
epoll_pwait(-(i + 1), NULL, 0, 0, NULL); epoll_wait(-(i + 1), NULL, 0, 0);
return 0; return 0;
} }
@ -61,7 +61,7 @@ static struct {
"[basic_bpf_test]", "[basic_bpf_test]",
"fix 'perf test LLVM' first", "fix 'perf test LLVM' first",
"load bpf object failed", "load bpf object failed",
&epoll_pwait_loop, &epoll_wait_loop,
(NR_ITERS + 1) / 2, (NR_ITERS + 1) / 2,
}, },
#ifdef HAVE_BPF_PROLOGUE #ifdef HAVE_BPF_PROLOGUE