X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Flttng-utils%2Fdebug-info.h;h=56f9bc1e8c101cdea6ea95edfab0d3039d5336d9;hb=40f4ba76dd6f9508ca51b6220eaed57632281a07;hp=f1b6df2d59f44938ddde840f6b630b5b9a87313b;hpb=9d408fcae74602e3591f66623ceb85f482d948ed;p=babeltrace.git

diff --git a/plugins/lttng-utils/debug-info.h b/plugins/lttng-utils/debug-info.h
index f1b6df2d..56f9bc1e 100644
--- a/plugins/lttng-utils/debug-info.h
+++ b/plugins/lttng-utils/debug-info.h
@@ -32,6 +32,16 @@
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/babeltrace.h>
 
+#define VPID_FIELD_NAME		"vpid"
+#define IP_FIELD_NAME		"ip"
+#define BADDR_FIELD_NAME	"baddr"
+#define CRC32_FIELD_NAME	"crc32"
+#define BUILD_ID_FIELD_NAME	"build_id"
+#define FILENAME_FIELD_NAME	"filename"
+#define IS_PIC_FIELD_NAME	"is_pic"
+#define MEMSZ_FIELD_NAME	"memsz"
+#define PATH_FIELD_NAME		"path"
+
 enum debug_info_stream_state {
 	/*
 	 * We know the stream exists but we have never received a
@@ -54,7 +64,7 @@ struct debug_info_component {
 
 struct debug_info_iterator {
 	struct debug_info_component *debug_info_component;
-	/* Map between struct bt_ctf_trace and struct bt_ctf_writer. */
+	/* Map between struct bt_trace and struct bt_writer. */
 	GHashTable *trace_map;
 	/* Input iterators associated with this output iterator. */
 	GPtrArray *input_iterator_group;
@@ -64,8 +74,8 @@ struct debug_info_iterator {
 };
 
 struct debug_info_trace {
-	struct bt_ctf_trace *trace;
-	struct bt_ctf_trace *writer_trace;
+	const struct bt_trace *trace;
+	const struct bt_trace *writer_trace;
 	struct debug_info_component *debug_info_component;
 	struct debug_info_iterator *debug_it;
 	int static_listener_id;
@@ -110,7 +120,7 @@ struct debug_info_source *debug_info_query(struct debug_info *debug_info,
 		int64_t vpid, uint64_t ip);
 
 BT_HIDDEN
-void debug_info_handle_event(FILE *err, struct bt_ctf_event *event,
+void debug_info_handle_event(FILE *err, const struct bt_event *event,
 		struct debug_info *debug_info);
 
 BT_HIDDEN