X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=6bb31e55f4efb31346fcdc8ee14457565734a619;hp=3bd1cc1e2b454ce190102c4924eb1bb7fba49176;hb=4c62e2d877007dd15b590972aece3b869820333f;hpb=c150f912b9a128f830d7a0fe42141ae1c9bec1ae

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 3bd1cc1e..6bb31e55 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -53,11 +53,16 @@
 #include "events-private.h"
 #include "memstream.h"
 
+#define LOG2_CHAR_BIT	3
+
+/*
+ * Length of first attempt at mapping a packet header, in bits.
+ */
+#define DEFAULT_HEADER_LEN	(getpagesize() * CHAR_BIT)
+
 /*
- * We currently simply map a page to read the packet header and packet
- * context to get the packet length and content length. (in bits)
+ * Lenght of packet to write, in bits.
  */
-#define MAX_PACKET_HEADER_LEN	(getpagesize() * CHAR_BIT)
 #define WRITE_PACKET_LEN	(getpagesize() * 8 * CHAR_BIT)
 
 #ifndef min
@@ -129,7 +134,7 @@ rw_dispatch write_dispatch_table[] = {
 };
 
 static
-struct format ctf_format = {
+struct bt_format ctf_format = {
 	.open_trace = ctf_open_trace,
 	.open_mmap_trace = ctf_open_mmap_trace,
 	.close_trace = ctf_close_trace,
@@ -391,6 +396,49 @@ void ctf_print_timestamp(FILE *fp,
 	}
 }
 
+static
+void print_uuid(FILE *fp, unsigned char *uuid)
+{
+	int i;
+
+	for (i = 0; i < BABELTRACE_UUID_LEN; i++)
+		fprintf(fp, "%x", (unsigned int) uuid[i]);
+}
+
+void ctf_print_discarded(FILE *fp, struct ctf_stream_definition *stream,
+		int end_stream)
+{
+	fprintf(fp, "[warning] Tracer discarded %" PRIu64 " events %sbetween [",
+		stream->events_discarded,
+		end_stream ? "at end of stream " : "");
+	if (opt_clock_cycles) {
+		ctf_print_timestamp(fp, stream,
+				stream->prev_cycles_timestamp);
+		fprintf(fp, "] and [");
+		ctf_print_timestamp(fp, stream,
+				stream->prev_cycles_timestamp_end);
+	} else {
+		ctf_print_timestamp(fp, stream,
+				stream->prev_real_timestamp);
+		fprintf(fp, "] and [");
+		ctf_print_timestamp(fp, stream,
+				stream->prev_real_timestamp_end);
+	}
+	fprintf(fp, "] in trace UUID ");
+	print_uuid(fp, stream->stream_class->trace->uuid);
+	if (stream->stream_class->trace->parent.path[0])
+		fprintf(fp, ", at path: \"%s\"",
+			stream->stream_class->trace->parent.path);
+
+	fprintf(fp, ", within stream id %" PRIu64, stream->stream_id);
+	if (stream->path[0])
+		fprintf(fp, ", at relative path: \"%s\"", stream->path);
+	fprintf(fp, ". ");
+	fprintf(fp, "You should consider recording a new trace with larger "
+		"buffers or with fewer events enabled.\n");
+	fflush(fp);
+}
+
 static
 int ctf_read_event(struct bt_stream_pos *ppos, struct ctf_stream_definition *stream)
 {
@@ -421,7 +469,7 @@ int ctf_read_event(struct bt_stream_pos *ppos, struct ctf_stream_definition *str
 	/* Read event header */
 	if (likely(stream->stream_event_header)) {
 		struct definition_integer *integer_definition;
-		struct definition *variant;
+		struct bt_definition *variant;
 
 		ret = generic_rw(ppos, &stream->stream_event_header->p);
 		if (unlikely(ret))
@@ -558,7 +606,8 @@ error:
 	return ret;
 }
 
-int ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags)
+int ctf_init_pos(struct ctf_stream_pos *pos, struct bt_trace_descriptor *trace,
+		int fd, int open_flags)
 {
 	pos->fd = fd;
 	if (fd >= 0) {
@@ -576,12 +625,14 @@ int ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags)
 		pos->flags = MAP_PRIVATE;
 		pos->parent.rw_table = read_dispatch_table;
 		pos->parent.event_cb = ctf_read_event;
+		pos->parent.trace = trace;
 		break;
 	case O_RDWR:
 		pos->prot = PROT_WRITE;	/* Write has priority */
 		pos->flags = MAP_SHARED;
 		pos->parent.rw_table = write_dispatch_table;
 		pos->parent.event_cb = ctf_write_event;
+		pos->parent.trace = trace;
 		if (fd >= 0)
 			ctf_packet_seek(&pos->parent, 0, SEEK_SET);	/* position for write */
 		break;
@@ -725,43 +776,26 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence)
 		}
 		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
-			 * events discarded ourselves, because
-			 * there is no next event scheduled to
-			 * be printed in the output.
+			 * 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.events_discarded) {
+			if ((&file_stream->parent)->stream_class->trace->parent.collection) {
 				/*
-				 * 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.
+				 * When a stream reaches the end of the
+				 * file, we need to show the number of
+				 * events discarded ourselves, because
+				 * there is no next event scheduled to
+				 * be printed in the output.
 				 */
-				if ((&file_stream->parent)->stream_class->trace->collection) {
+				if (file_stream->parent.events_discarded) {
 					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);
+					ctf_print_discarded(stderr,
+						&file_stream->parent,
+						1);
+					file_stream->parent.events_discarded = 0;
 				}
-				file_stream->parent.events_discarded = 0;
 			}
 			pos->offset = EOF;
 			return;
@@ -1006,7 +1040,7 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
 	buflen = strlen(*buf);
 	if (!buflen) {
 		*fp = NULL;
-		return -ENODATA;
+		return -ENOENT;
 	}
 	*fp = babeltrace_fmemopen(*buf, buflen, "rb");
 	if (!*fp) {
@@ -1070,6 +1104,8 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td,
 			fprintf(stderr, "[warning] Empty metadata.\n");
 			goto end_packet_read;
 		}
+		td->metadata_string = buf;
+		td->metadata_packetized = 1;
 	} else {
 		unsigned int major, minor;
 		ssize_t nr_items;
@@ -1128,7 +1164,6 @@ end_packet_read:
 			perror("Error on fclose");
 		}
 	}
