X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=4d291c75187d82f4fc9368646f1b40f033ca2390;hb=f3985ab106d89d8e764c1a8dd0c8bda09b755d10;hp=93c7a586a3ecc985d55b84928b657ae9ad7a743a;hpb=0c880b0af719e4d58ccebe61acdd0e77a4479bfd;p=babeltrace.git

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 93c7a586..4d291c75 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -44,6 +44,16 @@ struct ctf_clock;
 struct ctf_callsite;
 struct ctf_scanner;
 
+struct ctf_stream_packet_limits {
+	uint64_t begin;
+	uint64_t end;
+};
+
+struct ctf_stream_packet_timestamp {
+	struct ctf_stream_packet_limits cycles;
+	struct ctf_stream_packet_limits real;
+};
+
 struct ctf_stream_definition {
 	struct ctf_stream_declaration *stream_class;
 	uint64_t real_timestamp;		/* Current timestamp, in ns */
@@ -64,10 +74,10 @@ struct ctf_stream_definition {
 
 	/* Event discarded information */
 	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 */
+	/* Trace packets lost */
+	uint64_t packets_lost;
+	struct ctf_stream_packet_timestamp prev;
+	struct ctf_stream_packet_timestamp current;
 	char path[PATH_MAX];			/* Path to stream. '\0' for mmap traces */
 };
 
@@ -101,10 +111,14 @@ struct ctf_clock {
 	/*
 	 * The offset from Epoch is: offset_s + (offset * (1/freq))
 	 * Coarse clock offset from Epoch (in seconds).
+	 * It can be negative.
 	 */
-	uint64_t offset_s;
-	/* Fine clock offset from Epoch, in (1/freq) units. */
-	uint64_t offset;
+	int64_t offset_s;
+	/*
+	 * Fine clock offset from Epoch, in (1/freq) units.
+	 * It can be negative.
+	 */
+	int64_t offset;
 	int absolute;
 
 	enum {					/* Fields populated mask */
@@ -174,8 +188,13 @@ struct ctf_tracer_env {
 	char sysname[TRACER_ENV_LEN];
 	char release[TRACER_ENV_LEN];
 	char version[TRACER_ENV_LEN];
+	char tracer_name[TRACER_ENV_LEN];
 };
 
+#ifdef ENABLE_DEBUG_INFO
+struct debug_info;
+#endif
+
 struct ctf_trace {
 	struct bt_trace_descriptor parent;
 
@@ -214,6 +233,11 @@ struct ctf_trace {
 	DIR *dir;
 	int dirfd;
 	int flags;		/* open flags */
+
+#ifdef ENABLE_DEBUG_INFO
+	/* Debug information for this trace */
+	struct debug_info *debug_info;
+#endif
 };
 
 #define CTF_STREAM_SET_FIELD(ctf_stream, field)				\