Use is_pic field instead of reading ELF header

[babeltrace.git] / lib / debuginfo.c

diff --git a/lib/debuginfo.c b/lib/debuginfo.c
index a2b94e2f34b6472d1449f3a032c910046aae4865..2b59ff93c006d49e3cf31d709d5f697ce21287dc 100644 (file)
--- a/lib/debuginfo.c
+++ b/lib/debuginfo.c
@@ -129,8 +129,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);
@@ -549,12 +548,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 *is_pic_def = NULL;
        struct bt_definition *vpid_def = NULL;
        struct bt_definition *event_fields_def = NULL;
        struct bt_definition *sec_def = NULL;
@@ -564,6 +564,7 @@ void handle_statedump_soinfo_event(struct debug_info *debug_info,
        int64_t vpid;
        const char *sopath;
        gpointer key = NULL;
+       bool is_pic;
 
        event_fields_def = (struct bt_definition *) event_def->event_fields;
        sec_def = (struct bt_definition *)
@@ -588,6 +589,25 @@ void handle_statedump_soinfo_event(struct debug_info *debug_info,
                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;
@@ -642,7 +662,7 @@ void handle_statedump_soinfo_event(struct debug_info *debug_info,
                goto end;
        }
 
-       so = so_info_create(sopath, baddr, memsz);
+       so = so_info_create(sopath, baddr, memsz, is_pic);
        if (!so) {
                goto end;
        }
@@ -657,6 +677,21 @@ end:
        return;
 }
 
+static inline
+void handle_soinfo_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)
@@ -742,10 +777,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_soinfo) {
+               /* State dump */
+               handle_soinfo_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);