X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=f3e7b68ce01a817831b70d8b04bc13409a1a142f;hp=29d0fd492ec34d72d481d391eeb077b7b52e1919;hb=c716f83b53677d5f2e6a15463408f464006eafb7;hpb=bf94ab2bcad1aa584a1ecc763ce390d583b62f0c

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 29d0fd49..f3e7b68c 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -24,29 +24,30 @@
 #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_declaration;
 struct ctf_stream;
 struct ctf_event;
 struct ctf_stream;
 struct ctf_clock;
 
 struct ctf_stream {
-	struct ctf_stream_class *stream_class;
+	struct ctf_stream_declaration *stream_class;
 	uint64_t timestamp;			/* Current timestamp, in ns */
 	uint64_t event_id;			/* Current event ID */
 	int has_timestamp;
 	uint64_t stream_id;
+	int consumed;				/* Last packet used by caller */
 
 	struct definition_struct *trace_packet_header;
 	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;
 
@@ -58,7 +59,7 @@ struct ctf_stream {
 	uint64_t prev_timestamp_end;	/* End-of-packet timestamp */
 };
 
-struct ctf_stream_event {
+struct ctf_event_definition {
 	struct definition_struct *event_context;
 	struct definition_struct *event_fields;
 };
@@ -135,7 +136,7 @@ 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 */
+	GPtrArray *streams;			/* Array of struct ctf_stream_declaration pointers */
 	struct ctf_stream *metadata;
 	GHashTable *clocks;
 	struct ctf_clock *single_clock;		/* currently supports only one clock */
@@ -145,7 +146,7 @@ struct ctf_trace {
 
 	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;
 
@@ -165,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)				\
@@ -181,7 +185,7 @@ 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;
@@ -219,7 +223,7 @@ struct ctf_stream_class {
 
 struct ctf_event {
 	/* 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;