-	free(buf);
 end_stream:
 	if (metadata_stream->pos.fd >= 0) {
 		closeret = close(metadata_stream->pos.fd);
@@ -1150,7 +1185,7 @@ struct ctf_event_definition *create_event_definitions(struct ctf_trace *td,
 	struct ctf_event_definition *stream_event = g_new0(struct ctf_event_definition, 1);
 
 	if (event->context_decl) {
-		struct definition *definition =
+		struct bt_definition *definition =
 			event->context_decl->p.definition_new(&event->context_decl->p,
 				stream->parent_def_scope, 0, 0, "event.context");
 		if (!definition) {
@@ -1161,7 +1196,7 @@ struct ctf_event_definition *create_event_definitions(struct ctf_trace *td,
 		stream->parent_def_scope = stream_event->event_context->p.scope;
 	}
 	if (event->fields_decl) {
-		struct definition *definition =
+		struct bt_definition *definition =
 			event->fields_decl->p.definition_new(&event->fields_decl->p,
 				stream->parent_def_scope, 0, 0, "event.fields");
 		if (!definition) {
@@ -1195,7 +1230,7 @@ int create_stream_definitions(struct ctf_trace *td, struct ctf_stream_definition
 	stream_class = stream->stream_class;
 
 	if (stream_class->packet_context_decl) {
-		struct definition *definition =
+		struct bt_definition *definition =
 			stream_class->packet_context_decl->p.definition_new(&stream_class->packet_context_decl->p,
 				stream->parent_def_scope, 0, 0, "stream.packet.context");
 		if (!definition) {
@@ -1207,7 +1242,7 @@ int create_stream_definitions(struct ctf_trace *td, struct ctf_stream_definition
 		stream->parent_def_scope = stream->stream_packet_context->p.scope;
 	}
 	if (stream_class->event_header_decl) {
-		struct definition *definition =
+		struct bt_definition *definition =
 			stream_class->event_header_decl->p.definition_new(&stream_class->event_header_decl->p,
 				stream->parent_def_scope, 0, 0, "stream.event.header");
 		if (!definition) {
@@ -1219,7 +1254,7 @@ int create_stream_definitions(struct ctf_trace *td, struct ctf_stream_definition
 		stream->parent_def_scope = stream->stream_event_header->p.scope;
 	}
 	if (stream_class->event_context_decl) {
-		struct definition *definition =
+		struct bt_definition *definition =
 			stream_class->event_context_decl->p.definition_new(&stream_class->event_context_decl->p,
 				stream->parent_def_scope, 0, 0, "stream.event.context");
 		if (!definition) {
@@ -1262,234 +1297,282 @@ error:
 	return ret;
 }
 
-
 static
-int create_stream_packet_index(struct ctf_trace *td,
-			       struct ctf_file_stream *file_stream)
+int create_stream_one_packet_index(struct ctf_stream_pos *pos,
+			struct ctf_trace *td,
+			struct ctf_file_stream *file_stream,
+			size_t filesize)
 {
+	struct packet_index packet_index;
 	struct ctf_stream_declaration *stream;
+	uint64_t stream_id = 0;
+	uint64_t packet_map_len = DEFAULT_HEADER_LEN, tmp_map_len;
+	int first_packet = 0;
 	int len_index;
-	struct ctf_stream_pos *pos;
-	struct stat filestats;
-	struct packet_index packet_index;
-	int first_packet = 1;
 	int ret;
 
-	pos = &file_stream->pos;
-
-	ret = fstat(pos->fd, &filestats);
-	if (ret < 0)
-		return ret;
-
-	if (filestats.st_size < MAX_PACKET_HEADER_LEN / CHAR_BIT)
-		return -EINVAL;
+begin:
+	if (!pos->mmap_offset) {
+		first_packet = 1;
+	}
 
-	for (pos->mmap_offset = 0; pos->mmap_offset < filestats.st_size; ) {
-		uint64_t stream_id = 0;
+	if (filesize - pos->mmap_offset < (packet_map_len >> LOG2_CHAR_BIT)) {
+		packet_map_len = (filesize - pos->mmap_offset) << LOG2_CHAR_BIT;
+	}
 
-		if (pos->base_mma) {
-			/* unmap old base */
-			ret = munmap_align(pos->base_mma);
-			if (ret) {
-				fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
-					strerror(errno));
-				return ret;
-			}
-			pos->base_mma = NULL;
+	if (pos->base_mma) {
+		/* unmap old base */
+		ret = munmap_align(pos->base_mma);
+		if (ret) {
+			fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
+				strerror(errno));
+			return ret;
 		}
-		/* map new base. Need mapping length from header. */
-		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 */
-
-		packet_index.offset = pos->mmap_offset;
-		packet_index.content_size = 0;
-		packet_index.packet_size = 0;
-		packet_index.timestamp_begin = 0;
-		packet_index.timestamp_end = 0;
-		packet_index.events_discarded = 0;
-		packet_index.events_discarded_len = 0;
-
-		/* read and check header, set stream id (and check) */
-		if (file_stream->parent.trace_packet_header) {
-			/* Read packet header */
-			ret = generic_rw(&pos->parent, &file_stream->parent.trace_packet_header->p);
-			if (ret)
-				return ret;
-			len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("magic"));
-			if (len_index >= 0) {
-				struct definition *field;
-				uint64_t magic;
-
-				field = bt_struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
-				magic = bt_get_unsigned_int(field);
-				if (magic != CTF_MAGIC) {
-					fprintf(stderr, "[error] Invalid magic number 0x%" PRIX64 " at packet %u (file offset %zd).\n",
-							magic,
-							file_stream->pos.packet_cycles_index->len,
-							(ssize_t) pos->mmap_offset);
-					return -EINVAL;
-				}
+		pos->base_mma = NULL;
+	}
+	/* map new base. Need mapping length from header. */
+	pos->base_mma = mmap_align(packet_map_len >> LOG2_CHAR_BIT, PROT_READ,
+			 MAP_PRIVATE, pos->fd, pos->mmap_offset);
+	assert(pos->base_mma != MAP_FAILED);
+	/*
+	 * Use current mapping size as temporary content and packet
+	 * size.
+	 */
+	pos->content_size = packet_map_len;
+	pos->packet_size = packet_map_len;
+	pos->offset = 0;	/* Position of the packet header */
+
+	packet_index.offset = pos->mmap_offset;
+	packet_index.content_size = 0;
+	packet_index.packet_size = 0;
+	packet_index.timestamp_begin = 0;
+	packet_index.timestamp_end = 0;
+	packet_index.events_discarded = 0;
+	packet_index.events_discarded_len = 0;
+
+	/* read and check header, set stream id (and check) */
+	if (file_stream->parent.trace_packet_header) {
+		/* Read packet header */
+		ret = generic_rw(&pos->parent, &file_stream->parent.trace_packet_header->p);
+		if (ret) {
+			if (ret == -EFAULT)
+				goto retry;
+			return ret;
+		}
+		len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("magic"));
+		if (len_index >= 0) {
+			struct bt_definition *field;
+			uint64_t magic;
+
+			field = bt_struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
+			magic = bt_get_unsigned_int(field);
+			if (magic != CTF_MAGIC) {
+				fprintf(stderr, "[error] Invalid magic number 0x%" PRIX64 " at packet %u (file offset %zd).\n",
+						magic,
+						file_stream->pos.packet_cycles_index->len,
+						(ssize_t) pos->mmap_offset);
+				return -EINVAL;
 			}
+		}
 
-			/* check uuid */
-			len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("uuid"));
-			if (len_index >= 0) {
-				struct definition_array *defarray;
-				struct definition *field;
-				uint64_t i;
-				uint8_t uuidval[BABELTRACE_UUID_LEN];
+		/* check uuid */
+		len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("uuid"));
+		if (len_index >= 0) {
+			struct definition_array *defarray;
+			struct bt_definition *field;
+			uint64_t i;
+			uint8_t uuidval[BABELTRACE_UUID_LEN];
 
-				field = bt_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(bt_array_len(defarray) == BABELTRACE_UUID_LEN);
+			field = bt_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(bt_array_len(defarray) == BABELTRACE_UUID_LEN);
 
-				for (i = 0; i < BABELTRACE_UUID_LEN; i++) {
-					struct definition *elem;
+			for (i = 0; i < BABELTRACE_UUID_LEN; i++) {
+				struct bt_definition *elem;
 
-					elem = bt_array_index(defarray, i);
-					uuidval[i] = bt_get_unsigned_int(elem);
-				}
-				ret = babeltrace_uuid_compare(td->uuid, uuidval);
-				if (ret) {
-					fprintf(stderr, "[error] Unique Universal Identifiers do not match.\n");
-					return -EINVAL;
-				}
+				elem = bt_array_index(defarray, i);
+				uuidval[i] = bt_get_unsigned_int(elem);
 			}
+			ret = babeltrace_uuid_compare(td->uuid, uuidval);
+			if (ret) {
+				fprintf(stderr, "[error] Unique Universal Identifiers do not match.\n");
+				return -EINVAL;
+			}
+		}
 
+		len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("stream_id"));
+		if (len_index >= 0) {
+			struct bt_definition *field;
 
-			len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("stream_id"));
-			if (len_index >= 0) {
-				struct definition *field;
-
-				field = bt_struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
-				stream_id = bt_get_unsigned_int(field);
-			}
+			field = bt_struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
+			stream_id = bt_get_unsigned_int(field);
 		}
+	}
 
-		if (!first_packet && file_stream->parent.stream_id != stream_id) {
-			fprintf(stderr, "[error] Stream ID is changing within a stream.\n");
+	if (!first_packet && file_stream->parent.stream_id != stream_id) {
+		fprintf(stderr, "[error] Stream ID is changing within a stream: expecting %" PRIu64 ", but packet has %" PRIu64 "\n",
+			stream_id,
+			file_stream->parent.stream_id);
+		return -EINVAL;
+	}
+	if (first_packet) {
+		file_stream->parent.stream_id = stream_id;
+		if (stream_id >= td->streams->len) {
+			fprintf(stderr, "[error] Stream %" PRIu64 " is not declared in metadata.\n", stream_id);
 			return -EINVAL;
 		}
-		if (first_packet) {
-			file_stream->parent.stream_id = stream_id;
-			if (stream_id >= td->streams->len) {
-				fprintf(stderr, "[error] Stream %" PRIu64 " is not declared in metadata.\n", stream_id);
-				return -EINVAL;
-			}
-			stream = g_ptr_array_index(td->streams, stream_id);
-			if (!stream) {
-				fprintf(stderr, "[error] Stream %" PRIu64 " is not declared in metadata.\n", stream_id);
-				return -EINVAL;
-			}
-			file_stream->parent.stream_class = stream;
-			ret = create_stream_definitions(td, &file_stream->parent);
-			if (ret)
-				return ret;
+		stream = g_ptr_array_index(td->streams, stream_id);
+		if (!stream) {
+			fprintf(stderr, "[error] Stream %" PRIu64 " is not declared in metadata.\n", stream_id);
+			return -EINVAL;
 		}
-		first_packet = 0;
-
-		if (file_stream->parent.stream_packet_context) {
-			/* Read packet context */
-			ret = generic_rw(&pos->parent, &file_stream->parent.stream_packet_context->p);
-			if (ret)
-				return ret;
-			/* read content size from header */
-			len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("content_size"));
-			if (len_index >= 0) {
-				struct definition *field;
-
-				field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
-				packet_index.content_size = bt_get_unsigned_int(field);
-			} else {
-				/* Use file size for packet size */
-				packet_index.content_size = filestats.st_size * CHAR_BIT;
-			}
-
-			/* read packet size from header */
-			len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("packet_size"));
-			if (len_index >= 0) {
-				struct definition *field;
-
-				field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
-				packet_index.packet_size = bt_get_unsigned_int(field);
-			} else {
-				/* Use content size if non-zero, else file size */
-				packet_index.packet_size = packet_index.content_size ? : filestats.st_size * CHAR_BIT;
-			}
+		file_stream->parent.stream_class = stream;
+		ret = create_stream_definitions(td, &file_stream->parent);
+		if (ret)
+			return ret;
+	}
 
-			/* read timestamp begin from header */
-			len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_begin"));
-			if (len_index >= 0) {
-				struct definition *field;
-
-				field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
-				packet_index.timestamp_begin = bt_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);
-				}
-			}
+	if (file_stream->parent.stream_packet_context) {
+		/* Read packet context */
+		ret = generic_rw(&pos->parent, &file_stream->parent.stream_packet_context->p);
+		if (ret) {
+			if (ret == -EFAULT)
+				goto retry;
+			return ret;
+		}
+		/* read content size from header */
+		len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("content_size"));
+		if (len_index >= 0) {
+			struct bt_definition *field;
 
-			/* read timestamp end from header */
-			len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_end"));
-			if (len_index >= 0) {
-				struct definition *field;
-
-				field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
-				packet_index.timestamp_end = bt_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);
-				}
-			}
+			field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
+			packet_index.content_size = bt_get_unsigned_int(field);
+		} else {
+			/* Use file size for packet size */
+			packet_index.content_size = filesize * CHAR_BIT;
+		}
 
-			/* read events discarded from header */
-			len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("events_discarded"));
-			if (len_index >= 0) {
-				struct definition *field;
+		/* read packet size from header */
+		len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("packet_size"));
+		if (len_index >= 0) {
+			struct bt_definition *field;
 
-				field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
-				packet_index.events_discarded = bt_get_unsigned_int(field);
-				packet_index.events_discarded_len = bt_get_int_len(field);
-			}
+			field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
+			packet_index.packet_size = bt_get_unsigned_int(field);
 		} else {
-			/* Use file size for packet size */
-			packet_index.content_size = filestats.st_size * CHAR_BIT;
 			/* Use content size if non-zero, else file size */
-			packet_index.packet_size = packet_index.content_size ? : filestats.st_size * CHAR_BIT;
+			packet_index.packet_size = packet_index.content_size ? : filesize * CHAR_BIT;
 		}
 
-		/* Validate content size and packet size values */
-		if (packet_index.content_size > packet_index.packet_size) {
-			fprintf(stderr, "[error] Content size (%" PRIu64 " bits) is larger than packet size (%" PRIu64 " bits).\n",
-				packet_index.content_size, packet_index.packet_size);
-			return -EINVAL;
+		/* read timestamp begin from header */
+		len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_begin"));
+		if (len_index >= 0) {
+			struct bt_definition *field;
+
+			field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
+			packet_index.timestamp_begin = bt_get_unsigned_int(field);
+			if (file_stream->parent.stream_class->trace->parent.collection) {
+				packet_index.timestamp_begin =
+					ctf_get_real_timestamp(
+						&file_stream->parent,
+						packet_index.timestamp_begin);
+			}
 		}
 
-		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.packet_size, ((uint64_t)filestats.st_size - packet_index.offset) * CHAR_BIT);
-			return -EINVAL;
+		/* read timestamp end from header */
+		len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_end"));
+		if (len_index >= 0) {
+			struct bt_definition *field;
+
+			field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
+			packet_index.timestamp_end = bt_get_unsigned_int(field);
+			if (file_stream->parent.stream_class->trace->parent.collection) {
+				packet_index.timestamp_end =
+					ctf_get_real_timestamp(
+						&file_stream->parent,
+						packet_index.timestamp_end);
+			}
 		}
 
-		/* Save position after header and context */
-		packet_index.data_offset = pos->offset;
+		/* read events discarded from header */
+		len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("events_discarded"));
+		if (len_index >= 0) {
+			struct bt_definition *field;
 
-		/* add index to packet array */
-		g_array_append_val(file_stream->pos.packet_cycles_index, packet_index);
+			field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
+			packet_index.events_discarded = bt_get_unsigned_int(field);
+			packet_index.events_discarded_len = bt_get_int_len(field);
+		}
+	} else {
+		/* Use file size for packet size */
+		packet_index.content_size = filesize * CHAR_BIT;
+		/* Use content size if non-zero, else file size */
+		packet_index.packet_size = packet_index.content_size ? : filesize * CHAR_BIT;
+	}
+
+	/* Validate content size and packet size values */
+	if (packet_index.content_size > packet_index.packet_size) {
+		fprintf(stderr, "[error] Content size (%" PRIu64 " bits) is larger than packet size (%" PRIu64 " bits).\n",
+			packet_index.content_size, packet_index.packet_size);
+		return -EINVAL;
+	}
 
-		pos->mmap_offset += packet_index.packet_size / CHAR_BIT;
+	if (packet_index.packet_size > ((uint64_t) filesize - packet_index.offset) * CHAR_BIT) {
+		fprintf(stderr, "[error] Packet size (%" PRIu64 " bits) is larger than remaining file size (%" PRIu64 " bits).\n",
+			packet_index.packet_size, ((uint64_t) filesize - packet_index.offset) * CHAR_BIT);
+		return -EINVAL;
 	}
 
+	/* Save position after header and context */
+	packet_index.data_offset = pos->offset;
+
+	/* add index to packet array */
+	g_array_append_val(file_stream->pos.packet_cycles_index, packet_index);
+
+	pos->mmap_offset += packet_index.packet_size >> LOG2_CHAR_BIT;
+
+	return 0;
+
+	/* Retry with larger mapping */
+retry:
+	if (packet_map_len == ((filesize - pos->mmap_offset) << LOG2_CHAR_BIT)) {
+		/*
+		 * Reached EOF, but still expecting header/context data.
+		 */
+		fprintf(stderr, "[error] Reached end of file, but still expecting header or context fields.\n");
+		return -EFAULT;
+	}
+	/* Double the mapping len, and retry */
+	tmp_map_len = packet_map_len << 1;
+	if (tmp_map_len >> 1 != packet_map_len) {
+		/* Overflow */
+		return -EFAULT;
+	}
+	packet_map_len = tmp_map_len;
+	goto begin;
+}
+
+static
+int create_stream_packet_index(struct ctf_trace *td,
+			struct ctf_file_stream *file_stream)
+{
+	struct ctf_stream_pos *pos;
+	struct stat filestats;
+	int ret;
+
+	pos = &file_stream->pos;
+
+	ret = fstat(pos->fd, &filestats);
+	if (ret < 0)
+		return ret;
+
+	for (pos->mmap_offset = 0; pos->mmap_offset < filestats.st_size; ) {
+		ret = create_stream_one_packet_index(pos, td, file_stream,
+			filestats.st_size);
+		if (ret)
+			return ret;
+	}
 	return 0;
 }
 
@@ -1499,7 +1582,7 @@ int create_trace_definitions(struct ctf_trace *td, struct ctf_stream_definition
 	int ret;
 
 	if (td->packet_header_decl) {
-		struct definition *definition =
+		struct bt_definition *definition =
 			td->packet_header_decl->p.definition_new(&td->packet_header_decl->p,
 				stream->parent_def_scope, 0, 0, "trace.packet.header");
 		if (!definition) {
@@ -1552,6 +1635,9 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags,
 	file_stream = g_new0(struct ctf_file_stream, 1);
 	file_stream->pos.last_offset = LAST_OFFSET_POISON;
 
+	strncpy(file_stream->parent.path, path, PATH_MAX);
+	file_stream->parent.path[PATH_MAX - 1] = '\0';
+
 	if (packet_seek) {
 		file_stream->pos.packet_seek = packet_seek;
 	} else {
@@ -1560,7 +1646,7 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags,
 		goto error_def;
 	}
 
-	ret = ctf_init_pos(&file_stream->pos, fd, flags);
+	ret = ctf_init_pos(&file_stream->pos, &td->parent, fd, flags);
 	if (ret)
 		goto error_def;
 	ret = create_trace_definitions(td, &file_stream->parent);
@@ -1625,8 +1711,8 @@ int ctf_open_trace_read(struct ctf_trace *td,
 		ret = -errno;
 		goto error_dirfd;
 	}
-	strncpy(td->path, path, sizeof(td->path));
-	td->path[sizeof(td->path) - 1] = '\0';
+	strncpy(td->parent.path, path, sizeof(td->parent.path));
+	td->parent.path[sizeof(td->parent.path) - 1] = '\0';
 
 	/*
 	 * Keep the metadata file separate.
@@ -1995,6 +2081,7 @@ int ctf_close_trace(struct bt_trace_descriptor *tdp)
 		perror("Error closedir");
 		return ret;
 	}
+	free(td->metadata_string);
 	g_free(td);
 	return 0;
 }
@@ -2006,7 +2093,7 @@ void ctf_set_context(struct bt_trace_descriptor *descriptor,
 	struct ctf_trace *td = container_of(descriptor, struct ctf_trace,
 			parent);
 
-	td->ctx = ctx;
+	td->parent.ctx = ctx;
 }
 
 static
@@ -2016,7 +2103,7 @@ void ctf_set_handle(struct bt_trace_descriptor *descriptor,
 	struct ctf_trace *td = container_of(descriptor, struct ctf_trace,
 			parent);
 
-	td->handle = handle;
+	td->parent.handle = handle;
 }
 
 static