Use 64-bit type for packet and content size

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

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index cebaca7ac8f19c516876163c1108540dd958a898..9cbb3387cabdea53042130f1101e79516bd97f26 100644 (file)
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -31,13 +31,16 @@
 #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 */
-       size_t packet_size;     /* packet size, in bits */
-       size_t content_size;    /* content size, in bits */
+       uint64_t packet_size;   /* packet size, in bits */
+       uint64_t content_size;  /* content size, in bits */
        uint64_t timestamp_begin;
        uint64_t timestamp_end;
+       uint32_t events_discarded;
 };
 
 /*
@@ -57,9 +60,13 @@ struct ctf_stream_pos {
        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 last_offset;    /* offset before the last read_event */
        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
@@ -187,10 +194,13 @@ void ctf_pos_get_event(struct ctf_stream_pos *pos)
        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);
+               pos->move_pos_slow(pos, 0, SEEK_CUR);
                printf_debug("ctf_move_pos_slow (after call): %zd\n",
                             pos->offset);
        }
 }
 
+void ctf_print_timestamp(FILE *fp, struct ctf_stream *stream,
+                       uint64_t timestamp);
+
 #endif /* _BABELTRACE_CTF_TYPES_H */