X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=c1916a4d75b76b7557031e2ca1a96b6febaa1115;hb=98ef24741ffe8c7403760763f8b5b9f9154f8054;hp=9e429bd34763f1791de7c4e5392b8bd6e08b369c;hpb=9e88d150c4119a0c6d6288cad6d6db87df7bac4b;p=babeltrace.git diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h index 9e429bd3..c1916a4d 100644 --- a/include/babeltrace/ctf/types.h +++ b/include/babeltrace/ctf/types.h @@ -24,23 +24,27 @@ #include #include #include -#include #include #include #include #include #include +#include +#include + +#define LAST_OFFSET_POISON ((int64_t) ~0ULL) 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 */ + int64_t data_offset; /* offset of data within the packet, 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; + uint64_t events_discarded; + uint64_t events_discarded_len; /* length of the field, in bits */ }; /* @@ -49,19 +53,22 @@ struct packet_index { struct ctf_stream_pos { struct stream_pos parent; int fd; /* backing file fd. -1 if unset. */ - GArray *packet_index; /* contains struct packet_index */ + GArray *packet_cycles_index; /* contains struct packet_index in cycles */ + GArray *packet_real_index; /* contains struct packet_index in ns */ int prot; /* mmap protection */ int flags; /* mmap flags */ /* Current position */ off_t mmap_offset; /* mmap offset in the file, in bytes */ - size_t packet_size; /* current packet size, in bits */ - size_t content_size; /* current content size, in bits */ - 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 */ + off_t mmap_base_offset; /* offset of start of packet in mmap, in bytes */ + uint64_t packet_size; /* current packet size, in bits */ + uint64_t content_size; /* current content size, in bits */ + uint64_t *content_size_loc; /* pointer to current content size */ + struct mmap_align *base_mma;/* mmap base address */ + int64_t offset; /* offset from base, in bits. EOF for end of file. */ + int64_t last_offset; /* offset before the last read_event */ + uint64_t cur_index; /* current index in packet index */ + uint64_t last_events_discarded; /* last known amount of event discarded */ void (*packet_seek)(struct stream_pos *pos, size_t index, int whence); /* function called to switch packet */ @@ -101,9 +108,9 @@ void ctf_fini_pos(struct ctf_stream_pos *pos); * TODO: allow larger files by updating base too. */ static inline -void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset) +void ctf_move_pos(struct ctf_stream_pos *pos, uint64_t bit_offset) { - printf_debug("ctf_move_pos test EOF: %zd\n", pos->offset); + printf_debug("ctf_move_pos test EOF: %" PRId64 "\n", pos->offset); if (unlikely(pos->offset == EOF)) return; @@ -116,16 +123,16 @@ void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset) */ if ((pos->prot == PROT_WRITE) && (unlikely(pos->offset + bit_offset >= pos->packet_size))) { - printf_debug("ctf_packet_seek (before call): %zd\n", + printf_debug("ctf_packet_seek (before call): %" PRId64 "\n", pos->offset); ctf_packet_seek(&pos->parent, 0, SEEK_CUR); - printf_debug("ctf_packet_seek (after call): %zd\n", + printf_debug("ctf_packet_seek (after call): %" PRId64 "\n", pos->offset); return; } } pos->offset += bit_offset; - printf_debug("ctf_move_pos after increment: %zd\n", pos->offset); + printf_debug("ctf_move_pos after increment: %" PRId64 "\n", pos->offset); } /* @@ -134,7 +141,7 @@ void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset) * TODO: allow larger files by updating base too. */ static inline -void ctf_align_pos(struct ctf_stream_pos *pos, size_t bit_offset) +void ctf_align_pos(struct ctf_stream_pos *pos, uint64_t bit_offset) { ctf_move_pos(pos, offset_align(pos->offset, bit_offset)); } @@ -144,7 +151,8 @@ char *ctf_get_pos_addr(struct ctf_stream_pos *pos) { /* Only makes sense to get the address after aligning on CHAR_BIT */ assert(!(pos->offset % CHAR_BIT)); - return pos->base + (pos->offset / CHAR_BIT); + return mmap_align_addr(pos->base_mma) + + pos->mmap_base_offset + (pos->offset / CHAR_BIT); } static inline @@ -174,7 +182,7 @@ 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) +int ctf_pos_access_ok(struct ctf_stream_pos *pos, uint64_t bit_len) { if (unlikely(pos->offset == EOF)) return 0; @@ -192,10 +200,10 @@ 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_packet_seek (before call): %zd\n", + printf_debug("ctf_packet_seek (before call): %" PRId64 "\n", pos->offset); pos->packet_seek(&pos->parent, 0, SEEK_CUR); - printf_debug("ctf_packet_seek (after call): %zd\n", + printf_debug("ctf_packet_seek (after call): %" PRId64 "\n", pos->offset); } }