X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=675369584b9253e82ca16338d7fedf7ea3bbd873;hp=fc555fdd96f5e79cef3ddc9cae20e70a19628929;hb=2654fe9;hpb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index fc555fdd..67536958 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,9 @@ 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 */
 };
 
 struct ctf_event_definition {
@@ -174,7 +185,8 @@ struct ctf_tracer_env {
 };
 
 struct ctf_trace {
-	struct trace_descriptor parent;
+	struct bt_trace_descriptor parent;
+
 	/* root scope */
 	struct declaration_scope *root_declaration_scope;
 
@@ -183,13 +195,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;
@@ -209,13 +222,6 @@ struct ctf_trace {
 	DIR *dir;
 	int dirfd;
 	int flags;		/* open flags */
-
-	/* Heap of streams, ordered to always get the lowest timestam */
-	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)				\
@@ -234,7 +240,7 @@ struct ctf_trace {
 
 struct ctf_stream_declaration {
 	struct ctf_trace *trace;
-	/* parent is lexical scope conaining the stream scope */
+	/* parent is lexical scope containing the stream scope */
 	struct declaration_scope *declaration_scope;
 	/* innermost definition scope. to be used as parent of event. */
 	struct definition_scope *definition_scope;
@@ -271,7 +277,7 @@ struct ctf_stream_declaration {
 struct ctf_event_declaration {
 	/* stream mapped by stream_id */
 	struct ctf_stream_declaration *stream;
-	/* parent is lexical scope conaining the event scope */
+	/* parent is lexical scope containing the event scope */
 	struct declaration_scope *declaration_scope;
 
 	struct declaration_struct *context_decl;