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

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index c5912714..8d57ec74 100644
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -101,10 +101,14 @@ void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
 		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);
@@ -172,4 +176,21 @@ int ctf_pos_access_ok(struct ctf_stream_pos *pos, size_t bit_len)
 	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 */