X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=187cfdbcf9e3359f9f6ec330fe3bf8121520eb10;hp=91df0362de445d9bd50bff82c08d1d2a9abb3694;hb=61cf588beae752e5ddfc60b6b5310f769ac9e852;hpb=87148dc74de9861a656aa4f38f03b51743471049

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 91df0362..187cfdbc 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -29,10 +29,11 @@
 
 #include <babeltrace/types.h>
 #include <babeltrace/format.h>
+#include <babeltrace/format-internal.h>
 #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>
 
@@ -41,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;
@@ -62,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 */
 };
 
@@ -99,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.
 	 */
-	uint64_t offset_s;
-	/* Fine clock offset from Epoch, in (1/freq) units. */
-	uint64_t offset;
+	int64_t offset_s;
+	/*
+	 * Fine clock offset from Epoch, in (1/freq) units.
+	 * It can be negative.
+	 */
+	int64_t offset;
 	int absolute;
 
 	enum {					/* Fields populated mask */
@@ -176,6 +192,7 @@ struct ctf_tracer_env {
 
 struct ctf_trace {
 	struct bt_trace_descriptor parent;
+
 	/* root scope */
 	struct declaration_scope *root_declaration_scope;
 
@@ -184,13 +201,14 @@ struct ctf_trace {
 	struct definition_scope *definition_scope;
 	GPtrArray *streams;			/* Array of struct ctf_stream_declaration pointers */
 	struct ctf_stream_definition *metadata;
-	GHashTable *clocks;
+	char *metadata_string;
+	int metadata_packetized;
 	GHashTable *callsites;
-	struct ctf_clock *single_clock;		/* currently supports only one clock */
-	struct trace_collection *collection;	/* Container of this 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;
@@ -210,13 +228,6 @@ struct ctf_trace {
 	DIR *dir;
 	int dirfd;
 	int flags;		/* open flags */
-
-	/* Heap of streams, ordered to always get the lowest timestamp */
-	struct ptr_heap *stream_heap;
-	char path[PATH_MAX];
-
-	struct bt_context *ctx;
-	struct bt_trace_handle *handle;
 };
 
 #define CTF_STREAM_SET_FIELD(ctf_stream, field)				\