lib: replace trace is_static with destruction listeners

[babeltrace.git] / plugins / lttng-utils / debug-info.h

diff --git a/plugins/lttng-utils/debug-info.h b/plugins/lttng-utils/debug-info.h
index 754a239bee3cf030a99a26ea42931a9b65fefecb..4b765d16ae30c4a72851c782e8be52ac72edb76e 100644 (file)
--- a/plugins/lttng-utils/debug-info.h
+++ b/plugins/lttng-utils/debug-info.h
@@ -32,10 +32,20 @@
 #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
-        * stream_begin notification for it.
+        * stream_begin message for it.
         */
        DEBUG_INFO_UNKNOWN_STREAM,
        /* We know this stream is active (between stream_begin and _end). */
@@ -54,18 +64,18 @@ struct debug_info_component {
 
 struct debug_info_iterator {
        struct debug_info_component *debug_info_component;
-       /* Map between struct bt_trace and struct bt_writer. */
+       /* Map between bt_trace and struct bt_writer. */
        GHashTable *trace_map;
        /* Input iterators associated with this output iterator. */
        GPtrArray *input_iterator_group;
-       struct bt_notification *current_notification;
-       struct bt_notification_iterator *input_iterator;
+       const bt_message *current_message;
+       bt_message_iterator *input_iterator;
        FILE *err;
 };
 
 struct debug_info_trace {
-       struct bt_trace *trace;
-       struct bt_trace *writer_trace;
+       const bt_trace *trace;
+       const 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_event *event,
+void debug_info_handle_event(FILE *err, const bt_event *event,
                struct debug_info *debug_info);
 
 BT_HIDDEN