diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2019-02-04 09:40:59 -0800 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2019-02-04 09:40:59 -0800 |
| commit | 9fa3b47304b601fd979fada94eb65148179932c9 (patch) | |
| tree | a06e49a2ac5d5a35f3fb6a25c1ea689f3c6bfe40 /tools/lib/bpf/test_libbpf.cpp | |
| parent | cc7335786f7278d66bdcf96d3d411edfcb01be51 (diff) | |
| parent | 6f1ae8b6628b9e054d3a8c959cf472234944a578 (diff) | |
| download | linux-9fa3b47304b601fd979fada94eb65148179932c9.tar.gz linux-9fa3b47304b601fd979fada94eb65148179932c9.tar.bz2 linux-9fa3b47304b601fd979fada94eb65148179932c9.zip | |
Merge branch 'change-libbpf-print-api'
Yonghong Song says:
====================
These are patches responding to my comments for
Magnus's patch (https://patchwork.ozlabs.org/patch/1032848/).
The goal is to make pr_* macros available to other C files
than libbpf.c, and to simplify API function libbpf_set_print().
Specifically, Patch #1 used global functions
to facilitate pr_* macros in the header files so they
are available in different C files.
Patch #2 removes the global function libbpf_print_level_available()
which is added in Patch 1.
Patch #3 simplified libbpf_set_print() which takes only one print
function with a debug level argument among others.
Changelogs:
v3 -> v4:
. rename libbpf internal header util.h to libbpf_util.h
. rename libbpf internal function libbpf_debug_print() to libbpf_print()
v2 -> v3:
. bailed out earlier in libbpf_debug_print() if __libbpf_pr is NULL
. added missing LIBBPF_DEBUG level check in libbpf.c __base_pr().
v1 -> v2:
. Renamed global function libbpf_dprint() to libbpf_debug_print()
to be more expressive.
. Removed libbpf_dprint_level_available() as it is used only
once in btf.c and we can remove it by optimizing for common cases.
====================
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/lib/bpf/test_libbpf.cpp')
| -rw-r--r-- | tools/lib/bpf/test_libbpf.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/lib/bpf/test_libbpf.cpp b/tools/lib/bpf/test_libbpf.cpp index abf3fc25c9fa..fc134873bb6d 100644 --- a/tools/lib/bpf/test_libbpf.cpp +++ b/tools/lib/bpf/test_libbpf.cpp @@ -8,11 +8,11 @@ int main(int argc, char *argv[]) { /* libbpf.h */ - libbpf_set_print(NULL, NULL, NULL); + libbpf_set_print(NULL); /* bpf.h */ bpf_prog_get_fd_by_id(0); /* btf.h */ - btf__new(NULL, 0, NULL); + btf__new(NULL, 0); } |