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

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 9c4d4500..2d216f2f 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -36,6 +36,8 @@ 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;
@@ -78,7 +80,6 @@ struct ctf_trace {
 	GPtrArray *streams;			/* Array of struct ctf_stream_class pointers */
 	struct ctf_stream *metadata;
 
-	/* Declarations only used when parsing */
 	struct declaration_struct *packet_header_decl;
 
 	uint64_t major;
@@ -101,6 +102,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)				\
@@ -126,7 +132,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 +165,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;
 };