X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fdebuginfo.c;h=2b59ff93c006d49e3cf31d709d5f697ce21287dc;hp=4284f8e15d1d47e0d47029d355895983f0bf4371;hb=1a4a1345c93d716d50cf10e4717f4cc895e313c6;hpb=71235b6d1dbc98345dcfa0d01a4aadf66fc24b6e

diff --git a/lib/debuginfo.c b/lib/debuginfo.c
index 4284f8e1..2b59ff93 100644
--- a/lib/debuginfo.c
+++ b/lib/debuginfo.c
@@ -4,6 +4,7 @@
  * Copyright (c) 2015 EfficiOS Inc. and Linux Foundation
  * Copyright (c) 2015 Philippe Proulx <pproulx@efficios.com>
  * Copyright (c) 2015 Antoine Busque <abusque@efficios.com>
+ * Copyright (c) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +31,8 @@
 #include <babeltrace/ctf-ir/metadata.h>
 #include <babeltrace/debuginfo.h>
 #include <babeltrace/so-info.h>
+#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/utils.h>
 
 struct proc_debug_info_sources {
 	/*
@@ -82,7 +85,8 @@ void debug_info_source_destroy(struct debug_info_source *debug_info_src)
 	}
 
 	free(debug_info_src->func);
-	free(debug_info_src->filename);
+	free(debug_info_src->src_path);
+	free(debug_info_src->bin_path);
 	g_free(debug_info_src);
 }
 
@@ -107,30 +111,40 @@ struct debug_info_source *debug_info_source_create_from_so(struct so_info *so,
 	}
 
 	/* Can't retrieve src_loc from ELF only, skip it */
-	if (so->is_elf_only) {
-		goto end;
-	}
-
-	/* Lookup source location */
-	ret = so_info_lookup_source_location(so, ip, &src_loc);
-	if (ret) {
-		goto error;
+	if (!so->is_elf_only) {
+		/* Lookup source location */
+		ret = so_info_lookup_source_location(so, ip, &src_loc);
+		if (ret) {
+			goto error;
+		}
 	}
 
 	if (src_loc) {
 		debug_info_src->line_no = src_loc->line_no;
 
 		if (src_loc->filename) {
-			debug_info_src->filename = strdup(src_loc->filename);
-
-			if (!debug_info_src->filename) {
+			debug_info_src->src_path = strdup(src_loc->filename);
+			if (!debug_info_src->src_path) {
 				goto error;
 			}
+
+			debug_info_src->short_src_path = get_filename_from_path(
+					debug_info_src->src_path);
 		}
 
 		source_location_destroy(src_loc);
 	}
 
+	if (so->elf_path) {
+		debug_info_src->bin_path = strdup(so->elf_path);
+		if (!debug_info_src->bin_path) {
+			goto error;
+		}
+
+		debug_info_src->short_bin_path = get_filename_from_path(
+				debug_info_src->bin_path);
+	}
+
 end:
 	return debug_info_src;
 
@@ -534,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;
@@ -549,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 *)
@@ -573,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;
@@ -627,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;
 	}
@@ -642,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)
@@ -727,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);