X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=43afaef78e182277e70c4edbe14c517333765471;hp=9cbb3387cabdea53042130f1101e79516bd97f26;hb=03798a93f959f6c694fe98f5647481947607c604;hpb=7e18eedf5333dbd6f1e0a8d873a7275dee1ed396

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 9cbb3387..43afaef7 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;
 
@@ -40,7 +42,8 @@ struct packet_index {
 	uint64_t content_size;	/* content size, in bits */
 	uint64_t timestamp_begin;
 	uint64_t timestamp_end;
-	uint32_t events_discarded;
+	uint64_t events_discarded;
+	size_t events_discarded_len;	/* length of the field, in bits */
 };
 
 /*
@@ -49,7 +52,8 @@ 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 */
 
@@ -58,11 +62,11 @@ struct ctf_stream_pos {
 	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 */
-	void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+	void (*packet_seek)(struct stream_pos *pos, size_t index,
 			int whence); /* function called to switch packet */
 
 	int dummy;		/* dummy position, for length calculation */
@@ -90,7 +94,7 @@ int ctf_array_write(struct stream_pos *pos, struct definition *definition);
 int ctf_sequence_read(struct stream_pos *pos, struct definition *definition);
 int ctf_sequence_write(struct stream_pos *pos, struct definition *definition);
 
-void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence);
+void ctf_packet_seek(struct stream_pos *pos, size_t index, int whence);
 
 void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags);
 void ctf_fini_pos(struct ctf_stream_pos *pos);
@@ -109,17 +113,17 @@ void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
 
 	if (pos->fd >= 0) {
 		/*
-		 * PROT_READ ctf_move_pos_slow is called from within
+		 * PROT_READ ctf_packet_seek is called from within
 		 * ctf_pos_get_event so end of packet does not change
 		 * the packet context on for the last event of the
 		 * packet.
 		 */
 		if ((pos->prot == PROT_WRITE)
 		    	&& (unlikely(pos->offset + bit_offset >= pos->packet_size))) {
-			printf_debug("ctf_move_pos_slow (before call): %zd\n",
+			printf_debug("ctf_packet_seek (before call): %zd\n",
 				     pos->offset);
-			ctf_move_pos_slow(pos, bit_offset, SEEK_CUR);
-			printf_debug("ctf_move_pos_slow (after call): %zd\n",
+			ctf_packet_seek(&pos->parent, 0, SEEK_CUR);
+			printf_debug("ctf_packet_seek (after call): %zd\n",
 				     pos->offset);
 			return;
 		}
@@ -144,7 +148,7 @@ 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->offset / CHAR_BIT);
 }
 
 static inline
@@ -192,15 +196,15 @@ void ctf_pos_get_event(struct ctf_stream_pos *pos)
 {
 	assert(pos->offset <= pos->content_size);
 	if (pos->offset == pos->content_size) {
-		printf_debug("ctf_move_pos_slow (before call): %zd\n",
+		printf_debug("ctf_packet_seek (before call): %zd\n",
 			     pos->offset);
-		pos->move_pos_slow(pos, 0, SEEK_CUR);
-		printf_debug("ctf_move_pos_slow (after call): %zd\n",
+		pos->packet_seek(&pos->parent, 0, SEEK_CUR);
+		printf_debug("ctf_packet_seek (after call): %zd\n",
 			     pos->offset);
 	}
 }
 
-void ctf_print_timestamp(FILE *fp, struct ctf_stream *stream,
+void ctf_print_timestamp(FILE *fp, struct ctf_stream_definition *stream,
 			uint64_t timestamp);
 
 #endif /* _BABELTRACE_CTF_TYPES_H */