Handle negative time and offset from Epoch

[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 3d684fb661db86759b0080328bfe18597c5c660b..187cfdbcf9e3359f9f6ec330fe3bf8121520eb10 100644 (file)
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -33,7 +33,7 @@
 #include <babeltrace/ctf/types.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <babeltrace/uuid.h>
+#include <babeltrace/compat/uuid.h>
 #include <assert.h>
 #include <glib.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 */
 };
 
@@ -100,10 +111,14 @@ struct ctf_clock {
        /*
         * The offset from Epoch is: offset_s + (offset * (1/freq))
         * Coarse clock offset from Epoch (in seconds).
+        * It can be negative.
+        */
+       int64_t offset_s;
+       /*
+        * Fine clock offset from Epoch, in (1/freq) units.
+        * It can be negative.
         */
-       uint64_t offset_s;
-       /* Fine clock offset from Epoch, in (1/freq) units. */
-       uint64_t offset;
+       int64_t offset;
        int absolute;
 
        enum {                                  /* Fields populated mask */
@@ -192,6 +207,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;