Use printf_debug/verbose in so-info

[babeltrace.git] / lib / debuginfo.c

diff --git a/lib/debuginfo.c b/lib/debuginfo.c
index 7d12ebd27da0fa66d38294e9efd53c623896dc8b..40514f258d639b903a8cd6591a01f27c230e08b4 100644 (file)
--- a/lib/debuginfo.c
+++ b/lib/debuginfo.c
@@ -32,6 +32,7 @@
 #include <babeltrace/debuginfo.h>
 #include <babeltrace/so-info.h>
 #include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/utils.h>
 
 struct proc_debug_info_sources {
        /*
@@ -53,7 +54,7 @@ struct debug_info {
         * (struct ctf_proc_debug_infos*); owned by debug_info.
         */
        GHashTable *vpid_to_proc_dbg_info_src;
-       GQuark q_statedump_soinfo;
+       GQuark q_statedump_bin_info;
        GQuark q_statedump_debug_link;
        GQuark q_statedump_build_id;
        GQuark q_statedump_start;
@@ -63,8 +64,8 @@ struct debug_info {
 static
 int debug_info_init(struct debug_info *info)
 {
-       info->q_statedump_soinfo = g_quark_from_string(
-                       "lttng_ust_statedump:soinfo");
+       info->q_statedump_bin_info = g_quark_from_string(
+                       "lttng_ust_statedump:bin_info");
        info->q_statedump_debug_link = g_quark_from_string(
                        "lttng_ust_statedump:debug_link)");
        info->q_statedump_build_id = g_quark_from_string(
@@ -86,40 +87,10 @@ void debug_info_source_destroy(struct debug_info_source *debug_info_src)
        free(debug_info_src->func);
        free(debug_info_src->src_path);
        free(debug_info_src->bin_path);
+       free(debug_info_src->bin_loc);
        g_free(debug_info_src);
 }
 
-/*
- * Returns the location of a path's file (the last element of the path).
- * Returns the original path on error.
- */
-static
-const char *get_filename_from_path(const char *path)
-{
-       size_t i = strlen(path);
-
-       if (i == 0) {
-               goto end;
-       }
-
-       if (path[i - 1] == '/') {
-               /*
-                * Path ends with a trailing slash, no filename to return.
-                * Return the original path.
-                */
-               goto end;
-       }
-
-       while (i-- > 0) {
-               if (path[i] == '/') {
-                       path = &path[i + 1];
-                       goto end;
-               }
-       }
-end:
-       return path;
-}
-
 static
 struct debug_info_source *debug_info_source_create_from_so(struct so_info *so,
                uint64_t ip)
@@ -159,8 +130,7 @@ struct debug_info_source *debug_info_source_create_from_so(struct so_info *so,
                        }
 
                        debug_info_src->short_src_path = get_filename_from_path(
-                                       src_loc->filename);
-
+                                       debug_info_src->src_path);
                }
 
                source_location_destroy(src_loc);
@@ -174,6 +144,11 @@ struct debug_info_source *debug_info_source_create_from_so(struct so_info *so,
 
                debug_info_src->short_bin_path = get_filename_from_path(
                                debug_info_src->bin_path);
+
+               ret = so_info_get_bin_loc(so, ip, &(debug_info_src->bin_loc));
+               if (ret) {
+                       goto error;
+               }
        }
 
 end:
@@ -579,12 +554,13 @@ end:
 }
 
 static
