diff options
Diffstat (limited to 'tools/perf/util/bpf-loader.c')
-rw-r--r-- | tools/perf/util/bpf-loader.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c index 2f3eb6d293ee..037d8ff6a634 100644 --- a/tools/perf/util/bpf-loader.c +++ b/tools/perf/util/bpf-loader.c | |||
@@ -24,22 +24,12 @@ | |||
24 | #include "llvm-utils.h" | 24 | #include "llvm-utils.h" |
25 | #include "c++/clang-c.h" | 25 | #include "c++/clang-c.h" |
26 | 26 | ||
27 | #define DEFINE_PRINT_FN(name, level) \ | 27 | static int libbpf_perf_print(enum libbpf_print_level level __attribute__((unused)), |
28 | static int libbpf_##name(const char *fmt, ...) \ | 28 | const char *fmt, va_list args) |
29 | { \ | 29 | { |
30 | va_list args; \ | 30 | return veprintf(1, verbose, pr_fmt(fmt), args); |
31 | int ret; \ | ||
32 | \ | ||
33 | va_start(args, fmt); \ | ||
34 | ret = veprintf(level, verbose, pr_fmt(fmt), args);\ | ||
35 | va_end(args); \ | ||
36 | return ret; \ | ||
37 | } | 31 | } |
38 | 32 | ||
39 | DEFINE_PRINT_FN(warning, 1) | ||
40 | DEFINE_PRINT_FN(info, 1) | ||
41 | DEFINE_PRINT_FN(debug, 1) | ||
42 | |||
43 | struct bpf_prog_priv { | 33 | struct bpf_prog_priv { |
44 | bool is_tp; | 34 | bool is_tp; |
45 | char *sys_name; | 35 | char *sys_name; |
@@ -59,9 +49,7 @@ bpf__prepare_load_buffer(void *obj_buf, size_t obj_buf_sz, const char *name) | |||
59 | struct bpf_object *obj; | 49 | struct bpf_object *obj; |
60 | 50 | ||
61 | if (!libbpf_initialized) { | 51 | if (!libbpf_initialized) { |
62 | libbpf_set_print(libbpf_warning, | 52 | libbpf_set_print(libbpf_perf_print); |
63 | libbpf_info, | ||
64 | libbpf_debug); | ||
65 | libbpf_initialized = true; | 53 | libbpf_initialized = true; |
66 | } | 54 | } |
67 | 55 | ||
@@ -79,9 +67,7 @@ struct bpf_object *bpf__prepare_load(const char *filename, bool source) | |||
79 | struct bpf_object *obj; | 67 | struct bpf_object *obj; |
80 | 68 | ||
81 | if (!libbpf_initialized) { | 69 | if (!libbpf_initialized) { |
82 | libbpf_set_print(libbpf_warning, | 70 | libbpf_set_print(libbpf_perf_print); |
83 | libbpf_info, | ||
84 | libbpf_debug); | ||
85 | libbpf_initialized = true; | 71 | libbpf_initialized = true; |
86 | } | 72 | } |
87 | 73 | ||