Specify callback to move packet in open_trace

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

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index c5912714f903f6f96681ae99b2696cfc8a482454..60749a6c9f8ec8b368413b19c47f84288025a270 100644 (file)
--- 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>
@@ -31,6 +31,8 @@
 #include <glib.h>
 #include <stdio.h>
 
+struct bt_stream_callbacks;
+
 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, in bits */
@@ -58,8 +60,11 @@ struct ctf_stream_pos {
        char *base;             /* mmap base address */
        ssize_t offset;         /* offset from base, in bits. EOF for end of file. */
        size_t cur_index;       /* current index in packet index */
+       void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+                       int whence); /* function called to switch packet */
 
        int dummy;              /* dummy position, for length calculation */
+       struct bt_stream_callbacks *cb; /* Callbacks registered for iterator. */
 };
 
 static inline
@@ -97,14 +102,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);
@@ -151,7 +160,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;
 }
@@ -165,11 +174,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 */