-void handle_statedump_soinfo_event(struct debug_info *debug_info,
-               struct ctf_event_definition *event_def)
+void handle_bin_info_event(struct debug_info *debug_info,
+               struct ctf_event_definition *event_def, bool has_pic_field)
 {
        struct bt_definition *baddr_def = NULL;
        struct bt_definition *memsz_def = NULL;
-       struct bt_definition *sopath_def = NULL;
+       struct bt_definition *path_def = NULL;
+       struct bt_definition *is_pic_def = NULL;
        struct bt_definition *vpid_def = NULL;
        struct bt_definition *event_fields_def = NULL;
        struct bt_definition *sec_def = NULL;
@@ -592,8 +568,9 @@ void handle_statedump_soinfo_event(struct debug_info *debug_info,
        struct so_info *so;
        uint64_t baddr, memsz;
        int64_t vpid;
-       const char *sopath;
+       const char *path;
        gpointer key = NULL;
+       bool is_pic;
 
        event_fields_def = (struct bt_definition *) event_def->event_fields;
        sec_def = (struct bt_definition *)
@@ -613,11 +590,30 @@ void handle_statedump_soinfo_event(struct debug_info *debug_info,
                goto end;
        }
 
-       sopath_def = bt_lookup_definition(event_fields_def, "_sopath");
-       if (!sopath_def) {
+       path_def = bt_lookup_definition(event_fields_def, "_path");
+       if (!path_def) {
                goto end;
        }
 
+       if (has_pic_field) {
+               is_pic_def = bt_lookup_definition(event_fields_def, "_is_pic");
+               if (!is_pic_def) {
+                       goto end;
+               }
+
+               if (is_pic_def->declaration->id != CTF_TYPE_INTEGER) {
+                       goto end;
+               }
+
+               is_pic = (bt_get_unsigned_int(is_pic_def) == 1);
+       } else {
+               /*
+                * dlopen has no is_pic field, because the shared
+                * object is always PIC.
+                */
+               is_pic = true;
+       }
+
        vpid_def = bt_lookup_definition(sec_def, "_vpid");
        if (!vpid_def) {
                goto end;
@@ -631,7 +627,7 @@ void handle_statedump_soinfo_event(struct debug_info *debug_info,
                goto end;
        }
 
-       if (sopath_def->declaration->id != CTF_TYPE_STRING) {
+       if (path_def->declaration->id != CTF_TYPE_STRING) {
                goto end;
        }
 
@@ -641,10 +637,10 @@ void handle_statedump_soinfo_event(struct debug_info *debug_info,
 
        baddr = bt_get_unsigned_int(baddr_def);
        memsz = bt_get_unsigned_int(memsz_def);
-       sopath = bt_get_string(sopath_def);
+       path = bt_get_string(path_def);
        vpid = bt_get_signed_int(vpid_def);
 
-       if (!sopath) {
+       if (!path) {
                goto end;
        }
 
@@ -672,7 +668,7 @@ void handle_statedump_soinfo_event(struct debug_info *debug_info,
                goto end;
        }
 
-       so = so_info_create(sopath, baddr, memsz);
+       so = so_info_create(path, baddr, memsz, is_pic);
        if (!so) {
                goto end;
        }
@@ -687,6 +683,21 @@ end:
        return;
 }
 
+static inline
+void handle_statedump_bin_info_event(struct debug_info *debug_info,
+               struct ctf_event_definition *event_def)
+{
+       handle_bin_info_event(debug_info, event_def, true);
+}
+
+static inline
+void handle_dlopen_event(struct debug_info *debug_info,
+               struct ctf_event_definition *event_def)
+{
+       handle_bin_info_event(debug_info, event_def, false);
+}
+
+
 static
 void handle_statedump_start(struct debug_info *debug_info,
                struct ctf_event_definition *event_def)
@@ -772,10 +783,11 @@ void debug_info_handle_event(struct debug_info *debug_info,
        event_class = g_ptr_array_index(stream_class->events_by_id,
                        event->stream->event_id);
 
-       if (event_class->name == debug_info->q_statedump_soinfo ||
-                       event_class->name == debug_info->q_dl_open) {
-               /* State dump/dlopen() */
-               handle_statedump_soinfo_event(debug_info, event);
+       if (event_class->name == debug_info->q_statedump_bin_info) {
+               /* State dump */
+               handle_statedump_bin_info_event(debug_info, event);
+       } else if (event_class->name == debug_info->q_dl_open) {
+               handle_dlopen_event(debug_info, event);
        } else if (event_class->name == debug_info->q_statedump_start) {
                /* Start state dump */
                handle_statedump_start(debug_info, event);