Groups > linux.kernel > #1442081

[tip:perf/core] perf test bpf: Use epoll_wait() instead of epoll_pwait()

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	tip-bot for Arnaldo Carvalho de Melo <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:perf/core] perf test bpf: Use epoll_wait() instead of epoll_pwait()
Date	Wed, 13 Jul 2016 09:20:02 +0200
Message-ID	<rUmCC-8ei-47@gated-at.bofh.it> (permalink)
Reply-To	jolsa@kernel.org, mingo@kernel.org, wangnan0@huawei.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, hpa@zytor.com, adrian.hunter@intel.com, dsahern@gmail.com, tglx@linutronix.de, acme@redhat.com
Git-Commit-ID	4ffde492461d5c2111bf64366b633e554b4aa925
X-Mailer	tip-git-log-daemon
Robot-ID	<tip-bot.git.kernel.org>
Robot-Unsubscribe	Contact <mailto:hpa@kernel.org> to get blacklisted from these emails
MIME-Version	1.0
Content-Transfer-Encoding	8bit
Content-Type	text/plain; charset=UTF-8
Content-Disposition	inline
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	69
Organization	linux.* mail to news gateway
X-Original-Cc	acme@redhat.com, dsahern@gmail.com, tglx@linutronix.de, adrian.hunter@intel.com, namhyung@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, wangnan0@huawei.com, jolsa@kernel.org, mingo@kernel.org
X-Original-Date	Wed, 13 Jul 2016 00:17:13 -0700
X-Original-Message-ID	<tip-pwiwizloxt0jujy8em80qut3@git.kernel.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1442081

Show key headers only | View raw

Commit-ID:  4ffde492461d5c2111bf64366b633e554b4aa925
Gitweb:     http://git.kernel.org/tip/4ffde492461d5c2111bf64366b633e554b4aa925
Author:     Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Mon, 11 Jul 2016 23:22:30 -0300
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 12 Jul 2016 15:20:33 -0300

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: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/tests/bpf-script-example.c | 4 ++--
 tools/perf/tests/bpf.c                | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/perf/tests/bpf-script-example.c b/tools/perf/tests/bpf-script-example.c
index 0ec9c2c..e53bc91 100644
--- a/tools/perf/tests/bpf-script-example.c
+++ b/tools/perf/tests/bpf-script-example.c
@@ -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);
diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c
index da0d87613..fc54064 100644
--- a/tools/perf/tests/bpf.c
+++ b/tools/perf/tests/bpf.c
@@ -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

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[tip:perf/core] perf test bpf: Use epoll_wait() instead of  epoll_pwait() tip-bot for Arnaldo Carvalho de Melo <tipbot@zytor.com> - 2016-07-13 09:20 +0200

csiph-web