libbpf-tools: Add verbose option to bindsnoop

Support verbose mode and set custom libbpf print callback
in bindsnoop.

Signed-off-by: Hengqi Chen <chenhengqi@outlook.com>

diff --git a/libbpf-tools/bindsnoop.c b/libbpf-tools/bindsnoop.c
index 827bff39808319dc36f847f9f64542c0965cdc0a..5d87d484497f345c533de18c6c4372a9029bf96f 100644 (file)
--- a/libbpf-tools/bindsnoop.c
+++ b/libbpf-tools/bindsnoop.c
@@ -30,6 +30,7 @@ static bool emit_timestamp = false;
 static pid_t target_pid = 0;
 static bool ignore_errors = true;
 static char *target_ports = NULL;
+static bool verbose = false;
 
 const char *argp_program_version = "bindsnoop 0.1";
 const char *argp_program_bug_address =
@@ -58,6 +59,7 @@ static const struct argp_option opts[] = {
        { "failed", 'x', NULL, 0, "Include errors on output." },
        { "pid", 'p', "PID", 0, "Process ID to trace" },
        { "ports", 'P', "PORTS", 0, "Comma-separated list of ports to trace." },
+       { "verbose", 'v', NULL, 0, "Verbose debug output" },
        { NULL, 'h', NULL, OPTION_HIDDEN, "Show the full help" },
        {},
 };
@@ -99,6 +101,9 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        case 't':
                emit_timestamp = true;
                break;
+       case 'v':
+               verbose = true;
+               break;
        case 'h':
                argp_state_help(state, stderr, ARGP_HELP_STD_HELP);
                break;
@@ -108,6 +113,13 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
+{
+       if (level == LIBBPF_DEBUG && !verbose)
+               return 0;
+       return vfprintf(stderr, format, args);
+}
+
 static void sig_int(int signo)
 {
        exiting = 1;
@@ -173,6 +185,7 @@ int main(int argc, char **argv)
                return err;
 
        libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
+       libbpf_set_print(libbpf_print_fn);
 
        obj = bindsnoop_bpf__open();
        if (!obj) {