Standardise spelling of debug info

[babeltrace.git] / include / babeltrace / ctf-ir / metadata.h

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 5e92984dba40906c59bb96c5e4455182bc13233e..07706bb1e005d62ff97a42265274817b0a63bbdb 100644 (file)
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -42,6 +42,17 @@ struct ctf_stream_declaration;
 struct ctf_event_declaration;
 struct ctf_clock;
 struct ctf_callsite;
+struct ctf_scanner;
+
+struct ctf_stream_packet_limits {
+       uint64_t begin;
+       uint64_t end;
+};
+
+struct ctf_stream_packet_timestamp {
+       struct ctf_stream_packet_limits cycles;
+       struct ctf_stream_packet_limits real;
+};
 
 struct ctf_stream_definition {
        struct ctf_stream_declaration *stream_class;
@@ -63,10 +74,10 @@ struct ctf_stream_definition {
 
        /* Event discarded information */
        uint64_t events_discarded;
-       uint64_t prev_real_timestamp;           /* Start-of-last-packet timestamp in ns */
-       uint64_t prev_real_timestamp_end;       /* End-of-last-packet timestamp in ns */
-       uint64_t prev_cycles_timestamp;         /* Start-of-last-packet timestamp in cycles */
-       uint64_t prev_cycles_timestamp_end;     /* End-of-last-packet timestamp in cycles */
+       /* Trace packets lost */
+       uint64_t packets_lost;
+       struct ctf_stream_packet_timestamp prev;
+       struct ctf_stream_packet_timestamp current;
        char path[PATH_MAX];                    /* Path to stream. '\0' for mmap traces */
 };
 
@@ -173,8 +184,13 @@ struct ctf_tracer_env {
        char sysname[TRACER_ENV_LEN];
        char release[TRACER_ENV_LEN];
        char version[TRACER_ENV_LEN];
+       char tracer_name[TRACER_ENV_LEN];
 };
 
+#ifdef ENABLE_DEBUG_INFO
+struct debug_info;
+#endif
+
 struct ctf_trace {
        struct bt_trace_descriptor parent;
 
@@ -192,6 +208,8 @@ struct ctf_trace {
        GPtrArray *event_declarations;          /* Array of all the struct bt_ctf_event_decl */
 
        struct declaration_struct *packet_header_decl;
+       struct ctf_scanner *scanner;
+       int restart_root_decl;
 
        uint64_t major;
        uint64_t minor;
@@ -211,6 +229,11 @@ struct ctf_trace {
        DIR *dir;
        int dirfd;
        int flags;              /* open flags */
+
+#ifdef ENABLE_DEBUG_INFO
+       /* Debug information for this trace */
+       struct debug_info *debug_info;
+#endif
 };
 
 #define CTF_STREAM_SET_FIELD(ctf_stream, field)                                \