X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Fmetadata.h;h=903d018dd9cb7c6811fcb9ce42712a29864c88f3;hp=91987a9b30db36016647bc4c20e8e7f381356f14;hb=764af3f43c289a0a5cd8bf6fd85d9361ae17a253;hpb=bbefb8dd3e1e198313e2eaf83f5451224ef8e27e

diff --git a/include/babeltrace/ctf/metadata.h b/include/babeltrace/ctf/metadata.h
index 91987a9b..903d018d 100644
--- a/include/babeltrace/ctf/metadata.h
+++ b/include/babeltrace/ctf/metadata.h
@@ -20,16 +20,32 @@
  */
 
 #include <babeltrace/types.h>
+#include <babeltrace/format.h>
+#include <babeltrace/ctf/types.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <uuid/uuid.h>
 #include <assert.h>
 #include <glib.h>
 
+#define CTF_MAGIC	0xC1FC1FC1
+
 struct ctf_trace;
+struct ctf_stream_class;
 struct ctf_stream;
 struct ctf_event;
 
+struct ctf_stream {
+	struct ctf_stream_class *stream_class;
+	uint64_t timestamp;			/* Current timestamp, in ns */
+};
+
+struct ctf_file_stream {
+	uint64_t stream_id;
+	struct ctf_stream stream;
+	struct ctf_stream_pos pos;	/* current stream position */
+};
+
 #define CTF_TRACE_SET_FIELD(ctf_trace, field)				\
 	do {								\
 		(ctf_trace)->field_mask |= CTF_TRACE_ ## field;		\
@@ -46,25 +62,38 @@ struct ctf_event;
 
 
 struct ctf_trace {
+	struct trace_descriptor parent;
 	/* root scope */
 	struct declaration_scope *root_declaration_scope;
 
 	struct declaration_scope *declaration_scope;
-	GPtrArray *streams;			/* Array of struct ctf_stream pointers*/
+	/* innermost definition scope. to be used as parent of stream. */
+	struct definition_scope *definition_scope;
+	GPtrArray *streams;			/* Array of struct ctf_stream_class pointers */
+	struct ctf_file_stream metadata;
+
+	/* Declarations only used when parsing */
+	struct declaration_struct *packet_header_decl;
+
+	/* Definitions used afterward */
+	struct definition_struct *packet_header;
 
 	uint64_t major;
 	uint64_t minor;
 	uuid_t uuid;
-	int byte_order;
+	int byte_order;		/* trace BYTE_ORDER. 0 if unset. */
 
 	enum {					/* Fields populated mask */
-		CTF_TRACE_major	=	(1U << 0),
-		CTF_TRACE_minor =	(1U << 1),
-		CTF_TRACE_uuid	=	(1U << 2),
+		CTF_TRACE_major		=	(1U << 0),
+		CTF_TRACE_minor		=	(1U << 1),
+		CTF_TRACE_uuid		=	(1U << 2),
+		CTF_TRACE_byte_order	=	(1U << 3),
+		CTF_TRACE_packet_header	=	(1U << 4),
 	} field_mask;
 
 	/* Information about trace backing directory and files */
 	DIR *dir;
+	int dirfd;
 	int flags;		/* open flags */
 };
 
@@ -82,7 +111,7 @@ struct ctf_trace {
 		(ctf_stream)->(field);					\
 	})
 
-struct ctf_stream {
+struct ctf_stream_class {
 	struct ctf_trace *trace;
 	/* parent is lexical scope conaining the stream scope */
 	struct declaration_scope *declaration_scope;
@@ -107,10 +136,7 @@ struct ctf_stream {
 		CTF_STREAM_stream_id =	(1 << 0),
 	} field_mask;
 
-	/* Information about stream backing file */
-	int fd;
-	char *mmap;				/* current stream mmap */
-	struct stream_pos pos;			/* current stream position */
+	GPtrArray *files;			/* Array of struct ctf_file_stream pointers */
 };
 
 #define CTF_EVENT_SET_FIELD(ctf_event, field)				\
@@ -129,7 +155,7 @@ struct ctf_stream {
 
 struct ctf_event {
 	/* stream mapped by stream_id */
-	struct ctf_stream *stream;
+	struct ctf_stream_class *stream;
 	/* parent is lexical scope conaining the event scope */
 	struct declaration_scope *declaration_scope;