#include <babeltrace/debuginfo.h>
#include <babeltrace/so-info.h>
#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/utils.h>
struct proc_debug_info_sources {
/*
}
free(debug_info_src->func);
- free(debug_info_src->filename);
+ 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)
}
/* 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;
}
- /*
- * The short version of the filename does not include
- * the full path, it will only point to the last element
- * of the path (anything after the last '/').
- */
- debug_info_src->short_filename = get_filename_from_path(
- src_loc->filename);
-
+ 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);
+
+ ret = so_info_get_bin_loc(so, ip, &(debug_info_src->bin_loc));
+ if (ret) {
+ goto error;
+ }
+ }
+
end:
return debug_info_src;
}
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;
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 *)
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;
goto end;
}
- so = so_info_create(sopath, baddr, memsz);
+ so = so_info_create(sopath, baddr, memsz, is_pic);
if (!so) {
goto 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)
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);
projects / babeltrace.git / blobdiff