X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=cebaca7ac8f19c516876163c1108540dd958a898;hb=063f70486d49320f996630ae2522bc9a2341f882;hp=1ec2ad5a497ba07472667db066b478f8803fc8c6;hpb=81dee1bb528a95f7bf2bc622948807150794a75e;p=babeltrace.git

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 1ec2ad5a..cebaca7a 100644
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -20,7 +20,7 @@
  */
 
 #include <babeltrace/types.h>
-#include <babeltrace/babeltrace.h>
+#include <babeltrace/babeltrace-internal.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -33,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;
 };
 
 /*
@@ -95,14 +97,18 @@ static inline
 void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
 {
 	printf_debug("ctf_move_pos test EOF: %zd\n", pos->offset);
-	if (pos->offset == EOF)
+	if (unlikely(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)
+		    	&& (unlikely(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);
@@ -149,7 +155,7 @@ void ctf_dummy_pos(struct ctf_stream_pos *pos, struct ctf_stream_pos *dummy)
 static inline
 int ctf_pos_packet(struct ctf_stream_pos *dummy)
 {
-	if (dummy->offset > dummy->packet_size)
+	if (unlikely(dummy->offset > dummy->packet_size))
 		return -ENOSPC;
 	return 0;
 }
@@ -163,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 (unlikely(pos->offset == EOF))
 		return 0;
-	if (pos->offset + bit_len > pos->packet_size)
+	if (unlikely(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 */