sync babeltrace headers

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>

diff --git a/lib/babeltrace/babeltrace-internal.h b/lib/babeltrace/babeltrace-internal.h
index 1f379ee7719d53de5c013c586783357f1f283d73..c9345509009d73eda04ab3df7ac4739980fa4d71 100644 (file)
--- a/lib/babeltrace/babeltrace-internal.h
+++ b/lib/babeltrace/babeltrace-internal.h
@@ -195,5 +195,6 @@ extern int opt_all_field_names,
 
 extern uint64_t opt_clock_offset;
 extern uint64_t opt_clock_offset_ns;
+extern int babeltrace_ctf_console_output;
 
 #endif

diff --git a/lib/babeltrace/ctf-ir/metadata.h b/lib/babeltrace/ctf-ir/metadata.h
index 5e92984dba40906c59bb96c5e4455182bc13233e..675369584b9253e82ca16338d7fedf7ea3bbd873 100644 (file)
--- a/lib/babeltrace/ctf-ir/metadata.h
+++ b/lib/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,8 @@ 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 */
+       struct ctf_stream_packet_timestamp prev;
+       struct ctf_stream_packet_timestamp current;
        char path[PATH_MAX];                    /* Path to stream. '\0' for mmap traces */
 };
 
@@ -192,6 +201,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;

diff --git a/lib/babeltrace/ctf/events-internal.h b/lib/babeltrace/ctf/events-internal.h
index 2e37693ab689afa089eebb4dc84ed60b8303df53..48caa54429fd70fe0f9299f82b0e1930f5ee03c5 100644 (file)
--- a/lib/babeltrace/ctf/events-internal.h
+++ b/lib/babeltrace/ctf/events-internal.h
@@ -79,8 +79,6 @@ struct bt_ctf_iter {
        uint64_t events_lost;
 };
 
-void ctf_print_discarded(FILE *fp, struct ctf_stream_definition *stream,
-                       int end_stream);
 void ctf_update_current_packet_index(struct ctf_stream_definition *stream,
                struct packet_index *prev_index,
                struct packet_index *cur_index);

diff --git a/lib/babeltrace/ctf/types.h b/lib/babeltrace/ctf/types.h
index f268e13aa7fd412984332c143b111db208b86844..67b24ee4aa940cf3185bff55c57c2a127b2f2904 100644 (file)
--- a/lib/babeltrace/ctf/types.h
+++ b/lib/babeltrace/ctf/types.h
@@ -242,5 +242,7 @@ void ctf_pos_get_event(struct ctf_stream_pos *pos)
 
 void ctf_print_timestamp(FILE *fp, struct ctf_stream_definition *stream,
                        uint64_t timestamp);
+int ctf_append_trace_metadata(struct bt_trace_descriptor *tdp,
+                       FILE *metadata_fp);
 
 #endif /* _BABELTRACE_CTF_TYPES_H */