X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=d4ff2a52267be7d2a00d2428bd7b42a068875a01;hp=8d617bcd620f66b8576a7a40ad2dd01f9f89ad44;hb=36741bea2b53007c29ac0391ee9086722e00653a;hpb=d6425aaf6026d168a695268c4aa7539956c0d0ca

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 8d617bcd..d4ff2a52 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -22,12 +22,15 @@
 #include <babeltrace/ctf/types.h>
 #include <babeltrace/ctf/metadata.h>
 #include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/ctf/events-internal.h>
+#include <babeltrace/trace-handle-internal.h>
+#include <babeltrace/context-internal.h>
+#include <babeltrace/uuid.h>
+#include <babeltrace/endian.h>
 #include <inttypes.h>
 #include <stdio.h>
-#include <uuid/uuid.h>
 #include <sys/mman.h>
 #include <errno.h>
-#include <endian.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -39,6 +42,8 @@
 #include "metadata/ctf-scanner.h"
 #include "metadata/ctf-parser.h"
 #include "metadata/ctf-ast.h"
+#include "events-private.h"
+#include "memstream.h"
 
 /*
  * We currently simply map a page to read the packet header and packet
@@ -46,7 +51,6 @@
  */
 #define MAX_PACKET_HEADER_LEN	(getpagesize() * CHAR_BIT)
 #define WRITE_PACKET_LEN	(getpagesize() * 8 * CHAR_BIT)
-#define UUID_LEN 16	/* uuid by value len */
 
 #ifndef min
 #define min(a, b)	(((a) < (b)) ? (a) : (b))
@@ -54,7 +58,7 @@
 
 #define NSEC_PER_SEC 1000000000ULL
 
-int opt_clock_raw,
+int opt_clock_cycles,
 	opt_clock_seconds,
 	opt_clock_date,
 	opt_clock_gmt;
@@ -65,16 +69,32 @@ extern int yydebug;
 
 static
 struct trace_descriptor *ctf_open_trace(const char *path, int flags,
-		void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
-			int whence), FILE *metadata_fp);
+		void (*packet_seek)(struct stream_pos *pos, size_t index,
+			int whence),
+		FILE *metadata_fp);
 static
 struct trace_descriptor *ctf_open_mmap_trace(
 		struct mmap_stream_list *mmap_list,
-		void (*move_pos_slow)(struct stream_pos *pos, size_t offset, int whence),
+		void (*packet_seek)(struct stream_pos *pos, size_t index,
+			int whence),
 		FILE *metadata_fp);
+static
+void ctf_set_context(struct trace_descriptor *descriptor,
+		struct bt_context *ctx);
+static
+void ctf_set_handle(struct trace_descriptor *descriptor,
+		struct bt_trace_handle *handle);
 
 static
 void ctf_close_trace(struct trace_descriptor *descriptor);
