X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=f7b93d36907f5a5f25f07e219a8082c9d00e0ca9;hp=8d57ec74249108b983a6ce294b243529b235c865;hb=1cf393f63db4dce618515749d5549564d1313ee4;hpb=5f643ed7d0d2d21d3797938e34735ef8f1bd9186 diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h index 8d57ec74..f7b93d36 100644 --- a/include/babeltrace/ctf/types.h +++ b/include/babeltrace/ctf/types.h @@ -17,76 +17,112 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include -#include +#include #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 */ - size_t packet_size; /* packet size, in bits */ - size_t content_size; /* content size, 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; + uint64_t events_discarded; + uint64_t events_discarded_len; /* length of the field, in bits */ }; /* * Always update ctf_stream_pos with ctf_move_pos and ctf_init_pos. */ struct ctf_stream_pos { - struct stream_pos parent; + struct bt_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. */ - 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 bt_stream_pos *pos, size_t index, + 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 -struct ctf_stream_pos *ctf_pos(struct stream_pos *pos) +struct ctf_stream_pos *ctf_pos(struct bt_stream_pos *pos) { return container_of(pos, struct ctf_stream_pos, parent); } -int ctf_integer_read(struct stream_pos *pos, struct definition *definition); -int ctf_integer_write(struct stream_pos *pos, struct definition *definition); -int ctf_float_read(struct stream_pos *pos, struct definition *definition); -int ctf_float_write(struct stream_pos *pos, struct definition *definition); -int ctf_string_read(struct stream_pos *pos, struct definition *definition); -int ctf_string_write(struct stream_pos *pos, struct definition *definition); -int ctf_enum_read(struct stream_pos *pos, struct definition *definition); -int ctf_enum_write(struct stream_pos *pos, struct definition *definition); -int ctf_struct_rw(struct stream_pos *pos, struct definition *definition); -int ctf_variant_rw(struct stream_pos *pos, struct definition *definition); -int ctf_array_read(struct stream_pos *pos, struct definition *definition); -int ctf_array_write(struct stream_pos *pos, struct definition *definition); -int ctf_sequence_read(struct stream_pos *pos, struct definition *definition); -int ctf_sequence_write(struct stream_pos *pos, struct definition *definition); - -void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence); - -void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags); -void ctf_fini_pos(struct ctf_stream_pos *pos); +BT_HIDDEN +int ctf_integer_read(struct bt_stream_pos *pos, struct definition *definition); +BT_HIDDEN +int ctf_integer_write(struct bt_stream_pos *pos, struct definition *definition); +BT_HIDDEN +int ctf_float_read(struct bt_stream_pos *pos, struct definition *definition); +BT_HIDDEN +int ctf_float_write(struct bt_stream_pos *pos, struct definition *definition); +BT_HIDDEN +int ctf_string_read(struct bt_stream_pos *pos, struct definition *definition); +BT_HIDDEN +int ctf_string_write(struct bt_stream_pos *pos, struct definition *definition); +BT_HIDDEN +int ctf_enum_read(struct bt_stream_pos *pos, struct definition *definition); +BT_HIDDEN +int ctf_enum_write(struct bt_stream_pos *pos, struct definition *definition); +BT_HIDDEN +int ctf_struct_rw(struct bt_stream_pos *pos, struct definition *definition); +BT_HIDDEN +int ctf_variant_rw(struct bt_stream_pos *pos, struct definition *definition); +BT_HIDDEN +int ctf_array_read(struct bt_stream_pos *pos, struct definition *definition); +BT_HIDDEN +int ctf_array_write(struct bt_stream_pos *pos, struct definition *definition); +BT_HIDDEN +int ctf_sequence_read(struct bt_stream_pos *pos, struct definition *definition); +BT_HIDDEN +int ctf_sequence_write(struct bt_stream_pos *pos, struct definition *definition); + +void ctf_packet_seek(struct bt_stream_pos *pos, size_t index, int whence); + +int ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags); +int ctf_fini_pos(struct ctf_stream_pos *pos); /* * move_pos - move position of a relative bit offset @@ -94,31 +130,31 @@ 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); - if (pos->offset == EOF) + printf_debug("ctf_move_pos test EOF: %" PRId64 "\n", pos->offset); + if (unlikely(pos->offset == EOF)) return; if (pos->fd >= 0) { /* - * PROT_READ ctf_move_pos_slow is called from within + * PROT_READ ctf_packet_seek 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", + && (unlikely(pos->offset + bit_offset >= pos->packet_size))) { + printf_debug("ctf_packet_seek (before call): %" PRId64 "\n", pos->offset); - ctf_move_pos_slow(pos, bit_offset, SEEK_CUR); - printf_debug("ctf_move_pos_slow (after call): %zd\n", + ctf_packet_seek(&pos->parent, 0, SEEK_CUR); + 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); } /* @@ -127,7 +163,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)); } @@ -137,7 +173,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 @@ -155,7 +192,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; } @@ -167,11 +204,11 @@ 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 (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; } @@ -185,12 +222,15 @@ 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", + printf_debug("ctf_packet_seek (before call): %" PRId64 "\n", pos->offset); - ctf_move_pos_slow(pos, 0, SEEK_CUR); - printf_debug("ctf_move_pos_slow (after call): %zd\n", + pos->packet_seek(&pos->parent, 0, SEEK_CUR); + printf_debug("ctf_packet_seek (after call): %" PRId64 "\n", pos->offset); } } +void ctf_print_timestamp(FILE *fp, struct ctf_stream_definition *stream, + uint64_t timestamp); + #endif /* _BABELTRACE_CTF_TYPES_H */