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

diff --git a/include/babeltrace/ctf/metadata.h b/include/babeltrace/ctf/metadata.h
index 5e7fd30e..903d018d 100644
--- a/include/babeltrace/ctf/metadata.h
+++ b/include/babeltrace/ctf/metadata.h
@@ -31,13 +31,19 @@
 #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 */
+	struct ctf_stream stream;
+	struct ctf_stream_pos pos;	/* current stream position */
 };
 
 #define CTF_TRACE_SET_FIELD(ctf_trace, field)				\
@@ -63,7 +69,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 pointers */
+	GPtrArray *streams;			/* Array of struct ctf_stream_class pointers */
 	struct ctf_file_stream metadata;
 
 	/* Declarations only used when parsing */
@@ -105,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;
@@ -149,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;