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

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 773ebd68..d445a011 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -47,6 +47,11 @@ 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;
+
+	/* 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 {
@@ -103,6 +108,20 @@ struct ctf_clock {
 		(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;
 	/* root scope */
@@ -122,6 +141,7 @@ struct ctf_trace {
 	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),
@@ -138,11 +158,7 @@ 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)				\
@@ -207,15 +223,13 @@ struct ctf_event {
 	GQuark name;
 	uint64_t id;		/* Numeric identifier within the stream */
 	uint64_t stream_id;
-	GQuark loglevel_identifier;
-	int64_t loglevel_value;
+	int loglevel;
 
 	enum {					/* Fields populated mask */
 		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),
+		CTF_EVENT_loglevel =		(1 << 4),
 	} field_mask;
 };