X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=773ebd681358b01196385460242311323eeecd92;hp=257f4f3352527202cf6532161ab4da2243245246;hb=fa709ab2ef8c8331fcccb6408fc7740918fc286d;hpb=42dc00b7cd26b1d33e80aaeffc744eb45093a14d

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 257f4f33..773ebd68 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -36,6 +36,9 @@ struct ctf_event;
 struct ctf_stream {
 	struct ctf_stream_class *stream_class;
 	uint64_t timestamp;			/* Current timestamp, in ns */
+	uint64_t event_id;			/* Current event ID */
+	int has_timestamp;
+	uint64_t stream_id;
 
 	struct definition_struct *trace_packet_header;
 	struct definition_struct *stream_packet_context;
@@ -51,10 +54,39 @@ struct ctf_stream_event {
 	struct definition_struct *event_fields;
 };
 
-struct ctf_file_stream {
-	uint64_t stream_id;
-	struct ctf_stream stream;
-	struct ctf_stream_pos pos;	/* current stream position */
+#define CTF_CLOCK_SET_FIELD(ctf_clock, field)				\
+	do {								\
+		(ctf_clock)->field_mask |= CTF_CLOCK_ ## field;		\
+	} while (0)
+
+#define CTF_CLOCK_FIELD_IS_SET(ctf_clock, field)			\
+		((ctf_clock)->field_mask & CTF_CLOCK_ ## field)
+
+#define CTF_CLOCK_GET_FIELD(ctf_clock, field)				\
+	({								\
+		assert(CTF_CLOCK_FIELD_IS_SET(ctf_clock, field));	\
+		(ctf_clock)->(field);					\
+	})
+
+struct ctf_clock {
+	GQuark name;
+	GQuark uuid;
+	char *description;
+	uint64_t freq;	/* frequency, in HZ */
+	/* precision in seconds is: precision * (1/freq) */
+	uint64_t precision;
+	/*
+	 * The offset from Epoch is: offset_s + (offset * (1/freq))
+	 * Coarse clock offset from Epoch (in seconds).
+	 */
+	uint64_t offset_s;
+	/* Fine clock offset from Epoch, in (1/freq) units. */
+	uint64_t offset;
+	int absolute;
+
+	enum {					/* Fields populated mask */
+		CTF_CLOCK_name		=	(1U << 0),
+	} field_mask;
 };
 
 #define CTF_TRACE_SET_FIELD(ctf_trace, field)				\
@@ -71,7 +103,6 @@ struct ctf_file_stream {
 		(ctf_trace)->(field);					\
 	})
 
-
 struct ctf_trace {
 	struct trace_descriptor parent;
 	/* root scope */
@@ -81,9 +112,10 @@ struct ctf_trace {
 	/* 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;
+	struct ctf_stream *metadata;
+	GHashTable *clocks;
+	struct trace_collection *collection;	/* Container of this trace */
 
-	/* Declarations only used when parsing */
 	struct declaration_struct *packet_header_decl;
 
 	uint64_t major;
@@ -106,6 +138,11 @@ 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];
 };
 
 #define CTF_STREAM_SET_FIELD(ctf_stream, field)				\
@@ -131,7 +168,6 @@ struct ctf_stream_class {
 	GPtrArray *events_by_id;		/* Array of struct ctf_event pointers indexed by id */
 	GHashTable *event_quark_to_id;		/* GQuark to numeric id */
 
-	/* Declarations only used when parsing */
 	struct declaration_struct *packet_context_decl;
 	struct declaration_struct *event_header_decl;
 	struct declaration_struct *event_context_decl;
@@ -142,7 +178,7 @@ struct ctf_stream_class {
 		CTF_STREAM_stream_id =	(1 << 0),
 	} field_mask;
 
-	GPtrArray *files;			/* Array of struct ctf_file_stream pointers */
+	GPtrArray *streams;	/* Array of struct ctf_stream pointers */
 };
 
 #define CTF_EVENT_SET_FIELD(ctf_event, field)				\
@@ -165,18 +201,21 @@ struct ctf_event {
 	/* parent is lexical scope conaining the event scope */
 	struct declaration_scope *declaration_scope;
 
-	/* Declarations only used when parsing */
 	struct declaration_struct *context_decl;
 	struct declaration_struct *fields_decl;
 
 	GQuark name;
 	uint64_t id;		/* Numeric identifier within the stream */
 	uint64_t stream_id;
+	GQuark loglevel_identifier;
+	int64_t loglevel_value;
 
 	enum {					/* Fields populated mask */
-		CTF_EVENT_name	=	(1 << 0),
-		CTF_EVENT_id 	= 	(1 << 1),
-		CTF_EVENT_stream_id = 	(1 << 2),
+		CTF_EVENT_name	=		(1 << 0),
+		CTF_EVENT_id 	= 		(1 << 1),
+		CTF_EVENT_stream_id = 		(1 << 2),
+		CTF_EVENT_loglevel_identifier =	(1 << 3),
+		CTF_EVENT_loglevel_value =	(1 << 4),
 	} field_mask;
 };