* 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
#include <babeltrace/ctf-ir/metadata.h>
#include <babeltrace/debuginfo.h>
#include <babeltrace/so-info.h>
+#include <babeltrace/babeltrace-internal.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);
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;
}
+
+ debug_info_src->short_src_path = get_filename_from_path(
+ src_loc->filename);
+
}
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;