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 <joe@ovn.org>
Acked-by: Wang Nan <wangnan0@huawei.com>
Cc: Alexei Starovoitov <ast@fb.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: netdev@vger.kernel.org
Link: http://lkml.kernel.org/r/20170123011128.26534-3-joe@ovn.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 671d5ad07cf1d8fc202c7cae5cf9cc506ddaae66..371cb40a23046f6337294d870c25797f71d2a355 100644 (file)
--- 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)
 {