X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=8d57ec74249108b983a6ce294b243529b235c865;hp=e8cc97b10e64274bc670d45ee5833f0810088a7c;hb=5f643ed7d0d2d21d3797938e34735ef8f1bd9186;hpb=c5e74408f9786219f6b44400dcf2098ab9cc78fb

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index e8cc97b1..8d57ec74 100644
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -20,6 +20,7 @@
  */
 
 #include <babeltrace/types.h>
+#include <babeltrace/babeltrace.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -32,9 +33,11 @@
 
 struct packet_index {
 	off_t offset;		/* offset of the packet in the file, in bytes */
-	off_t data_offset;	/* offset of data within the packet */
+	off_t data_offset;	/* offset of data within the packet, in bits */
 	size_t packet_size;	/* packet size, in bits */
 	size_t content_size;	/* content size, in bits */
+	uint64_t timestamp_begin;
+	uint64_t timestamp_end;
 };
 
 /*
@@ -53,7 +56,7 @@ struct ctf_stream_pos {
 	size_t content_size;	/* current content size, in bits */
 	uint32_t *content_size_loc; /* pointer to current content size */
 	char *base;		/* mmap base address */
-	ssize_t offset;		/* offset from base, in bits. -EOF for end of file. */
+	ssize_t offset;		/* offset from base, in bits. EOF for end of file. */
 	size_t cur_index;	/* current index in packet index */
 
 	int dummy;		/* dummy position, for length calculation */
@@ -75,8 +78,10 @@ int ctf_enum_read(struct stream_pos *pos, struct definition *definition);
 int ctf_enum_write(struct stream_pos *pos, struct definition *definition);
 int ctf_struct_rw(struct stream_pos *pos, struct definition *definition);
 int ctf_variant_rw(struct stream_pos *pos, struct definition *definition);
-int ctf_array_rw(struct stream_pos *pos, struct definition *definition);
-int ctf_sequence_rw(struct stream_pos *pos, struct definition *definition);
+int ctf_array_read(struct stream_pos *pos, struct definition *definition);
+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);
 
@@ -91,19 +96,29 @@ void ctf_fini_pos(struct ctf_stream_pos *pos);
 static inline
 void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
 {
-	if (pos->offset == -EOF)
+	printf_debug("ctf_move_pos test EOF: %zd\n", pos->offset);
+	if (pos->offset == EOF)
 		return;
 
 	if (pos->fd >= 0) {
-		if (((pos->prot == PROT_READ)
-		      && (pos->offset + bit_offset >= pos->content_size))
-		    || ((pos->prot == PROT_WRITE)
-		      && (pos->offset + bit_offset >= pos->packet_size))) {
+		/*
+		 * PROT_READ ctf_move_pos_slow 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)
+		    	&& (pos->offset + bit_offset >= pos->packet_size)) {
+			printf_debug("ctf_move_pos_slow (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",
+				     pos->offset);
 			return;
 		}
 	}
 	pos->offset += bit_offset;
+	printf_debug("ctf_move_pos after increment: %zd\n", pos->offset);
 }
 
 /*
@@ -154,11 +169,28 @@ void ctf_pos_pad_packet(struct ctf_stream_pos *pos)
 static inline
 int ctf_pos_access_ok(struct ctf_stream_pos *pos, size_t bit_len)
 {
-	if (pos->offset == -EOF)
+	if (pos->offset == EOF)
 		return 0;
 	if (pos->offset + bit_len > pos->packet_size)
 		return 0;
 	return 1;
 }
 
+/*
+ * Update the stream position for to the current event. This moves to
+ * the next packet if we are located at the end of the current packet.
+ */
+static inline
+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",
+			     pos->offset);
+		ctf_move_pos_slow(pos, 0, SEEK_CUR);
+		printf_debug("ctf_move_pos_slow (after call): %zd\n",
+			     pos->offset);
+	}
+}
+
 #endif /* _BABELTRACE_CTF_TYPES_H */