X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=dde51bb4d8f0a2efacd6d841e7814b3e57908faa;hb=306eeaa621ff1e69d8b0fcabd71560f62c16c46a;hp=ce5f8b9e477d7053d77aad852c02dc392d0f4b44;hpb=fca049584ae1bcd9b0859924f982c6a0f6c7388f;p=babeltrace.git

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index ce5f8b9e..dde51bb4 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -36,7 +36,6 @@ struct ctf_event;
 struct ctf_stream {
 	struct ctf_stream_class *stream_class;
 	uint64_t timestamp;			/* Current timestamp, in ns */
-	uint64_t prev_timestamp;
 	uint64_t event_id;			/* Current event ID */
 	int has_timestamp;
 	uint64_t stream_id;
@@ -51,7 +50,8 @@ struct ctf_stream {
 
 	/* 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 {
@@ -212,15 +212,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;
 };