X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=07706bb1e005d62ff97a42265274817b0a63bbdb;hp=eb37c2df3b4b0dc3a1ce5381e12e7579c7d40d5b;hb=eb75a494900f763d9daca6a9bab5a8f01ffe552f;hpb=7237592a76cceda97a1c79904fed583e215d3fa9

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index eb37c2df..07706bb1 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -29,10 +29,11 @@
 
 #include <babeltrace/types.h>
 #include <babeltrace/format.h>
+#include <babeltrace/format-internal.h>
 #include <babeltrace/ctf/types.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <babeltrace/uuid.h>
+#include <babeltrace/compat/uuid.h>
 #include <assert.h>
 #include <glib.h>
 
@@ -41,6 +42,17 @@ struct ctf_stream_declaration;
 struct ctf_event_declaration;
 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;
@@ -62,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 */
 };
 
@@ -172,10 +184,16 @@ 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;
+
 	/* root scope */
 	struct declaration_scope *root_declaration_scope;
 
@@ -186,13 +204,12 @@ struct ctf_trace {
 	struct ctf_stream_definition *metadata;
 	char *metadata_string;
 	int metadata_packetized;
-	GHashTable *clocks;
 	GHashTable *callsites;
-	struct ctf_clock *single_clock;		/* currently supports only one clock */
-	struct trace_collection *collection;	/* Container of this trace */
 	GPtrArray *event_declarations;		/* Array of all the struct bt_ctf_event_decl */
 
 	struct declaration_struct *packet_header_decl;
+	struct ctf_scanner *scanner;
+	int restart_root_decl;
 
 	uint64_t major;
 	uint64_t minor;
@@ -213,12 +230,10 @@ struct ctf_trace {
 	int dirfd;
 	int flags;		/* open flags */
 
-	/* Heap of streams, ordered to always get the lowest timestamp */
-	struct ptr_heap *stream_heap;
-	char path[PATH_MAX];
-
-	struct bt_context *ctx;
-	struct bt_trace_handle *handle;
+#ifdef ENABLE_DEBUG_INFO
+	/* Debug information for this trace */
+	struct debug_info *debug_info;
+#endif
 };
 
 #define CTF_STREAM_SET_FIELD(ctf_stream, field)				\