X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=f43fe91789d21d109c0adf407a0b7e951201ca39;hp=bff84fe1df631fe836a7c5379ce3b3098782f8bc;hb=50052405724a3b901b258c00beb424751c579217;hpb=a0b34fbba498a8a447357adf5920ac2c8a22f026

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index bff84fe1..f43fe917 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -58,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;
@@ -89,10 +89,12 @@ static
 void ctf_close_trace(struct trace_descriptor *descriptor);
 static
 uint64_t ctf_timestamp_begin(struct trace_descriptor *descriptor,
-		struct bt_trace_handle *handle);
+		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);
+		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[] = {
@@ -127,11 +129,12 @@ struct format ctf_format = {
 	.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)
+		struct bt_trace_handle *handle, enum bt_clock_type type)
 {
 	struct ctf_trace *tin;
 	uint64_t begin = ULLONG_MAX;
@@ -147,6 +150,8 @@ uint64_t ctf_timestamp_begin(struct trace_descriptor *descriptor,
 		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;
@@ -159,8 +164,24 @@ uint64_t ctf_timestamp_begin(struct trace_descriptor *descriptor,
 					parent);
 			stream_pos = &cfs->pos;
 
-			index = &g_array_index(stream_pos->packet_index,
-					struct packet_index, 0);
+			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;
 		}
@@ -174,7 +195,7 @@ error:
 
 static
 uint64_t ctf_timestamp_end(struct trace_descriptor *descriptor,
-		struct bt_trace_handle *handle)
+		struct bt_trace_handle *handle, enum bt_clock_type type)
 {
 	struct ctf_trace *tin;
 	uint64_t end = 0;
@@ -190,6 +211,8 @@ uint64_t ctf_timestamp_end(struct trace_descriptor *descriptor,
 		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;
@@ -202,9 +225,24 @@ uint64_t ctf_timestamp_end(struct trace_descriptor *descriptor,
 					parent);
 			stream_pos = &cfs->pos;
 
-			index = &g_array_index(stream_pos->packet_index,
-					struct packet_index,
-					stream_pos->packet_index->len - 1);
+			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;
 		}
@@ -217,7 +255,7 @@ error:
 }
 
 /*
- * Update stream current timestamp, keep at clock frequency.
+ * Update stream current timestamp
  */
 static
 void ctf_update_timestamp(struct ctf_stream_definition *stream,
@@ -228,39 +266,46 @@ void ctf_update_timestamp(struct ctf_stream_definition *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,
+void ctf_print_timestamp_real(FILE *fp,
 			struct ctf_stream_definition *stream,
 			uint64_t timestamp)
 {
 	uint64_t ts_sec = 0, ts_nsec;
 
-	if (opt_clock_raw) {
-		ts_nsec = ctf_get_timestamp_raw(stream, timestamp);
-	} else {
-		ts_nsec = ctf_get_timestamp(stream, timestamp);
-	}
+	ts_nsec = timestamp;
 
 	/* Add command-line offset */
 	ts_sec += opt_clock_offset;
@@ -315,6 +360,27 @@ 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_definition *stream)
 {
@@ -333,8 +399,6 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *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
@@ -487,19 +551,15 @@ error:
 void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags)
 {
 	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;
@@ -526,16 +586,19 @@ 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);
 }
 
 /*
@@ -555,15 +618,15 @@ void ctf_packet_seek(struct stream_pos *stream_pos, size_t index, int whence)
 	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;
 	}
 
 	/*
@@ -594,38 +657,58 @@ void ctf_packet_seek(struct stream_pos *stream_pos, size_t index, 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 */
-			packet_index = &g_array_index(pos->packet_index,
+			packet_index = &g_array_index(pos->packet_cycles_index,
 					struct packet_index, pos->cur_index);
-			events_discarded_diff = packet_index->events_discarded;
-			file_stream->parent.prev_timestamp_end =
+			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);
+			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) {
-				packet_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 -= 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 */
 			++pos->cur_index;
 			break;
 		}
 		case SEEK_SET:
 			pos->cur_index = index;
-			file_stream->parent.prev_timestamp = 0;
-			file_stream->parent.prev_timestamp_end = 0;
+			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
@@ -643,13 +726,23 @@ void ctf_packet_seek(struct stream_pos *stream_pos, size_t index, int whence)
 				 */
 				if ((&file_stream->parent)->stream_class->trace->collection) {
 					fflush(stdout);
-					fprintf(stderr, "[warning] Tracer discarded %d events at end of stream between [",
+					fprintf(stderr, "[warning] Tracer discarded %" PRIu64 " 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);
+					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);
 				}
@@ -658,12 +751,18 @@ void ctf_packet_seek(struct stream_pos *stream_pos, size_t index, int whence)
 			pos->offset = EOF;
 			return;
 		}
-		packet_index = &g_array_index(pos->packet_index, struct packet_index,
-				       pos->cur_index);
+		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 = packet_index->timestamp_begin;
 		pos->content_size = packet_index->content_size;
 		pos->packet_size = packet_index->packet_size;
 		if (packet_index->data_offset < packet_index->content_size) {
@@ -679,9 +778,9 @@ void ctf_packet_seek(struct stream_pos *stream_pos, size_t index, 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);
@@ -897,6 +996,7 @@ 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 (packet_seek) {
 		metadata_stream->pos.packet_seek = packet_seek;
@@ -908,6 +1008,7 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td,
 
 	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);
@@ -987,7 +1088,8 @@ end_packet_read:
 		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;
@@ -1138,19 +1240,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 */
@@ -1178,7 +1281,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;
 				}
@@ -1278,6 +1381,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 */
@@ -1287,6 +1396,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 */
@@ -1296,6 +1411,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 */
@@ -1313,7 +1429,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;
 		}
 
@@ -1321,14 +1437,11 @@ 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_packet_seek(&pos->parent, 0, SEEK_SET);	/* position for write */
-
 	return 0;
 }
 
@@ -1365,15 +1478,31 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags,
 		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 (packet_seek) {
 		file_stream->pos.packet_seek = packet_seek;
@@ -1383,12 +1512,12 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags,
 		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);
@@ -1404,8 +1533,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;
 }
@@ -1496,6 +1627,11 @@ 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 (*packet_seek)(struct stream_pos *pos, size_t index,
@@ -1545,11 +1681,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;
@@ -1594,6 +1731,7 @@ int ctf_open_mmap_stream_read(struct ctf_trace *td,
 	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.packet_seek = packet_seek;
@@ -1607,6 +1745,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);
@@ -1684,6 +1827,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)
 {