X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=c18749f708906b84f6b01dde9f193d38322edec5;hp=0e5842e4025e8658cab278fde68b2e93451ca0ad;hb=e003ab503def7b0db6c130cccbc03685adb32bbb;hpb=90fcbacc6eb672f0d5e0c9d6722d397ac9f1a63e

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 0e5842e4..c18749f7 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -24,19 +24,17 @@
 #include <babeltrace/ctf/types.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <uuid/uuid.h>
+#include <babeltrace/uuid.h>
 #include <assert.h>
 #include <glib.h>
 
 struct ctf_trace;
-struct ctf_stream_class;
-struct ctf_stream;
-struct ctf_event;
-struct ctf_stream;
+struct ctf_stream_declaration;
+struct ctf_event_declaration;
 struct ctf_clock;
 
-struct ctf_stream {
-	struct ctf_stream_class *stream_class;
+struct ctf_stream_definition {
+	struct ctf_stream_declaration *stream_class;
 	uint64_t timestamp;			/* Current timestamp, in ns */
 	uint64_t event_id;			/* Current event ID */
 	int has_timestamp;
@@ -47,7 +45,7 @@ struct ctf_stream {
 	struct definition_struct *stream_packet_context;
 	struct definition_struct *stream_event_header;
 	struct definition_struct *stream_event_context;
-	GPtrArray *events_by_id;		/* Array of struct ctf_stream_event pointers indexed by id */
+	GPtrArray *events_by_id;		/* Array of struct ctf_event_definition pointers indexed by id */
 	struct definition_scope *parent_def_scope;	/* for initialization */
 	int stream_definitions_created;
 
@@ -59,7 +57,8 @@ struct ctf_stream {
 	uint64_t prev_timestamp_end;	/* End-of-packet timestamp */
 };
 
-struct ctf_stream_event {
+struct ctf_event_definition {
+	struct ctf_stream_definition *stream;
 	struct definition_struct *event_context;
 	struct definition_struct *event_fields;
 };
@@ -136,17 +135,18 @@ struct ctf_trace {
 	struct declaration_scope *declaration_scope;
 	/* 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_stream *metadata;
+	GPtrArray *streams;			/* Array of struct ctf_stream_declaration pointers */
+	struct ctf_stream_definition *metadata;
 	GHashTable *clocks;
 	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;
 
 	uint64_t major;
 	uint64_t minor;
-	uuid_t uuid;
+	unsigned char uuid[BABELTRACE_UUID_LEN];
 	int byte_order;		/* trace BYTE_ORDER. 0 if unset. */
 	struct ctf_tracer_env env;
 
@@ -166,6 +166,9 @@ struct ctf_trace {
 	/* 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)				\
@@ -182,13 +185,13 @@ struct ctf_trace {
 		(ctf_stream)->(field);					\
 	})
 
-struct ctf_stream_class {
+struct ctf_stream_declaration {
 	struct ctf_trace *trace;
 	/* parent is lexical scope conaining the stream scope */
 	struct declaration_scope *declaration_scope;
 	/* innermost definition scope. to be used as parent of event. */
 	struct definition_scope *definition_scope;
-	GPtrArray *events_by_id;		/* Array of struct ctf_event pointers indexed by id */
+	GPtrArray *events_by_id;		/* Array of struct ctf_event_declaration pointers indexed by id */
 	GHashTable *event_quark_to_id;		/* GQuark to numeric id */
 
 	struct declaration_struct *packet_context_decl;
@@ -201,7 +204,7 @@ struct ctf_stream_class {
 		CTF_STREAM_stream_id =	(1 << 0),
 	} field_mask;
 
-	GPtrArray *streams;	/* Array of struct ctf_stream pointers */
+	GPtrArray *streams;	/* Array of struct ctf_stream_definition pointers */
 };
 
 #define CTF_EVENT_SET_FIELD(ctf_event, field)				\
@@ -218,9 +221,9 @@ struct ctf_stream_class {
 		(ctf_event)->(field);					\
 	})
 
-struct ctf_event {
+struct ctf_event_declaration {
 	/* stream mapped by stream_id */
-	struct ctf_stream_class *stream;
+	struct ctf_stream_declaration *stream;
 	/* parent is lexical scope conaining the event scope */
 	struct declaration_scope *declaration_scope;