From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751970AbcGMHRg (ORCPT ); Wed, 13 Jul 2016 03:17:36 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41446 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750854AbcGMHR2 (ORCPT ); Wed, 13 Jul 2016 03:17:28 -0400 Date: Wed, 13 Jul 2016 00:17:13 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: 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 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 To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf test bpf: Use epoll_wait() instead of epoll_pwait() Git-Commit-ID: 4ffde492461d5c2111bf64366b633e554b4aa925 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact 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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4ffde492461d5c2111bf64366b633e554b4aa925 Gitweb: http://git.kernel.org/tip/4ffde492461d5c2111bf64366b633e554b4aa925 Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 11 Jul 2016 23:22:30 -0300 Committer: Arnaldo Carvalho de Melo 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 Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-pwiwizloxt0jujy8em80qut3@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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