X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fdebuginfo.c;h=7d4a0f95dd69f7eab6079e67330312a2601041de;hp=3d033b9a3b9073d9aaa589ff9bce80b77bd4205f;hb=dc419b6cc12d26c840d29440d5077f0a29221952;hpb=ed02dbd550e1e068ae06b1ec5969fe1c49aec357

diff --git a/lib/debuginfo.c b/lib/debuginfo.c
index 3d033b9a..7d4a0f95 100644
--- a/lib/debuginfo.c
+++ b/lib/debuginfo.c
@@ -87,6 +87,7 @@ 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);
 }
 
@@ -143,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:
@@ -548,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 *is_pic_def = NULL;
 	struct bt_definition *vpid_def = NULL;
 	struct bt_definition *event_fields_def = NULL;
 	struct bt_definition *sec_def = NULL;
@@ -563,6 +570,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 *)
@@ -587,6 +595,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;
@@ -641,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(sopath, baddr, memsz, is_pic);
 	if (!so) {
 		goto end;
 	}
@@ -656,6 +683,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)
@@ -741,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_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);