From: Wang Nan <wangnan0@huawei.com>
To: <acme@kernel.org>, <ast@plumgrid.com>,
<brendan.d.gregg@gmail.com>, <daniel@iogearbox.net>,
<namhyung@kernel.org>, <masami.hiramatsu.pt@hitachi.com>,
<paulus@samba.org>, <a.p.zijlstra@chello.nl>, <mingo@redhat.com>,
<jolsa@kernel.org>, <dsahern@gmail.com>
Cc: <linux-kernel@vger.kernel.org>, <lizefan@huawei.com>,
<hekuang@huawei.com>, <xiakaixu@huawei.com>, <pi3orama@163.com>
Subject: [RFC PATCH v7 03/37] bpf tools: Allow caller to set printing function
Date: Fri, 12 Jun 2015 05:35:11 +0000 [thread overview]
Message-ID: <1434087345-127225-4-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1434087345-127225-1-git-send-email-wangnan0@huawei.com>
By libbpf_set_print(), users of libbpf are allowed to register he/she
own debug, info and warning printing functions. Libbpf will use those
functions to print messages. If not provided, default info and warning
printing functions are fprintf(stderr, ...); default debug printing
is NULL.
This API is designed to be used by perf, enables it to register its own
logging functions to make all logs uniform, instead of separated
logging level control.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
---
tools/lib/bpf/libbpf.c | 40 ++++++++++++++++++++++++++++++++++++++++
tools/lib/bpf/libbpf.h | 12 ++++++++++++
2 files changed, 52 insertions(+)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index c08d6bc..ded37a0 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -7,8 +7,48 @@
*/
#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
#include <unistd.h>
#include <asm/unistd.h>
#include <linux/bpf.h>
#include "libbpf.h"
+
+#define __printf(a, b) __attribute__((format(printf, a, b)))
+
+__printf(1, 2)
+static int __base_pr(const char *format, ...)
+{
+ va_list args;
+ int err;
+
+ va_start(args, format);
+ err = vfprintf(stderr, format, args);
+ va_end(args);
+ return err;
+}
+
+static __printf(1, 2) libbpf_print_fn_t __pr_warning = __base_pr;
+static __printf(1, 2) libbpf_print_fn_t __pr_info = __base_pr;
+static __printf(1, 2) libbpf_print_fn_t __pr_debug = NULL;
+
+#define __pr(func, fmt, ...) \
+do { \
+ if ((func)) \
+ (func)("libbpf: " fmt, ##__VA_ARGS__); \
+} while(0)
+
+#define pr_warning(fmt, ...) __pr(__pr_warning, fmt, ##__VA_ARGS__)
+#define pr_info(fmt, ...) __pr(__pr_info, fmt, ##__VA_ARGS__)
+#define pr_debug(fmt, ...) __pr(__pr_debug, fmt, ##__VA_ARGS__)
+
+void libbpf_set_print(libbpf_print_fn_t warn,
+ libbpf_print_fn_t info,
+ libbpf_print_fn_t debug)
+{
+ __pr_warning = warn;
+ __pr_info = info;
+ __pr_debug = debug;
+}
diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
index a6f46d9..8d1eeba 100644
--- a/tools/lib/bpf/libbpf.h
+++ b/tools/lib/bpf/libbpf.h
@@ -8,4 +8,16 @@
#ifndef __BPF_LIBBPF_H
#define __BPF_LIBBPF_H
+/*
+ * In include/linux/compiler-gcc.h, __printf is defined. However
+ * it should be better if libbpf.h doesn't depend on Linux header file.
+ * So instead of __printf, here we use gcc attribute directly.
+ */
+typedef int (*libbpf_print_fn_t)(const char *, ...)
+ __attribute__((format(printf, 1, 2)));
+
+void libbpf_set_print(libbpf_print_fn_t warn,
+ libbpf_print_fn_t info,
+ libbpf_print_fn_t debug);
+
#endif
--
1.8.3.4
next prev parent reply other threads:[~2015-06-12 5:36 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-12 5:35 [RFC PATCH v7 00/37] perf tools: filtering events using eBPF programs Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 01/37] tools build: Add feature check for eBPF API Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 02/37] bpf tools: Introduce 'bpf' library to tools Wang Nan
2015-06-12 5:35 ` Wang Nan [this message]
2015-06-12 5:35 ` [RFC PATCH v7 04/37] bpf tools: Open eBPF object file and do basic validation Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 05/37] bpf tools: Read eBPF object from buffer Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 06/37] bpf tools: Check endianess and make libbpf fail early Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 07/37] bpf tools: Iterate over ELF sections to collect information Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 08/37] bpf tools: Collect version and license from ELF sections Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 09/37] bpf tools: Collect map definitions from 'maps' section Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 10/37] bpf tools: Collect symbol table from SHT_SYMTAB section Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 11/37] bpf tools: Collect eBPF programs from their own sections Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 12/37] bpf tools: Collect relocation sections from SHT_REL sections Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 13/37] bpf tools: Record map accessing instructions for each program Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 14/37] bpf tools: Add bpf.c/h for common bpf operations Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 15/37] bpf tools: Create eBPF maps defined in an object file Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 16/37] bpf tools: Relocate eBPF programs Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 17/37] bpf tools: Introduce bpf_load_program() to bpf.c Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 18/37] bpf tools: Load eBPF programs in object files into kernel Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 19/37] bpf tools: Introduce accessors for struct bpf_program Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 20/37] bpf tools: Introduce accessors for struct bpf_object Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 21/37] bpf tools: Link all bpf objects onto a list Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 22/37] perf tools: Make perf depend on libbpf Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 23/37] perf tools: Introduce llvm config options Wang Nan
2015-06-13 2:31 ` Alexei Starovoitov
2015-06-13 2:52 ` pi3orama
2015-06-13 3:03 ` Alexei Starovoitov
2015-06-13 3:31 ` pi3orama
2015-06-13 4:11 ` pi3orama
2015-06-13 4:43 ` Alexei Starovoitov
2015-06-12 5:35 ` [RFC PATCH v7 24/37] perf tools: Call clang to compile C source to object code Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 25/37] perf tests: Add LLVM test for eBPF on-the-fly compiling Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 26/37] perf tools: Auto detecting kernel build directory Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 27/37] perf tools: Auto detecting kernel include options Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 28/37] perf record: Enable passing bpf object file to --event Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 29/37] perf record: Compile scriptlets if pass '.c' " Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 30/37] perf tools: Parse probe points of eBPF programs during preparation Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 31/37] perf probe: Attach trace_probe_event with perf_probe_event Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 32/37] perf record: Probe at kprobe points Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 33/37] perf record: Load all eBPF object into kernel Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 34/37] perf tools: Add bpf_fd field to evsel and config it Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 35/37] perf tools: Attach eBPF program to perf event Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 36/37] perf tools: Suppress probing messages when probing by BPF loading Wang Nan
2015-06-12 5:35 ` [RFC PATCH v7 37/37] perf record: Add clang options for compiling BPF scripts Wang Nan
2015-06-12 6:08 ` Wangnan (F)
2015-06-12 6:29 ` [RFC PATCH v7 37/37 -fix] " Wang Nan
2015-06-12 16:58 ` [RFC PATCH v7 00/37] perf tools: filtering events using eBPF programs Alexei Starovoitov
2015-06-16 5:22 ` Wangnan (F)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1434087345-127225-4-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=ast@plumgrid.com \
--cc=brendan.d.gregg@gmail.com \
--cc=daniel@iogearbox.net \
--cc=dsahern@gmail.com \
--cc=hekuang@huawei.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=pi3orama@163.com \
--cc=xiakaixu@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®