X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Fmetadata.h;h=de1a70d101b921975a5f10fb23b183ff9e558adb;hp=d833a56d771dad990d5bf566160254f86f7107f8;hb=aa6bffaea450106c60fc1292152bd94a270fd243;hpb=65102a8c8f70b08a27887c89b23f6d0b543ea67e

diff --git a/include/babeltrace/ctf/metadata.h b/include/babeltrace/ctf/metadata.h
index d833a56d..de1a70d1 100644
--- a/include/babeltrace/ctf/metadata.h
+++ b/include/babeltrace/ctf/metadata.h
@@ -20,6 +20,7 @@
  */
 
 #include <babeltrace/types.h>
+#include <babeltrace/format.h>
 #include <babeltrace/ctf/types.h>
 #include <sys/types.h>
 #include <dirent.h>
@@ -27,15 +28,16 @@
 #include <assert.h>
 #include <glib.h>
 
+#define CTF_MAGIC	0xC1FC1FC1
+
 struct ctf_trace;
-struct ctf_stream;
+struct ctf_stream_class;
 struct ctf_event;
 
-struct ctf_stream_file {
-	/* Information about stream backing file */
-	int fd;
-	char *mmap;				/* current stream mmap */
-	struct stream_pos pos;			/* current stream position */
+struct ctf_file_stream {
+	uint64_t stream_id;
+	struct ctf_stream_class *stream;
+	struct ctf_stream_pos pos;	/* current stream position */
 };
 
 #define CTF_TRACE_SET_FIELD(ctf_trace, field)				\
@@ -54,22 +56,33 @@ struct ctf_stream_file {
 
 
 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*/
-	struct ctf_stream_file metadata;
+	/* 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 */
@@ -92,7 +105,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;
@@ -117,7 +130,7 @@ struct ctf_stream {
 		CTF_STREAM_stream_id =	(1 << 0),
 	} field_mask;
 
-	struct ctf_stream_file file;		/* Backing file */
+	GPtrArray *files;			/* Array of struct ctf_file_stream pointers */
 };
 
 #define CTF_EVENT_SET_FIELD(ctf_event, field)				\
@@ -136,7 +149,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;