projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: make short_src_path from src_path
[babeltrace.git]
/
lib
/
debuginfo.c
diff --git
a/lib/debuginfo.c
b/lib/debuginfo.c
index 298bd54378fc76458601adda5160b78d1f984d7e..21afcb5247d907a2e4373b8c4423782d78ff6b4c 100644
(file)
--- 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) 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
*
* 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,25
+31,27
@@
#include <babeltrace/ctf-ir/metadata.h>
#include <babeltrace/debuginfo.h>
#include <babeltrace/so-info.h>
#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 {
/*
struct proc_debug_info_sources {
/*
- * Hash table: base address to so info; owned by
+ * Hash table: base address
(pointer to uint64_t)
to so info; owned by
* proc_debug_info_sources.
*/
GHashTable *baddr_to_so_info;
/*
* proc_debug_info_sources.
*/
GHashTable *baddr_to_so_info;
/*
- * Hash table: IP
to (struct debug_info_source *); owned by
- * proc_debug_info_sources.
+ * Hash table: IP
(pointer to uint64_t) to (struct debug_info_source *);
+ *
owned by
proc_debug_info_sources.
*/
GHashTable *ip_to_debug_info_src;
};
struct debug_info {
/*
*/
GHashTable *ip_to_debug_info_src;
};
struct debug_info {
/*
- * Hash table of VPIDs (
int64_t) to (struct ctf_proc_debug_infos*);
- * owned by debug_info.
+ * Hash table of VPIDs (
pointer to int64_t) to
+ *
(struct ctf_proc_debug_infos*);
owned by debug_info.
*/
GHashTable *vpid_to_proc_dbg_info_src;
GQuark q_statedump_soinfo;
*/
GHashTable *vpid_to_proc_dbg_info_src;
GQuark q_statedump_soinfo;
@@
-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->func);
- free(debug_info_src->filename);
+ free(debug_info_src->src_path);
+ free(debug_info_src->bin_path);
g_free(debug_info_src);
}
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 */
}
/* 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) {
}
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;
}
goto error;
}
+
+ debug_info_src->short_src_path = get_filename_from_path(
+ debug_info_src->src_path);
}
source_location_destroy(src_loc);
}
}
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;
end:
return debug_info_src;
@@
-169,13
+183,14
@@
struct proc_debug_info_sources *proc_debug_info_sources_create(void)
}
proc_dbg_info_src->baddr_to_so_info = g_hash_table_new_full(
}
proc_dbg_info_src->baddr_to_so_info = g_hash_table_new_full(
- NULL, NULL, NULL, (GDestroyNotify) so_info_destroy);
+ g_int64_hash, g_int64_equal, (GDestroyNotify) g_free,
+ (GDestroyNotify) so_info_destroy);
if (!proc_dbg_info_src->baddr_to_so_info) {
goto error;
}
proc_dbg_info_src->ip_to_debug_info_src = g_hash_table_new_full(
if (!proc_dbg_info_src->baddr_to_so_info) {
goto error;
}
proc_dbg_info_src->ip_to_debug_info_src = g_hash_table_new_full(
-
NULL, NULL, NULL
,
+
g_int64_hash, g_int64_equal, (GDestroyNotify) g_free
,
(GDestroyNotify) debug_info_source_destroy);
if (!proc_dbg_info_src->ip_to_debug_info_src) {
goto error;
(GDestroyNotify) debug_info_source_destroy);
if (!proc_dbg_info_src->ip_to_debug_info_src) {
goto error;
@@
-193,9
+208,15
@@
static
struct proc_debug_info_sources *proc_debug_info_sources_ht_get_entry(
GHashTable *ht, int64_t vpid)
{
struct proc_debug_info_sources *proc_debug_info_sources_ht_get_entry(
GHashTable *ht, int64_t vpid)
{
- gpointer key =
(gpointer) vpid
;
+ gpointer key =
g_new0(int64_t, 1)
;
struct proc_debug_info_sources *proc_dbg_info_src = NULL;
struct proc_debug_info_sources *proc_dbg_info_src = NULL;
+ if (!key) {
+ goto end;
+ }
+
+ *((int64_t *) key) = vpid;
+
/* Exists? Return it */
proc_dbg_info_src = g_hash_table_lookup(ht, key);
if (proc_dbg_info_src) {
/* Exists? Return it */
proc_dbg_info_src = g_hash_table_lookup(ht, key);
if (proc_dbg_info_src) {
@@
-209,7
+230,10
@@
struct proc_debug_info_sources *proc_debug_info_sources_ht_get_entry(
}
g_hash_table_insert(ht, key, proc_dbg_info_src);
}
g_hash_table_insert(ht, key, proc_dbg_info_src);
+ /* Ownership passed to ht */
+ key = NULL;
end:
end:
+ g_free(key);
return proc_dbg_info_src;
}
return proc_dbg_info_src;
}
@@
-218,14
+242,20
@@
struct debug_info_source *proc_debug_info_sources_get_entry(
struct proc_debug_info_sources *proc_dbg_info_src, uint64_t ip)
{
struct debug_info_source *debug_info_src = NULL;
struct proc_debug_info_sources *proc_dbg_info_src, uint64_t ip)
{
struct debug_info_source *debug_info_src = NULL;
- g
int64 key = (gint64) ip
;
+ g
pointer key = g_new0(uint64_t, 1)
;
GHashTableIter iter;
gpointer baddr, value;
GHashTableIter iter;
gpointer baddr, value;
+ if (!key) {
+ goto end;
+ }
+
+ *((uint64_t *) key) = ip;
+
/* Look in IP to debug infos hash table first. */
debug_info_src = g_hash_table_lookup(
proc_dbg_info_src->ip_to_debug_info_src,
/* Look in IP to debug infos hash table first. */
debug_info_src = g_hash_table_lookup(
proc_dbg_info_src->ip_to_debug_info_src,
-
(gpointer)
key);
+ key);
if (debug_info_src) {
goto end;
}
if (debug_info_src) {
goto end;
}
@@
-241,17
+271,26
@@
struct debug_info_source *proc_debug_info_sources_get_entry(
continue;
}
continue;
}
- /* Found; add it to cache. */
+ /*
+ * Found; add it to cache.
+ *
+ * FIXME: this should be bounded in size (and implement
+ * a caching policy), and entries should be prunned when
+ * libraries are unmapped.
+ */
debug_info_src = debug_info_source_create_from_so(so, ip);
if (debug_info_src) {
g_hash_table_insert(
proc_dbg_info_src->ip_to_debug_info_src,
debug_info_src = debug_info_source_create_from_so(so, ip);
if (debug_info_src) {
g_hash_table_insert(
proc_dbg_info_src->ip_to_debug_info_src,
- (gpointer) key, debug_info_src);
+ key, debug_info_src);
+ /* Ownership passed to ht. */
+ key = NULL;
}
break;
}
end:
}
break;
}
end:
+ free(key);
return debug_info_src;
}
return debug_info_src;
}
@@
-289,8
+328,8
@@
struct debug_info *debug_info_create(void)
goto end;
}
goto end;
}
- debug_info->vpid_to_proc_dbg_info_src = g_hash_table_new_full(
NULL,
-
NULL, NULL
,
+ debug_info->vpid_to_proc_dbg_info_src = g_hash_table_new_full(
+
g_int64_hash, g_int64_equal, (GDestroyNotify) g_free
,
(GDestroyNotify) proc_debug_info_sources_destroy);
if (!debug_info->vpid_to_proc_dbg_info_src) {
goto error;
(GDestroyNotify) proc_debug_info_sources_destroy);
if (!debug_info->vpid_to_proc_dbg_info_src) {
goto error;
@@
-523,6
+562,7
@@
void handle_statedump_soinfo_event(struct debug_info *debug_info,
uint64_t baddr, memsz;
int64_t vpid;
const char *sopath;
uint64_t baddr, memsz;
int64_t vpid;
const char *sopath;
+ gpointer key = NULL;
event_fields_def = (struct bt_definition *) event_def->event_fields;
sec_def = (struct bt_definition *)
event_fields_def = (struct bt_definition *) event_def->event_fields;
sec_def = (struct bt_definition *)
@@
-588,8
+628,15
@@
void handle_statedump_soinfo_event(struct debug_info *debug_info,
goto end;
}
goto end;
}
+ key = g_new0(uint64_t, 1);
+ if (!key) {
+ goto end;
+ }
+
+ *((uint64_t *) key) = baddr;
+
so = g_hash_table_lookup(proc_dbg_info_src->baddr_to_so_info,
so = g_hash_table_lookup(proc_dbg_info_src->baddr_to_so_info,
-
(gpointer) baddr
);
+
key
);
if (so) {
goto end;
}
if (so) {
goto end;
}
@@
-600,9
+647,12
@@
void handle_statedump_soinfo_event(struct debug_info *debug_info,
}
g_hash_table_insert(proc_dbg_info_src->baddr_to_so_info,
}
g_hash_table_insert(proc_dbg_info_src->baddr_to_so_info,
- (gpointer) baddr, so);
+ key, so);
+ /* Ownership passed to ht. */
+ key = NULL;
end:
end:
+ g_free(key);
return;
}
return;
}
This page took
0.028369 seconds
and
4
git commands to generate.