Fix non-matching packet context wrt last packet event read

[babeltrace.git] / include / babeltrace / ctf / types.h

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 1ec2ad5a497ba07472667db066b478f8803fc8c6..8d57ec74249108b983a6ce294b243529b235c865 100644 (file)
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.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;
 };
 
 /*
@@ -99,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);
@@ -170,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 */