X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=79af77a768c0dda06e02023ba25850a8bde41dac;hp=9c4d4500434cd16609284c328598ff818fd5607e;hb=25ccc85ba8fce5fb8402f1c6fc63a75ff7f07d99;hpb=2d0bea29e27a0f1a9b651bb98dac7bf0c2550f78

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 9c4d4500..79af77a7 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -32,10 +32,14 @@ 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;
 	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;
@@ -45,6 +49,13 @@ struct ctf_stream {
 	GPtrArray *events_by_id;		/* Array of struct ctf_stream_event pointers indexed by id */
 	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 */
+	uint64_t prev_timestamp_end;	/* End-of-packet timestamp */
 };
 
 struct ctf_stream_event {
@@ -52,6 +63,41 @@ struct ctf_stream_event {
 	struct definition_struct *event_fields;
 };
 
+#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)				\
 	do {								\
 		(ctf_trace)->field_mask |= CTF_TRACE_ ## field;		\
@@ -66,6 +112,19 @@ struct ctf_stream_event {
 		(ctf_trace)->(field);					\
 	})
 
+#define TRACER_ENV_LEN	128
+
+/* tracer-specific environment */
+struct ctf_tracer_env {
+	int vpid;		/* negative if unset */
+
+	/* All strings below: "" if unset. */
+	char procname[TRACER_ENV_LEN];
+	char domain[TRACER_ENV_LEN];
+	char sysname[TRACER_ENV_LEN];
+	char release[TRACER_ENV_LEN];
+	char version[TRACER_ENV_LEN];
+};
 
 struct ctf_trace {
 	struct trace_descriptor parent;
@@ -77,14 +136,17 @@ struct ctf_trace {
 	struct definition_scope *definition_scope;
 	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 */
 
-	/* Declarations only used when parsing */
 	struct declaration_struct *packet_header_decl;
 
 	uint64_t major;
 	uint64_t minor;
 	uuid_t uuid;
 	int byte_order;		/* trace BYTE_ORDER. 0 if unset. */
+	struct ctf_tracer_env env;
 
 	enum {					/* Fields populated mask */
 		CTF_TRACE_major		=	(1U << 0),
@@ -101,6 +163,7 @@ struct ctf_trace {
 
 	/* Heap of streams, ordered to always get the lowest timestam */
 	struct ptr_heap *stream_heap;
+	char path[PATH_MAX];
 };
 
 #define CTF_STREAM_SET_FIELD(ctf_stream, field)				\
@@ -126,7 +189,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;
@@ -160,18 +222,19 @@ 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;
+	int loglevel;
 
 	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 =		(1 << 4),
 	} field_mask;
 };