X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=3176bbd4d46ec48cb82ce997dfb4644c5ce7c6ee;hp=c18749f708906b84f6b01dde9f193d38322edec5;hb=fef3bf22431390dae389d378b7709366b158b83d;hpb=e003ab503def7b0db6c130cccbc03685adb32bbb

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index c18749f7..3176bbd4 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -35,11 +35,11 @@ struct ctf_clock;
 
 struct ctf_stream_definition {
 	struct ctf_stream_declaration *stream_class;
-	uint64_t timestamp;			/* Current timestamp, in ns */
+	uint64_t real_timestamp;		/* Current timestamp, in ns */
+	uint64_t cycles_timestamp;		/* Current timestamp, in cycles */
 	uint64_t event_id;			/* Current event ID */
 	int has_timestamp;
 	uint64_t stream_id;
-	int consumed;				/* Last packet used by caller */
 
 	struct definition_struct *trace_packet_header;
 	struct definition_struct *stream_packet_context;
@@ -52,9 +52,11 @@ struct ctf_stream_definition {
 	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 */
+	uint64_t events_discarded;
+	uint64_t prev_real_timestamp;		/* Start-of-last-packet timestamp in ns */
+	uint64_t prev_real_timestamp_end;	/* End-of-last-packet timestamp in ns */
+	uint64_t prev_cycles_timestamp;		/* Start-of-last-packet timestamp in cycles */
+	uint64_t prev_cycles_timestamp_end;	/* End-of-last-packet timestamp in cycles */
 };
 
 struct ctf_event_definition {
@@ -121,6 +123,7 @@ struct ctf_tracer_env {
 
 	/* All strings below: "" if unset. */
 	char procname[TRACER_ENV_LEN];
+	char hostname[TRACER_ENV_LEN];
 	char domain[TRACER_ENV_LEN];
 	char sysname[TRACER_ENV_LEN];
 	char release[TRACER_ENV_LEN];
@@ -234,12 +237,14 @@ struct ctf_event_declaration {
 	uint64_t id;		/* Numeric identifier within the stream */
 	uint64_t stream_id;
 	int loglevel;
+	GQuark model_emf_uri;
 
 	enum {					/* Fields populated mask */
 		CTF_EVENT_name	=		(1 << 0),
 		CTF_EVENT_id 	= 		(1 << 1),
 		CTF_EVENT_stream_id = 		(1 << 2),
 		CTF_EVENT_loglevel =		(1 << 4),
+		CTF_EVENT_model_emf_uri =	(1 << 5),
 	} field_mask;
 };