From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753602AbdAZPbX (ORCPT ); Thu, 26 Jan 2017 10:31:23 -0500 Received: from terminus.zytor.com ([65.50.211.136]:47770 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753316AbdAZPbQ (ORCPT ); Thu, 26 Jan 2017 10:31:16 -0500 Date: Thu, 26 Jan 2017 07:30:13 -0800 From: tip-bot for Joe Stringer Message-ID: Cc: acme@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de, joe@ovn.org, daniel@iogearbox.net, wangnan0@huawei.com, ast@fb.com Reply-To: daniel@iogearbox.net, joe@ovn.org, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, ast@fb.com, wangnan0@huawei.com, acme@redhat.com, linux-kernel@vger.kernel.org In-Reply-To: <20170123011128.26534-3-joe@ovn.org> References: <20170123011128.26534-3-joe@ovn.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib bpf: Define prog_type fns with macro Git-Commit-ID: ed7940731ac89616b8a516c560a76dca44a152a8 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: ed7940731ac89616b8a516c560a76dca44a152a8 Gitweb: http://git.kernel.org/tip/ed7940731ac89616b8a516c560a76dca44a152a8 Author: Joe Stringer AuthorDate: Sun, 22 Jan 2017 17:11:23 -0800 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 26 Jan 2017 11:42:57 -0300 tools lib bpf: Define prog_type fns with macro Turning this into a macro allows future prog types to be added with a single line per type. Signed-off-by: Joe Stringer Acked-by: Wang Nan Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: netdev@vger.kernel.org Link: http://lkml.kernel.org/r/20170123011128.26534-3-joe@ovn.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/bpf/libbpf.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 671d5ad..371cb40 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -1428,37 +1428,28 @@ static void bpf_program__set_type(struct bpf_program *prog, prog->type = type; } -int bpf_program__set_tracepoint(struct bpf_program *prog) -{ - if (!prog) - return -EINVAL; - bpf_program__set_type(prog, BPF_PROG_TYPE_TRACEPOINT); - return 0; -} - -int bpf_program__set_kprobe(struct bpf_program *prog) -{ - if (!prog) - return -EINVAL; - bpf_program__set_type(prog, BPF_PROG_TYPE_KPROBE); - return 0; -} - static bool bpf_program__is_type(struct bpf_program *prog, enum bpf_prog_type type) { return prog ? (prog->type == type) : false; } -bool bpf_program__is_tracepoint(struct bpf_program *prog) -{ - return bpf_program__is_type(prog, BPF_PROG_TYPE_TRACEPOINT); -} - -bool bpf_program__is_kprobe(struct bpf_program *prog) -{ - return bpf_program__is_type(prog, BPF_PROG_TYPE_KPROBE); -} +#define BPF_PROG_TYPE_FNS(NAME, TYPE) \ +int bpf_program__set_##NAME(struct bpf_program *prog) \ +{ \ + if (!prog) \ + return -EINVAL; \ + bpf_program__set_type(prog, TYPE); \ + return 0; \ +} \ + \ +bool bpf_program__is_##NAME(struct bpf_program *prog) \ +{ \ + return bpf_program__is_type(prog, TYPE); \ +} \ + +BPF_PROG_TYPE_FNS(kprobe, BPF_PROG_TYPE_KPROBE); +BPF_PROG_TYPE_FNS(tracepoint, BPF_PROG_TYPE_TRACEPOINT); int bpf_map__fd(struct bpf_map *map) {