+static
+uint64_t ctf_timestamp_begin(struct trace_descriptor *descriptor,
+		struct bt_trace_handle *handle, enum bt_clock_type type);
+static
+uint64_t ctf_timestamp_end(struct trace_descriptor *descriptor,
+		struct bt_trace_handle *handle, enum bt_clock_type type);
+static
+int ctf_convert_index_timestamp(struct trace_descriptor *tdp);
 
 static
 rw_dispatch read_dispatch_table[] = {
@@ -105,13 +125,140 @@ struct format ctf_format = {
 	.open_trace = ctf_open_trace,
 	.open_mmap_trace = ctf_open_mmap_trace,
 	.close_trace = ctf_close_trace,
+	.set_context = ctf_set_context,
+	.set_handle = ctf_set_handle,
+	.timestamp_begin = ctf_timestamp_begin,
+	.timestamp_end = ctf_timestamp_end,
+	.convert_index_timestamp = ctf_convert_index_timestamp,
 };
 
+static
+uint64_t ctf_timestamp_begin(struct trace_descriptor *descriptor,
+		struct bt_trace_handle *handle, enum bt_clock_type type)
+{
+	struct ctf_trace *tin;
+	uint64_t begin = ULLONG_MAX;
+	int i, j;
+
+	tin = container_of(descriptor, struct ctf_trace, parent);
+
+	if (!tin)
+		goto error;
+
+	/* for each stream_class */
+	for (i = 0; i < tin->streams->len; i++) {
+		struct ctf_stream_declaration *stream_class;
+
+		stream_class = g_ptr_array_index(tin->streams, i);
+		if (!stream_class)
+			continue;
+		/* for each file_stream */
+		for (j = 0; j < stream_class->streams->len; j++) {
+			struct ctf_stream_definition *stream;
+			struct ctf_file_stream *cfs;
+			struct ctf_stream_pos *stream_pos;
+			struct packet_index *index;
+
+			stream = g_ptr_array_index(stream_class->streams, j);
+			cfs = container_of(stream, struct ctf_file_stream,
+					parent);
+			stream_pos = &cfs->pos;
+
+			if (!stream_pos->packet_real_index)
+				goto error;
+
+			if (stream_pos->packet_real_index->len <= 0)
+				continue;
+
+			if (type == BT_CLOCK_REAL) {
+				index = &g_array_index(stream_pos->packet_real_index,
+						struct packet_index,
+						stream_pos->packet_real_index->len - 1);
+			} else if (type == BT_CLOCK_CYCLES) {
+				index = &g_array_index(stream_pos->packet_cycles_index,
+						struct packet_index,
+						stream_pos->packet_real_index->len - 1);
+
+			} else {
+				goto error;
+			}
+			if (index->timestamp_begin < begin)
+				begin = index->timestamp_begin;
+		}
+	}
+
+	return begin;
+
+error:
+	return -1ULL;
+}
+
+static
+uint64_t ctf_timestamp_end(struct trace_descriptor *descriptor,
+		struct bt_trace_handle *handle, enum bt_clock_type type)
+{
+	struct ctf_trace *tin;
+	uint64_t end = 0;
+	int i, j;
+
+	tin = container_of(descriptor, struct ctf_trace, parent);
+
+	if (!tin)
+		goto error;
+
+	/* for each stream_class */
+	for (i = 0; i < tin->streams->len; i++) {
+		struct ctf_stream_declaration *stream_class;
+
+		stream_class = g_ptr_array_index(tin->streams, i);
+		if (!stream_class)
+			continue;
+		/* for each file_stream */
+		for (j = 0; j < stream_class->streams->len; j++) {
+			struct ctf_stream_definition *stream;
+			struct ctf_file_stream *cfs;
+			struct ctf_stream_pos *stream_pos;
+			struct packet_index *index;
+
+			stream = g_ptr_array_index(stream_class->streams, j);
+			cfs = container_of(stream, struct ctf_file_stream,
+					parent);
+			stream_pos = &cfs->pos;
+
+			if (!stream_pos->packet_real_index)
+				goto error;
+
+			if (stream_pos->packet_real_index->len <= 0)
+				continue;
+
+			if (type == BT_CLOCK_REAL) {
+				index = &g_array_index(stream_pos->packet_real_index,
+						struct packet_index,
+						stream_pos->packet_real_index->len - 1);
+			} else if (type == BT_CLOCK_CYCLES) {
+				index = &g_array_index(stream_pos->packet_cycles_index,
+						struct packet_index,
+						stream_pos->packet_real_index->len - 1);
+
+			} else {
+				goto error;
+			}
+			if (index->timestamp_end > end)
+				end = index->timestamp_end;
+		}
+	}
+
+	return end;
+
+error:
+	return -1ULL;
+}
+
 /*
- * Update stream current timestamp, keep at clock frequency.
+ * Update stream current timestamp
  */
 static
-void ctf_update_timestamp(struct ctf_stream *stream,
+void ctf_update_timestamp(struct ctf_stream_definition *stream,
 			  struct definition_integer *integer_definition)
 {
 	struct declaration_integer *integer_declaration =
@@ -119,48 +266,48 @@ void ctf_update_timestamp(struct ctf_stream *stream,
 	uint64_t oldval, newval, updateval;
 
 	if (unlikely(integer_declaration->len == 64)) {
-		stream->timestamp = integer_definition->value._unsigned;
+		stream->prev_cycles_timestamp = stream->cycles_timestamp;
+		stream->cycles_timestamp = integer_definition->value._unsigned;
+		stream->prev_real_timestamp = ctf_get_real_timestamp(stream,
+				stream->prev_cycles_timestamp);
+		stream->real_timestamp = ctf_get_real_timestamp(stream,
+				stream->cycles_timestamp);
 		return;
 	}
 	/* keep low bits */
-	oldval = stream->timestamp;
+	oldval = stream->cycles_timestamp;
 	oldval &= (1ULL << integer_declaration->len) - 1;
 	newval = integer_definition->value._unsigned;
 	/* Test for overflow by comparing low bits */
 	if (newval < oldval)
 		newval += 1ULL << integer_declaration->len;
 	/* updateval contains old high bits, and new low bits (sum) */
-	updateval = stream->timestamp;
+	updateval = stream->cycles_timestamp;
 	updateval &= ~((1ULL << integer_declaration->len) - 1);
 	updateval += newval;
-	stream->prev_timestamp = stream->timestamp;
-	stream->timestamp = updateval;
+	stream->prev_cycles_timestamp = stream->cycles_timestamp;
+	stream->cycles_timestamp = updateval;
+
+	/* convert to real timestamp */
+	stream->prev_real_timestamp = ctf_get_real_timestamp(stream,
+			stream->prev_cycles_timestamp);
+	stream->real_timestamp = ctf_get_real_timestamp(stream,
+			stream->cycles_timestamp);
 }
 
 /*
  * Print timestamp, rescaling clock frequency to nanoseconds and
  * applying offsets as needed (unix time).
  */
-void ctf_print_timestamp(FILE *fp,
-			struct ctf_stream *stream,
+void ctf_print_timestamp_real(FILE *fp,
+			struct ctf_stream_definition *stream,
 			uint64_t timestamp)
 {
 	uint64_t ts_sec = 0, ts_nsec;
-	struct ctf_trace *trace = stream->stream_class->trace;
-	struct trace_collection *tc = trace->collection;
-	uint64_t tc_offset = tc->single_clock_offset_avg;
 
-	if (stream->current_clock->freq == 1000000000ULL) {
-		ts_nsec = timestamp;
-	} else {
-		ts_nsec = (uint64_t) ((double) timestamp * 1000000000.0
-				/ (double) stream->current_clock->freq);
-	}
+	ts_nsec = timestamp;
 
-	/* Add offsets */
-	if (!opt_clock_raw) {
-		ts_nsec += tc_offset;
-	}
+	/* Add command-line offset */
 	ts_sec += opt_clock_offset;
 
 	ts_sec += ts_nsec / NSEC_PER_SEC;
@@ -213,13 +360,34 @@ end:
 	return;
 }
 
+/*
+ * Print timestamp, in cycles
+ */
+void ctf_print_timestamp_cycles(FILE *fp,
+		struct ctf_stream_definition *stream,
+		uint64_t timestamp)
+{
+	fprintf(fp, "%020" PRIu64, timestamp);
+}
+
+void ctf_print_timestamp(FILE *fp,
+		struct ctf_stream_definition *stream,
+		uint64_t timestamp)
+{
+	if (opt_clock_cycles) {
+		ctf_print_timestamp_cycles(fp, stream, timestamp);
+	} else {
+		ctf_print_timestamp_real(fp, stream, timestamp);
+	}
+}
+
 static
-int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
+int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream)
 {
 	struct ctf_stream_pos *pos =
 		container_of(ppos, struct ctf_stream_pos, parent);
-	struct ctf_stream_class *stream_class = stream->stream_class;
-	struct ctf_stream_event *event;
+	struct ctf_stream_declaration *stream_class = stream->stream_class;
+	struct ctf_event_definition *event;
 	uint64_t id = 0;
 	int ret;
 
@@ -231,8 +399,6 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
 
 	/* save the current position as a restore point */
 	pos->last_offset = pos->offset;
-	/* we just read the event, it is consumed when used by the caller */
-	stream->consumed = 0;
 
 	/*
 	 * This is the EOF check after we've advanced the position in
@@ -328,10 +494,10 @@ error:
 }
 
 static
-int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream)
+int ctf_write_event(struct stream_pos *pos, struct ctf_stream_definition *stream)
 {
-	struct ctf_stream_class *stream_class = stream->stream_class;
-	struct ctf_stream_event *event;
+	struct ctf_stream_declaration *stream_class = stream->stream_class;
+	struct ctf_event_definition *event;
 	uint64_t id;
 	int ret;
 
@@ -384,20 +550,17 @@ error:
 
 void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags)
 {
+	memset(pos, 0, sizeof(*pos));
 	pos->fd = fd;
-	pos->mmap_offset = 0;
-	pos->packet_size = 0;
-	pos->content_size = 0;
-	pos->content_size_loc = NULL;
-	pos->base = NULL;
-	pos->offset = 0;
-	pos->dummy = false;
-	pos->cur_index = 0;
-	if (fd >= 0)
-		pos->packet_index = g_array_new(FALSE, TRUE,
+	if (fd >= 0) {
+		pos->packet_cycles_index = g_array_new(FALSE, TRUE,
 						sizeof(struct packet_index));
-	else
-		pos->packet_index = NULL;
+		pos->packet_real_index = g_array_new(FALSE, TRUE,
+				sizeof(struct packet_index));
+	} else {
+		pos->packet_cycles_index = NULL;
+		pos->packet_real_index = NULL;
+	}
 	switch (open_flags & O_ACCMODE) {
 	case O_RDONLY:
 		pos->prot = PROT_READ;
@@ -411,7 +574,7 @@ void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags)
 		pos->parent.rw_table = write_dispatch_table;
 		pos->parent.event_cb = ctf_write_event;
 		if (fd >= 0)
-			ctf_move_pos_slow(&pos->parent, 0, SEEK_SET);	/* position for write */
+			ctf_packet_seek(&pos->parent, 0, SEEK_SET);	/* position for write */
 		break;
 	default:
 		assert(0);
@@ -424,19 +587,26 @@ void ctf_fini_pos(struct ctf_stream_pos *pos)
 
 	if (pos->prot == PROT_WRITE && pos->content_size_loc)
 		*pos->content_size_loc = pos->offset;
-	if (pos->base) {
+	if (pos->base_mma) {
 		/* unmap old base */
-		ret = munmap(pos->base, pos->packet_size / CHAR_BIT);
+		ret = munmap_align(pos->base_mma);
 		if (ret) {
 			fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
 				strerror(errno));
 			assert(0);
 		}
 	}
-	(void) g_array_free(pos->packet_index, TRUE);
+	if (pos->packet_cycles_index)
+		(void) g_array_free(pos->packet_cycles_index, TRUE);
+	if (pos->packet_real_index)
+		(void) g_array_free(pos->packet_real_index, TRUE);
 }
 
-void ctf_move_pos_slow(struct stream_pos *stream_pos, size_t offset, int whence)
+/*
+ * for SEEK_CUR: go to next packet.
+ * for SEEK_POS: go to packet numer (index).
+ */
+void ctf_packet_seek(struct stream_pos *stream_pos, size_t index, int whence)
 {
 	struct ctf_stream_pos *pos =
 		container_of(stream_pos, struct ctf_stream_pos, parent);
@@ -444,20 +614,20 @@ void ctf_move_pos_slow(struct stream_pos *stream_pos, size_t offset, int whence)
 		container_of(pos, struct ctf_file_stream, pos);
 	int ret;
 	off_t off;
-	struct packet_index *index;
+	struct packet_index *packet_index;
 
 	if (pos->prot == PROT_WRITE && pos->content_size_loc)
 		*pos->content_size_loc = pos->offset;
 
-	if (pos->base) {
+	if (pos->base_mma) {
 		/* unmap old base */
-		ret = munmap(pos->base, pos->packet_size / CHAR_BIT);
+		ret = munmap_align(pos->base_mma);
 		if (ret) {
 			fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
 				strerror(errno));
 			assert(0);
 		}
-		pos->base = NULL;
+		pos->base_mma = NULL;
 	}
 
 	/*
@@ -468,11 +638,10 @@ void ctf_move_pos_slow(struct stream_pos *stream_pos, size_t offset, int whence)
 		switch (whence) {
 		case SEEK_CUR:
 			/* The writer will add padding */
-			assert(pos->offset + offset == pos->packet_size);
 			pos->mmap_offset += WRITE_PACKET_LEN / CHAR_BIT;
 			break;
 		case SEEK_SET:
-			assert(offset == 0);	/* only seek supported for now */
+			assert(index == 0);	/* only seek supported for now */
 			pos->cur_index = 0;
 			break;
 		default:
@@ -489,40 +658,58 @@ void ctf_move_pos_slow(struct stream_pos *stream_pos, size_t offset, int whence)
 		switch (whence) {
 		case SEEK_CUR:
 		{
-			uint32_t events_discarded_diff;
+			uint64_t events_discarded_diff;
 
 			if (pos->offset == EOF) {
 				return;
 			}
 			/* For printing discarded event count */
-			index = &g_array_index(pos->packet_index,
+			packet_index = &g_array_index(pos->packet_cycles_index,
+					struct packet_index, pos->cur_index);
+			file_stream->parent.prev_cycles_timestamp_end =
+				packet_index->timestamp_end;
+			file_stream->parent.prev_cycles_timestamp =
+				packet_index->timestamp_begin;
+
+			packet_index = &g_array_index(pos->packet_real_index,
 					struct packet_index, pos->cur_index);
-			events_discarded_diff = index->events_discarded;
-			file_stream->parent.prev_timestamp_end =
-						index->timestamp_end;
+			file_stream->parent.prev_real_timestamp_end =
+						packet_index->timestamp_end;
+			file_stream->parent.prev_real_timestamp =
+				packet_index->timestamp_begin;
+
+			events_discarded_diff = packet_index->events_discarded;
 			if (pos->cur_index > 0) {
-				index = &g_array_index(pos->packet_index,
+				packet_index = &g_array_index(pos->packet_real_index,
 						struct packet_index,
 						pos->cur_index - 1);
-				events_discarded_diff -= index->events_discarded;
+				events_discarded_diff -= packet_index->events_discarded;
+				/*
+				 * Deal with 32-bit wrap-around if the
+				 * tracer provided a 32-bit field.
+				 */
+				if (packet_index->events_discarded_len == 32) {
+					events_discarded_diff = (uint32_t) events_discarded_diff;
+				}
 			}
 			file_stream->parent.events_discarded = events_discarded_diff;
-			file_stream->parent.prev_timestamp = file_stream->parent.timestamp;
+			file_stream->parent.prev_real_timestamp = file_stream->parent.real_timestamp;
+			file_stream->parent.prev_cycles_timestamp = file_stream->parent.cycles_timestamp;
 			/* The reader will expect us to skip padding */
-			assert(pos->offset + offset == pos->content_size);
 			++pos->cur_index;
 			break;
 		}
 		case SEEK_SET:
-			if (offset == 0)
-				pos->cur_index = 0;
-			file_stream->parent.prev_timestamp = 0;
-			file_stream->parent.prev_timestamp_end = 0;
+			pos->cur_index = index;
+			file_stream->parent.prev_real_timestamp = 0;
+			file_stream->parent.prev_real_timestamp_end = 0;
+			file_stream->parent.prev_cycles_timestamp = 0;
+			file_stream->parent.prev_cycles_timestamp_end = 0;
 			break;
 		default:
 			assert(0);
 		}
-		if (pos->cur_index >= pos->packet_index->len) {
+		if (pos->cur_index >= pos->packet_real_index->len) {
 			/*
 			 * When a stream reaches the end of the
 			 * file, we need to show the number of
@@ -531,35 +718,59 @@ void ctf_move_pos_slow(struct stream_pos *stream_pos, size_t offset, int whence)
 			 * be printed in the output.
 			 */
 			if (file_stream->parent.events_discarded) {
-				fflush(stdout);
-				fprintf(stderr, "[warning] Tracer discarded %d events at end of stream between [",
-					file_stream->parent.events_discarded);
-				ctf_print_timestamp(stderr, &file_stream->parent,
-					file_stream->parent.prev_timestamp);
-				fprintf(stderr, "] and [");
-				ctf_print_timestamp(stderr, &file_stream->parent,
-					file_stream->parent.prev_timestamp_end);
-				fprintf(stderr, "]. You should consider increasing the buffer size.\n");
-				fflush(stderr);
+				/*
+				 * We need to check if we are in trace
+				 * read or called from packet indexing.
+				 * In this last case, the collection is
+				 * not there, so we cannot print the
+				 * timestamps.
+				 */
+				if ((&file_stream->parent)->stream_class->trace->collection) {
+					fflush(stdout);
+					fprintf(stderr, "[warning] Tracer discarded %" PRIu64 " events at end of stream between [",
+							file_stream->parent.events_discarded);
+					if (opt_clock_cycles) {
+						ctf_print_timestamp(stderr,
+								&file_stream->parent,
+								file_stream->parent.prev_cycles_timestamp);
+						fprintf(stderr, "] and [");
+						ctf_print_timestamp(stderr, &file_stream->parent,
+								file_stream->parent.prev_cycles_timestamp_end);
+					} else {
+						ctf_print_timestamp(stderr,
+								&file_stream->parent,
+								file_stream->parent.prev_real_timestamp);
+						fprintf(stderr, "] and [");
+						ctf_print_timestamp(stderr, &file_stream->parent,
+								file_stream->parent.prev_real_timestamp_end);
+					}
+					fprintf(stderr, "]. You should consider recording a new trace with larger buffers or with fewer events enabled.\n");
+					fflush(stderr);
+				}
 				file_stream->parent.events_discarded = 0;
 			}
 			pos->offset = EOF;
 			return;
 		}
-		index = &g_array_index(pos->packet_index, struct packet_index,
-				       pos->cur_index);
-		pos->mmap_offset = index->offset;
+		packet_index = &g_array_index(pos->packet_cycles_index,
+				struct packet_index,
+				pos->cur_index);
+		file_stream->parent.cycles_timestamp = packet_index->timestamp_begin;
+
+		packet_index = &g_array_index(pos->packet_real_index,
+				struct packet_index,
+				pos->cur_index);
+		file_stream->parent.real_timestamp = packet_index->timestamp_begin;
+		pos->mmap_offset = packet_index->offset;
 
 		/* Lookup context/packet size in index */
-		file_stream->parent.timestamp = index->timestamp_begin;
-		pos->content_size = index->content_size;
-		pos->packet_size = index->packet_size;
-		if (index->data_offset < index->content_size) {
+		pos->content_size = packet_index->content_size;
+		pos->packet_size = packet_index->packet_size;
+		if (packet_index->data_offset < packet_index->content_size) {
 			pos->offset = 0;	/* will read headers */
-		} else if (index->data_offset == index->content_size) {
+		} else if (packet_index->data_offset == packet_index->content_size) {
 			/* empty packet */
-			pos->offset = index->data_offset;
-			offset = 0;
+			pos->offset = packet_index->data_offset;
 			whence = SEEK_CUR;
 			goto read_next_packet;
 		} else {
@@ -568,9 +779,9 @@ void ctf_move_pos_slow(struct stream_pos *stream_pos, size_t offset, int whence)
 		}
 	}
 	/* map new base. Need mapping length from header. */
-	pos->base = mmap(NULL, pos->packet_size / CHAR_BIT, pos->prot,
-			 pos->flags, pos->fd, pos->mmap_offset);
-	if (pos->base == MAP_FAILED) {
+	pos->base_mma = mmap_align(pos->packet_size / CHAR_BIT, pos->prot,
+			pos->flags, pos->fd, pos->mmap_offset);
+	if (pos->base_mma == MAP_FAILED) {
 		fprintf(stderr, "[error] mmap error %s.\n",
 			strerror(errno));
 		assert(0);
@@ -683,7 +894,7 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
 		memcpy(td->uuid, header.uuid, sizeof(header.uuid));
 		CTF_TRACE_SET_FIELD(td, uuid);
 	} else {
-		if (uuid_compare(header.uuid, td->uuid))
+		if (babeltrace_uuid_compare(header.uuid, td->uuid))
 			return -EINVAL;
 	}
 
@@ -742,7 +953,7 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
 	 * because its size includes garbage at the end (after final
 	 * \0). This is the allocated size, not the actual string size.
 	 */
-	out = open_memstream(buf, &size);
+	out = babeltrace_open_memstream(buf, &size);
 	if (out == NULL) {
 		perror("Metadata open_memstream");
 		return -errno;
@@ -757,10 +968,16 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
 			break;
 		}
 	}
-	fclose(out);	/* flush the buffer */
+	/* close to flush the buffer */
+	ret = babeltrace_close_memstream(buf, &size, out);
+	if (ret < 0) {
+		perror("babeltrace_flush_memstream");
+		fclose(in);
+		return -errno;
+	}
 	fclose(in);
 	/* open for reading */
-	*fp = fmemopen(*buf, strlen(*buf), "rb");
+	*fp = babeltrace_fmemopen(*buf, strlen(*buf), "rb");
 	if (!*fp) {
 		perror("Metadata fmemopen");
 		return -errno;
@@ -770,7 +987,7 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
 
 static
 int ctf_open_trace_metadata_read(struct ctf_trace *td,
-		void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+		void (*packet_seek)(struct stream_pos *pos, size_t index,
 			int whence), FILE *metadata_fp)
 {
 	struct ctf_scanner *scanner;
@@ -780,17 +997,19 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td,
 	int ret = 0;
 
 	metadata_stream = g_new0(struct ctf_file_stream, 1);
+	metadata_stream->pos.last_offset = LAST_OFFSET_POISON;
 
-	if (move_pos_slow) {
-		metadata_stream->pos.move_pos_slow = move_pos_slow;
+	if (packet_seek) {
+		metadata_stream->pos.packet_seek = packet_seek;
 	} else {
-		fprintf(stderr, "[error] move_pos_slow function undefined.\n");
+		fprintf(stderr, "[error] packet_seek function undefined.\n");
 		ret = -1;
 		goto end_stream;
 	}
 
 	if (metadata_fp) {
 		fp = metadata_fp;
+		metadata_stream->pos.fd = -1;
 	} else {
 		td->metadata = &metadata_stream->parent;
 		metadata_stream->pos.fd = openat(td->dirfd, "metadata", O_RDONLY);
@@ -866,21 +1085,23 @@ end:
 	ctf_scanner_free(scanner);
 end_scanner_alloc:
 end_packet_read:
-	fclose(fp);
+	if (fp)
+		fclose(fp);
 	free(buf);
 end_stream:
-	close(metadata_stream->pos.fd);
+	if (metadata_stream->pos.fd >= 0)
+		close(metadata_stream->pos.fd);
 	if (ret)
 		g_free(metadata_stream);
 	return ret;
 }
 
 static
-struct ctf_stream_event *create_event_definitions(struct ctf_trace *td,
-						  struct ctf_stream *stream,
-						  struct ctf_event *event)
+struct ctf_event_definition *create_event_definitions(struct ctf_trace *td,
+						  struct ctf_stream_definition *stream,
+						  struct ctf_event_declaration *event)
 {
-	struct ctf_stream_event *stream_event = g_new0(struct ctf_stream_event, 1);
+	struct ctf_event_definition *stream_event = g_new0(struct ctf_event_definition, 1);
 
 	if (event->context_decl) {
 		struct definition *definition =
@@ -904,6 +1125,7 @@ struct ctf_stream_event *create_event_definitions(struct ctf_trace *td,
 					struct definition_struct, p);
 		stream->parent_def_scope = stream_event->event_fields->p.scope;
 	}
+	stream_event->stream = stream;
 	return stream_event;
 
 error:
@@ -915,9 +1137,9 @@ error:
 }
 
 static
-int create_stream_definitions(struct ctf_trace *td, struct ctf_stream *stream)
+int create_stream_definitions(struct ctf_trace *td, struct ctf_stream_definition *stream)
 {
-	struct ctf_stream_class *stream_class;
+	struct ctf_stream_declaration *stream_class;
 	int ret;
 	int i;
 
@@ -965,8 +1187,8 @@ int create_stream_definitions(struct ctf_trace *td, struct ctf_stream *stream)
 	stream->events_by_id = g_ptr_array_new();
 	g_ptr_array_set_size(stream->events_by_id, stream_class->events_by_id->len);
 	for (i = 0; i < stream->events_by_id->len; i++) {
-		struct ctf_event *event = g_ptr_array_index(stream_class->events_by_id, i);
-		struct ctf_stream_event *stream_event;
+		struct ctf_event_declaration *event = g_ptr_array_index(stream_class->events_by_id, i);
+		struct ctf_event_definition *stream_event;
 
 		if (!event)
 			continue;
@@ -979,7 +1201,7 @@ int create_stream_definitions(struct ctf_trace *td, struct ctf_stream *stream)
 
 error_event:
 	for (i = 0; i < stream->events_by_id->len; i++) {
-		struct ctf_stream_event *stream_event = g_ptr_array_index(stream->events_by_id, i);
+		struct ctf_event_definition *stream_event = g_ptr_array_index(stream->events_by_id, i);
 		if (stream_event)
 			g_free(stream_event);
 	}
@@ -999,7 +1221,7 @@ static
 int create_stream_packet_index(struct ctf_trace *td,
 			       struct ctf_file_stream *file_stream)
 {
-	struct ctf_stream_class *stream;
+	struct ctf_stream_declaration *stream;
 	int len_index;
 	struct ctf_stream_pos *pos;
 	struct stat filestats;
@@ -1019,19 +1241,20 @@ int create_stream_packet_index(struct ctf_trace *td,
 	for (pos->mmap_offset = 0; pos->mmap_offset < filestats.st_size; ) {
 		uint64_t stream_id = 0;
 
-		if (pos->base) {
+		if (pos->base_mma) {
 			/* unmap old base */
-			ret = munmap(pos->base, pos->packet_size / CHAR_BIT);
+			ret = munmap_align(pos->base_mma);
 			if (ret) {
 				fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
 					strerror(errno));
 				return ret;
 			}
-			pos->base = NULL;
+			pos->base_mma = NULL;
 		}
 		/* map new base. Need mapping length from header. */
-		pos->base = mmap(NULL, MAX_PACKET_HEADER_LEN / CHAR_BIT, PROT_READ,
+		pos->base_mma = mmap_align(MAX_PACKET_HEADER_LEN / CHAR_BIT, PROT_READ,
 				 MAP_PRIVATE, pos->fd, pos->mmap_offset);
+		assert(pos->base_mma != MAP_FAILED);
 		pos->content_size = MAX_PACKET_HEADER_LEN;	/* Unknown at this point */
 		pos->packet_size = MAX_PACKET_HEADER_LEN;	/* Unknown at this point */
 		pos->offset = 0;	/* Position of the packet header */
@@ -1059,7 +1282,7 @@ int create_stream_packet_index(struct ctf_trace *td,
 				if (magic != CTF_MAGIC) {
 					fprintf(stderr, "[error] Invalid magic number 0x%" PRIX64 " at packet %u (file offset %zd).\n",
 							magic,
-							file_stream->pos.packet_index->len,
+							file_stream->pos.packet_cycles_index->len,
 							(ssize_t) pos->mmap_offset);
 					return -EINVAL;
 				}
@@ -1071,20 +1294,20 @@ int create_stream_packet_index(struct ctf_trace *td,
 				struct definition_array *defarray;
 				struct definition *field;
 				uint64_t i;
-				uint8_t uuidval[UUID_LEN];
+				uint8_t uuidval[BABELTRACE_UUID_LEN];
 
 				field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
 				assert(field->declaration->id == CTF_TYPE_ARRAY);
 				defarray = container_of(field, struct definition_array, p);
-				assert(array_len(defarray) == UUID_LEN);
+				assert(array_len(defarray) == BABELTRACE_UUID_LEN);
 
-				for (i = 0; i < UUID_LEN; i++) {
+				for (i = 0; i < BABELTRACE_UUID_LEN; i++) {
 					struct definition *elem;
 
 					elem = array_index(defarray, i);
 					uuidval[i] = get_unsigned_int(elem);
 				}
-				ret = uuid_compare(td->uuid, uuidval);
+				ret = babeltrace_uuid_compare(td->uuid, uuidval);
 				if (ret) {
 					fprintf(stderr, "[error] Unique Universal Identifiers do not match.\n");
 					return -EINVAL;
@@ -1159,6 +1382,12 @@ int create_stream_packet_index(struct ctf_trace *td,
 
 				field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
 				packet_index.timestamp_begin = get_unsigned_int(field);
+				if (file_stream->parent.stream_class->trace->collection) {
+					packet_index.timestamp_begin =
+						ctf_get_real_timestamp(
+							&file_stream->parent,
+							packet_index.timestamp_begin);
+				}
 			}
 
 			/* read timestamp end from header */
@@ -1168,6 +1397,12 @@ int create_stream_packet_index(struct ctf_trace *td,
 
 				field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
 				packet_index.timestamp_end = get_unsigned_int(field);
+				if (file_stream->parent.stream_class->trace->collection) {
+					packet_index.timestamp_end =
+						ctf_get_real_timestamp(
+							&file_stream->parent,
+							packet_index.timestamp_end);
+				}
 			}
 
 			/* read events discarded from header */
@@ -1177,6 +1412,7 @@ int create_stream_packet_index(struct ctf_trace *td,
 
 				field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
 				packet_index.events_discarded = get_unsigned_int(field);
+				packet_index.events_discarded_len = get_int_len(field);
 			}
 		} else {
 			/* Use file size for packet size */
@@ -1194,7 +1430,7 @@ int create_stream_packet_index(struct ctf_trace *td,
 
 		if (packet_index.packet_size > ((uint64_t)filestats.st_size - packet_index.offset) * CHAR_BIT) {
 			fprintf(stderr, "[error] Packet size (%" PRIu64 " bits) is larger than remaining file size (%" PRIu64 " bits).\n",
-				packet_index.content_size, ((uint64_t)filestats.st_size - packet_index.offset) * CHAR_BIT);
+				packet_index.packet_size, ((uint64_t)filestats.st_size - packet_index.offset) * CHAR_BIT);
 			return -EINVAL;
 		}
 
@@ -1202,19 +1438,16 @@ int create_stream_packet_index(struct ctf_trace *td,
 		packet_index.data_offset = pos->offset;
 
 		/* add index to packet array */
-		g_array_append_val(file_stream->pos.packet_index, packet_index);
+		g_array_append_val(file_stream->pos.packet_cycles_index, packet_index);
 
 		pos->mmap_offset += packet_index.packet_size / CHAR_BIT;
 	}
 
-	/* Move pos back to beginning of file */
-	ctf_move_pos_slow(&pos->parent, 0, SEEK_SET);	/* position for write */
-
 	return 0;
 }
 
 static
-int create_trace_definitions(struct ctf_trace *td, struct ctf_stream *stream)
+int create_trace_definitions(struct ctf_trace *td, struct ctf_stream_definition *stream)
 {
 	int ret;
 
@@ -1243,33 +1476,49 @@ error:
  */
 static
 int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags,
-		void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+		void (*packet_seek)(struct stream_pos *pos, size_t index,
 			int whence))
 {
-	int ret;
+	int ret, fd;
 	struct ctf_file_stream *file_stream;
+	struct stat statbuf;
 
-	ret = openat(td->dirfd, path, flags);
-	if (ret < 0) {
+	fd = openat(td->dirfd, path, flags);
+	if (fd < 0) {
 		perror("File stream openat()");
+		ret = fd;
 		goto error;
 	}
+
+	/* Don't try to mmap subdirectories. Skip them, return success. */
+	ret = fstat(fd, &statbuf);
+	if (ret) {
+		perror("File stream fstat()");
+		goto fstat_error;
+	}
+	if (S_ISDIR(statbuf.st_mode)) {
+		fprintf(stderr, "[warning] Skipping directory '%s' found in trace\n", path);
+		ret = 0;
+		goto fd_is_dir_ok;
+	}
+
 	file_stream = g_new0(struct ctf_file_stream, 1);
+	file_stream->pos.last_offset = LAST_OFFSET_POISON;
 
-	if (move_pos_slow) {
-		file_stream->pos.move_pos_slow = move_pos_slow;
+	if (packet_seek) {
+		file_stream->pos.packet_seek = packet_seek;
 	} else {
-		fprintf(stderr, "[error] move_pos_slow function undefined.\n");
+		fprintf(stderr, "[error] packet_seek function undefined.\n");
 		ret = -1;
 		goto error_def;
 	}
 
-	ctf_init_pos(&file_stream->pos, ret, flags);
+	ctf_init_pos(&file_stream->pos, fd, flags);
 	ret = create_trace_definitions(td, &file_stream->parent);
 	if (ret)
 		goto error_def;
 	/*
-	 * For now, only a single slock is supported.
+	 * For now, only a single clock per trace is supported.
 	 */
 	file_stream->parent.current_clock = td->single_clock;
 	ret = create_stream_packet_index(td, file_stream);
@@ -1285,8 +1534,10 @@ error_index:
 		definition_unref(&file_stream->parent.trace_packet_header->p);
 error_def:
 	ctf_fini_pos(&file_stream->pos);
-	close(file_stream->pos.fd);
 	g_free(file_stream);
+fd_is_dir_ok:
+fstat_error:
+	close(fd);
 error:
 	return ret;
 }
@@ -1294,7 +1545,7 @@ error:
 static
 int ctf_open_trace_read(struct ctf_trace *td,
 		const char *path, int flags,
-		void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+		void (*packet_seek)(struct stream_pos *pos, size_t index,
 			int whence), FILE *metadata_fp)
 {
 	int ret;
@@ -1307,14 +1558,14 @@ int ctf_open_trace_read(struct ctf_trace *td,
 	/* Open trace directory */
 	td->dir = opendir(path);
 	if (!td->dir) {
-		fprintf(stderr, "[error] Unable to open trace directory.\n");
+		fprintf(stderr, "[error] Unable to open trace directory \"%s\".\n", path);
 		ret = -ENOENT;
 		goto error;
 	}
 
 	td->dirfd = open(path, 0);
 	if (td->dirfd < 0) {
-		fprintf(stderr, "[error] Unable to open trace directory file descriptor.\n");
+		fprintf(stderr, "[error] Unable to open trace directory file descriptor for path \"%s\".\n", path);
 		perror("Trace directory open");
 		ret = -errno;
 		goto error_dirfd;
@@ -1326,8 +1577,9 @@ int ctf_open_trace_read(struct ctf_trace *td,
 	 * Keep the metadata file separate.
 	 */
 
-	ret = ctf_open_trace_metadata_read(td, move_pos_slow, metadata_fp);
+	ret = ctf_open_trace_metadata_read(td, packet_seek, metadata_fp);
 	if (ret) {
+		fprintf(stderr, "[warning] Unable to open trace metadata for path \"%s\".\n", path);
 		goto error_metadata;
 	}
 
@@ -1355,7 +1607,8 @@ int ctf_open_trace_read(struct ctf_trace *td,
 				|| !strcmp(diriter->d_name, "..")
 				|| !strcmp(diriter->d_name, "metadata"))
 			continue;
-		ret = ctf_open_file_stream_read(td, diriter->d_name, flags, move_pos_slow);
+		ret = ctf_open_file_stream_read(td, diriter->d_name,
+					flags, packet_seek);
 		if (ret) {
 			fprintf(stderr, "[error] Open file stream error.\n");
 			goto readdir_error;
@@ -1375,14 +1628,25 @@ error:
 	return ret;
 }
 
+/*
+ * ctf_open_trace: Open a CTF trace and index it.
+ * Note that the user must seek the trace after the open (using the iterator)
+ * since the index creation read it entirely.
+ */
 static
 struct trace_descriptor *ctf_open_trace(const char *path, int flags,
-		void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+		void (*packet_seek)(struct stream_pos *pos, size_t index,
 			int whence), FILE *metadata_fp)
 {
 	struct ctf_trace *td;
 	int ret;
 
+	/*
+	 * If packet_seek is NULL, we provide our default version.
+	 */
+	if (!packet_seek)
+		packet_seek = ctf_packet_seek;
+
 	td = g_new0(struct ctf_trace, 1);
 
 	switch (flags & O_ACCMODE) {
@@ -1391,7 +1655,7 @@ struct trace_descriptor *ctf_open_trace(const char *path, int flags,
 			fprintf(stderr, "[error] Path missing for input CTF trace.\n");
 			goto error;
 		}
-		ret = ctf_open_trace_read(td, path, flags, move_pos_slow, metadata_fp);
+		ret = ctf_open_trace_read(td, path, flags, packet_seek, metadata_fp);
 		if (ret)
 			goto error;
 		break;
@@ -1418,11 +1682,12 @@ void ctf_init_mmap_pos(struct ctf_stream_pos *pos,
 	pos->content_size = 0;
 	pos->content_size_loc = NULL;
 	pos->fd = mmap_info->fd;
-	pos->base = 0;
+	pos->base_mma = NULL;
 	pos->offset = 0;
 	pos->dummy = false;
 	pos->cur_index = 0;
-	pos->packet_index = NULL;
+	pos->packet_cycles_index = NULL;
+	pos->packet_real_index = NULL;
 	pos->prot = PROT_READ;
 	pos->flags = MAP_PRIVATE;
 	pos->parent.rw_table = read_dispatch_table;
@@ -1433,7 +1698,7 @@ static
 int prepare_mmap_stream_definition(struct ctf_trace *td,
 		struct ctf_file_stream *file_stream)
 {
-	struct ctf_stream_class *stream;
+	struct ctf_stream_declaration *stream;
 	uint64_t stream_id = 0;
 	int ret;
 
@@ -1460,16 +1725,17 @@ end:
 static
 int ctf_open_mmap_stream_read(struct ctf_trace *td,
 		struct mmap_stream *mmap_info,
-		void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+		void (*packet_seek)(struct stream_pos *pos, size_t index,
 			int whence))
 {
 	int ret;
 	struct ctf_file_stream *file_stream;
 
 	file_stream = g_new0(struct ctf_file_stream, 1);
+	file_stream->pos.last_offset = LAST_OFFSET_POISON;
 	ctf_init_mmap_pos(&file_stream->pos, mmap_info);
 
-	file_stream->pos.move_pos_slow = move_pos_slow;
+	file_stream->pos.packet_seek = packet_seek;
 
 	ret = create_trace_definitions(td, &file_stream->parent);
 	if (ret) {
@@ -1480,6 +1746,11 @@ int ctf_open_mmap_stream_read(struct ctf_trace *td,
 	if (ret)
 		goto error_index;
 
+	/*
+	 * For now, only a single clock per trace is supported.
+	 */
+	file_stream->parent.current_clock = td->single_clock;
+
 	/* Add stream file to stream class */
 	g_ptr_array_add(file_stream->parent.stream_class->streams,
 			&file_stream->parent);
@@ -1495,14 +1766,14 @@ error_def:
 
 int ctf_open_mmap_trace_read(struct ctf_trace *td,
 		struct mmap_stream_list *mmap_list,
-		void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+		void (*packet_seek)(struct stream_pos *pos, size_t index,
 			int whence),
 		FILE *metadata_fp)
 {
 	int ret;
 	struct mmap_stream *mmap_info;
 
-	ret = ctf_open_trace_metadata_read(td, ctf_move_pos_slow, metadata_fp);
+	ret = ctf_open_trace_metadata_read(td, ctf_packet_seek, metadata_fp);
 	if (ret) {
 		goto error;
 	}
@@ -1512,7 +1783,7 @@ int ctf_open_mmap_trace_read(struct ctf_trace *td,
 	 * stream ID to add to the right location in the stream array.
 	 */
 	bt_list_for_each_entry(mmap_info, &mmap_list->head, list) {
-		ret = ctf_open_mmap_stream_read(td, mmap_info, move_pos_slow);
+		ret = ctf_open_mmap_stream_read(td, mmap_info, packet_seek);
 		if (ret) {
 			fprintf(stderr, "[error] Open file mmap stream error.\n");
 			goto error;
@@ -1528,7 +1799,8 @@ error:
 static
 struct trace_descriptor *ctf_open_mmap_trace(
 		struct mmap_stream_list *mmap_list,
-		void (*move_pos_slow)(struct stream_pos *pos, size_t offset, int whence),
+		void (*packet_seek)(struct stream_pos *pos, size_t index,
+			int whence),
 		FILE *metadata_fp)
 {
 	struct ctf_trace *td;
@@ -1539,12 +1811,12 @@ struct trace_descriptor *ctf_open_mmap_trace(
 				"required for mmap parsing\n");
 		goto error;
 	}
-	if (!move_pos_slow) {
-		fprintf(stderr, "[error] move_pos_slow function undefined.\n");
+	if (!packet_seek) {
+		fprintf(stderr, "[error] packet_seek function undefined.\n");
 		goto error;
 	}
 	td = g_new0(struct ctf_trace, 1);
-	ret = ctf_open_mmap_trace_read(td, mmap_list, move_pos_slow, metadata_fp);
+	ret = ctf_open_mmap_trace_read(td, mmap_list, packet_seek, metadata_fp);
 	if (ret)
 		goto error_free;
 
@@ -1556,6 +1828,56 @@ error:
 	return NULL;
 }
 
+static
+int ctf_convert_index_timestamp(struct trace_descriptor *tdp)
+{
+	int i, j, k;
+	struct ctf_trace *td = container_of(tdp, struct ctf_trace, parent);
+
+	/* for each stream_class */
+	for (i = 0; i < td->streams->len; i++) {
+		struct ctf_stream_declaration *stream_class;
+
+		stream_class = g_ptr_array_index(td->streams, i);
+		if (!stream_class)
+			continue;
+		/* for each file_stream */
+		for (j = 0; j < stream_class->streams->len; j++) {
+			struct ctf_stream_definition *stream;
+			struct ctf_stream_pos *stream_pos;
+			struct ctf_file_stream *cfs;
+
+			stream = g_ptr_array_index(stream_class->streams, j);
+			if (!stream)
+				continue;
+			cfs = container_of(stream, struct ctf_file_stream,
+					parent);
+			stream_pos = &cfs->pos;
+			if (!stream_pos->packet_cycles_index)
+				continue;
+
+			for (k = 0; k < stream_pos->packet_cycles_index->len; k++) {
+				struct packet_index *index;
+				struct packet_index new_index;
+
+				index = &g_array_index(stream_pos->packet_cycles_index,
+						struct packet_index, k);
+				memcpy(&new_index, index,
+						sizeof(struct packet_index));
+				new_index.timestamp_begin =
+					ctf_get_real_timestamp(stream,
+							index->timestamp_begin);
+				new_index.timestamp_end =
+					ctf_get_real_timestamp(stream,
+							index->timestamp_end);
+				g_array_append_val(stream_pos->packet_real_index,
+						new_index);
+			}
+		}
+	}
+	return 0;
+}
+
 static
 void ctf_close_file_stream(struct ctf_file_stream *file_stream)
 {
@@ -1571,7 +1893,7 @@ void ctf_close_trace(struct trace_descriptor *tdp)
 
 	if (td->streams) {
 		for (i = 0; i < td->streams->len; i++) {
-			struct ctf_stream_class *stream;
+			struct ctf_stream_declaration *stream;
 			int j;
 
 			stream = g_ptr_array_index(td->streams, i);
@@ -1586,10 +1908,52 @@ void ctf_close_trace(struct trace_descriptor *tdp)
 		}
 		g_ptr_array_free(td->streams, TRUE);
 	}
+
+	if (td->event_declarations) {
+		for (i = 0; i < td->event_declarations->len; i++) {
+			struct bt_ctf_event_decl *event;
+
+			event = g_ptr_array_index(td->event_declarations, i);
+			if (event->context_decl)
+				g_ptr_array_free(event->context_decl, TRUE);
+			if (event->fields_decl)
+				g_ptr_array_free(event->fields_decl, TRUE);
+			if (event->packet_header_decl)
+				g_ptr_array_free(event->packet_header_decl, TRUE);
+			if (event->event_context_decl)
+				g_ptr_array_free(event->event_context_decl, TRUE);
+			if (event->event_header_decl)
+				g_ptr_array_free(event->event_header_decl, TRUE);
+			if (event->packet_context_decl)
+				g_ptr_array_free(event->packet_context_decl, TRUE);
+			g_free(event);
+		}
+		g_ptr_array_free(td->event_declarations, TRUE);
+	}
 	closedir(td->dir);
 	g_free(td);
 }
 
+static
+void ctf_set_context(struct trace_descriptor *descriptor,
+		struct bt_context *ctx)
+{
+	struct ctf_trace *td = container_of(descriptor, struct ctf_trace,
+			parent);
+
+	td->ctx = ctx;
+}
+
+static
+void ctf_set_handle(struct trace_descriptor *descriptor,
+		struct bt_trace_handle *handle)
+{
+	struct ctf_trace *td = container_of(descriptor, struct ctf_trace,
+			parent);
+
+	td->handle = handle;
+}
+
 void __attribute__((constructor)) ctf_init(void)
 {
 	int ret;