Rewrite system_calls.exp

[platform/upstream/ltrace.git] / proc.c

diff --git a/proc.c b/proc.c
index 09e6d9b..6f4f64e 100644 (file)
--- a/proc.c
+++ b/proc.c
@@ -106,6 +106,11 @@ destroy_unwind(struct process *proc)
        if (proc->unwind_as != NULL)
                unw_destroy_addr_space(proc->unwind_as);
 #endif /* defined(HAVE_LIBUNWIND) */
+
+#if defined(HAVE_LIBDW)
+       if (proc->dwfl != NULL)
+               dwfl_end(proc->dwfl);
+#endif /* defined(HAVE_LIBDW) */
 }
 
 static int
@@ -167,6 +172,10 @@ process_bare_init(struct process *proc, const char *filename,
        }
 #endif /* defined(HAVE_LIBUNWIND) */
 
+#if defined(HAVE_LIBDW)
+       proc->dwfl = NULL; /* Initialize for leader only on first library.  */
+#endif /* defined(HAVE_LIBDW) */
+
        return 0;
 }
 
@@ -880,6 +889,59 @@ proc_add_library(struct process *proc, struct library *lib)
        debug(DEBUG_PROCESS, "added library %s@%p (%s) to %d",
              lib->soname, lib->base, lib->pathname, proc->pid);
 
+#if defined(HAVE_LIBDW)
+       if (options.bt_depth > 0) {
+               /* Setup module tracking for libdwfl unwinding.  */
+               struct process *leader = proc->leader;
+               Dwfl *dwfl = leader->dwfl;
+               if (dwfl == NULL) {
+                       static const Dwfl_Callbacks proc_callbacks = {
+                               .find_elf = dwfl_linux_proc_find_elf,
+                               .find_debuginfo = dwfl_standard_find_debuginfo
+                       };
+                       dwfl = dwfl_begin(&proc_callbacks);
+                       if (dwfl == NULL)
+                               fprintf(stderr,
+                                       "Couldn't initialize libdwfl unwinding "
+                                       "for process %d: %s\n", leader->pid,
+                                       dwfl_errmsg (-1));
+               }
+
+               if (dwfl != NULL) {
+                       dwfl_report_begin_add(dwfl);
+                       if (dwfl_report_elf(dwfl, lib->soname,
+                                           lib->pathname, -1,
+                                           (GElf_Addr) lib->base,
+                                           false) == NULL)
+                               fprintf(stderr,
+                                       "dwfl_report_elf %s@%p (%s) %d: %s\n",
+                                       lib->soname, lib->base, lib->pathname,
+                                       proc->pid, dwfl_errmsg (-1));
+                       dwfl_report_end(dwfl, NULL, NULL);
+
+                       if (leader->dwfl == NULL) {
+                               int r = dwfl_linux_proc_attach(dwfl,
+                                                              leader->pid,
+                                                              true);
+                               if (r == 0)
+                                       leader->dwfl = dwfl;
+                               else {
+                                       const char *msg;
+                                       dwfl_end(dwfl);
+                                       if (r < 0)
+                                               msg = dwfl_errmsg(-1);
+                                       else
+                                               msg = strerror(r);
+                                       fprintf(stderr, "Couldn't initialize "
+                                               "libdwfl unwinding for "
+                                               "process %d: %s\n",
+                                               leader->pid, msg);
+                               }
+                       }
+               }
+       }
+#endif /* defined(HAVE_LIBDW) */
+
        /* Insert breakpoints for all active (non-latent) symbols.  */
        struct library_symbol *libsym = NULL;
        while ((libsym = library_each_symbol(lib, libsym,