OPT_CLOCK_FORCE_CORRELATE,
OPT_STREAM_INTERSECTION,
OPT_DEBUG_INFO_DIR,
+ OPT_DEBUG_INFO_FULL_PATH,
};
/*
{ "stream-intersection", 0, POPT_ARG_NONE, NULL, OPT_STREAM_INTERSECTION, NULL, NULL },
#ifdef ENABLE_DEBUGINFO
{ "debug-info-dir", 0, POPT_ARG_STRING, NULL, OPT_DEBUG_INFO_DIR, NULL, NULL },
+ { "debug-info-full-path", 0, POPT_ARG_NONE, NULL, OPT_DEBUG_INFO_FULL_PATH, NULL, NULL },
#endif
{ NULL, 0, 0, NULL, 0, NULL, NULL },
};
#ifdef ENABLE_DEBUGINFO
fprintf(fp, " --debug-info-dir Directory in which to look for debugging information\n");
fprintf(fp, " files. (default: /usr/lib/debug/)\n");
+ fprintf(fp, " --debug-info-full-path Show full debug info source and binary paths (if available)\n");
#endif
list_formats(fp);
fprintf(fp, "\n");
goto end;
}
break;
+ case OPT_DEBUG_INFO_FULL_PATH:
+ opt_debug_info_full_path = 1;
+ break;
default:
ret = -EINVAL;
goto end;
opt_loglevel_field,
opt_emf_field,
opt_callsite_field,
- opt_delta_field = 1;
+ opt_delta_field = 1,
+ opt_debug_info_full_path;
enum field_item {
ITEM_SCOPE,
opt_clock_seconds,
opt_clock_date,
opt_clock_gmt,
- opt_clock_force_correlate;
+ opt_clock_force_correlate,
+ opt_debug_info_full_path;
extern int64_t opt_clock_offset;
extern int64_t opt_clock_offset_ns;
char *func;
uint64_t line_no;
char *filename;
+ /* short_filename points inside filename, no need to free. */
+ const char *short_filename;
};
BT_HIDDEN
fprintf(pos->fp, ", ");
}
- fprintf(pos->fp, "source_loc = \"%s:%" PRIu64
+ fprintf(pos->fp, "src = \"%s:%" PRIu64
"\"",
- debug_info_src->filename,
+ opt_debug_info_full_path ?
+ debug_info_src->filename :
+ debug_info_src->short_filename,
debug_info_src->line_no);
}
* 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 {
/*
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)
if (src_loc->filename) {
debug_info_src->filename = strdup(src_loc->filename);
-
if (!debug_info_src->filename) {
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);
+
}
source_location_destroy(src_loc);