bpf: honor xlat styles when printing kernel version

[strace] / unwind-libdw.c

diff --git a/unwind-libdw.c b/unwind-libdw.c
index b20ba20445ff637f7cafb2e4b8fe909c45309e88..603914650fac0aa6d089015283254d116fa71681 100644 (file)
--- a/unwind-libdw.c
+++ b/unwind-libdw.c
@@ -36,13 +36,28 @@
 
 #include "defs.h"
 #include "unwind.h"
-#include "mmap_cache.h"
+#include "mmap_notify.h"
 #include <elfutils/libdwfl.h>
 
 struct ctx {
        Dwfl *dwfl;
+       unsigned int last_proc_updating;
 };
 
+static unsigned int mapping_generation;
+
+static void
+update_mapping_generation(struct tcb *tcp, void *unused)
+{
+       mapping_generation++;
+}
+
+static void
+init(void)
+{
+       mmap_notify_register_client(update_mapping_generation, NULL);
+}
+
 static void *
 tcb_init(struct tcb *tcp)
 {
@@ -74,6 +89,7 @@ tcb_init(struct tcb *tcp)
 
        struct ctx *ctx = xmalloc(sizeof(*ctx));
        ctx->dwfl = dwfl;
+       ctx->last_proc_updating = 0;
        return ctx;
 }
 
@@ -87,6 +103,31 @@ tcb_fin(struct tcb *tcp)
        }
 }
 
+static void
+flush_cache_maybe(struct tcb *tcp)
+{
+       struct ctx *ctx = tcp->unwind_ctx;
+       if (!ctx)
+               return;
+
+       if (ctx->last_proc_updating == mapping_generation)
+               return;
+
+       int r = dwfl_linux_proc_report(ctx->dwfl, tcp->pid);
+
+       if (r < 0)
+               error_msg("dwfl_linux_proc_report returned an error"
+                         " for pid %d: %s", tcp->pid, dwfl_errmsg(-1));
+       else if (r > 0)
+               error_msg("dwfl_linux_proc_report returned an error"
+                         " for pid %d", tcp->pid);
+       else if (dwfl_report_end(ctx->dwfl, NULL, NULL) != 0)
+               error_msg("dwfl_report_end returned an error"
+                         " for pid %d: %s", tcp->pid, dwfl_errmsg(-1));
+
+       ctx->last_proc_updating = mapping_generation;
+}
+
 struct frame_user_data {
        unwind_call_action_fn call_action;
        unwind_error_action_fn error_action;
@@ -150,6 +191,9 @@ tcb_walk(struct tcb *tcp,
                .data = data,
                .stack_depth = 256,
        };
+
+       flush_cache_maybe(tcp);
+
        int r = dwfl_getthread_frames(ctx->dwfl, tcp->pid, frame_callback,
                                      &user_data);
        if (r)
@@ -158,31 +202,10 @@ tcb_walk(struct tcb *tcp,
                             0);
 }
 
-static void
-tcb_flush_cache(struct tcb *tcp)
-{
-       struct ctx *ctx = tcp->unwind_ctx;
-       if (!ctx)
-               return;
-
-       int r = dwfl_linux_proc_report(ctx->dwfl, tcp->pid);
-
-       if (r < 0)
-               error_msg("dwfl_linux_proc_report returned an error"
-                         " for pid %d: %s", tcp->pid, dwfl_errmsg(-1));
-       else if (r > 0)
-               error_msg("dwfl_linux_proc_report returned an error"
-                         " for pid %d", tcp->pid);
-       else if (dwfl_report_end(ctx->dwfl, NULL, NULL) != 0)
-               error_msg("dwfl_report_end returned an error"
-                         " for pid %d: %s", tcp->pid, dwfl_errmsg(-1));
-}
-
 const struct unwind_unwinder_t unwinder = {
        .name = "libdw",
-       .init = NULL,
+       .init = init,
        .tcb_init = tcb_init,
        .tcb_fin = tcb_fin,
        .tcb_walk = tcb_walk,
-       .tcb_flush_cache = tcb_flush_cache,
 };