X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=024b50f1c4daed84e7d0cfe3c06822488dd365c3;hb=8b8dc96e023c365461d2407a3bf2220779bc7d05;hp=699db2eeedaf385c54487740da09914de7ee1425;hpb=cadd09e9216876ec676ee71624ba80e1fe0ca56e;p=babeltrace.git

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 699db2ee..024b50f1 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -24,7 +24,7 @@
 #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>
 
@@ -32,6 +32,8 @@ struct ctf_trace;
 struct ctf_stream_class;
 struct ctf_stream;
 struct ctf_event;
+struct ctf_stream;
+struct ctf_clock;
 
 struct ctf_stream {
 	struct ctf_stream_class *stream_class;
@@ -39,6 +41,7 @@ struct ctf_stream {
 	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;
@@ -48,6 +51,8 @@ struct ctf_stream {
 	struct definition_scope *parent_def_scope;	/* for initialization */
 	int stream_definitions_created;
 
+	struct ctf_clock *current_clock;
+
 	/* Event discarded information */
 	uint32_t events_discarded;
 	uint64_t prev_timestamp;	/* Last event */
@@ -91,6 +96,7 @@ struct ctf_clock {
 
 	enum {					/* Fields populated mask */
 		CTF_CLOCK_name		=	(1U << 0),
+		CTF_CLOCK_freq		=	(1U << 1),
 	} field_mask;
 };
 
@@ -133,13 +139,14 @@ struct ctf_trace {
 	GPtrArray *streams;			/* Array of struct ctf_stream_class pointers */
 	struct ctf_stream *metadata;
 	GHashTable *clocks;
+	struct ctf_clock *single_clock;		/* currently supports only one clock */
 	struct trace_collection *collection;	/* Container of this trace */
 
 	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;
 
@@ -158,11 +165,10 @@ struct ctf_trace {
 
 	/* Heap of streams, ordered to always get the lowest timestam */
 	struct ptr_heap *stream_heap;
-	char collection_path[PATH_MAX];
 	char path[PATH_MAX];
-	char domain[PATH_MAX];
-	char procname[PATH_MAX];
-	char vpid[PATH_MAX];
+
+	struct bt_context *ctx;
+	struct bt_trace_handle *handle;
 };
 
 #define CTF_STREAM_SET_FIELD(ctf_stream, field)				\