X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=94231555c10dad3763a785b837040d08f410d52e;hp=14a7e3d4b0fedc51408e7f3a5141506f8952cfdb;hb=c22b9327cbc4e6d9053f998952ea71c3227b8e36;hpb=4c4ba0211b25f7a4ef4f3fbd7cda9ee5a4bc6330

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 14a7e3d4..94231555 100644
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -24,12 +24,14 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <sys/mman.h>
 #include <errno.h>
 #include <stdint.h>
 #include <unistd.h>
 #include <glib.h>
 #include <stdio.h>
+#include <babeltrace/mmap-align.h>
+
+#define LAST_OFFSET_POISON	((ssize_t) -1L)
 
 struct bt_stream_callbacks;
 
@@ -50,16 +52,18 @@ struct packet_index {
 struct ctf_stream_pos {
 	struct stream_pos parent;
 	int fd;			/* backing file fd. -1 if unset. */
-	GArray *packet_index;	/* contains struct packet_index */
+	GArray *packet_cycles_index;	/* contains struct packet_index in cycles */
+	GArray *packet_real_index;	/* contains struct packet_index in ns */
 	int prot;		/* mmap protection */
 	int flags;		/* mmap flags */
 
 	/* Current position */
 	off_t mmap_offset;	/* mmap offset in the file, in bytes */
+	off_t mmap_base_offset;	/* offset of start of packet in mmap, in bytes */
 	size_t packet_size;	/* current packet size, in bits */
 	size_t content_size;	/* current content size, in bits */
 	uint32_t *content_size_loc; /* pointer to current content size */
-	char *base;		/* mmap base address */
+	struct mmap_align *base_mma;/* mmap base address */
 	ssize_t offset;		/* offset from base, in bits. EOF for end of file. */
 	ssize_t last_offset;	/* offset before the last read_event */
 	size_t cur_index;	/* current index in packet index */
@@ -145,7 +149,8 @@ char *ctf_get_pos_addr(struct ctf_stream_pos *pos)
 {
 	/* Only makes sense to get the address after aligning on CHAR_BIT */
 	assert(!(pos->offset % CHAR_BIT));
-	return pos->base + (pos->offset / CHAR_BIT);
+	return mmap_align_addr(pos->base_mma) +
+		pos->mmap_base_offset + (pos->offset / CHAR_BIT);
 }
 
 static inline