X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=68ccf7af6931ec5c06e204fb12da3457c3b7bb8f;hb=31e670293588d7882a232bc14b93d5e956fa43f4;hp=8018b5b363d8261665653fbe88ece38d37208c82;hpb=847bf71a4af4770390a59e8ef8e1fdfca33687b9;p=babeltrace.git diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h index 8018b5b3..68ccf7af 100644 --- a/include/babeltrace/ctf/types.h +++ b/include/babeltrace/ctf/types.h @@ -20,6 +20,7 @@ */ #include +#include #include #include #include @@ -28,13 +29,17 @@ #include #include #include +#include +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 */ + 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; }; /* @@ -53,10 +58,13 @@ struct ctf_stream_pos { 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 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 @@ -65,18 +73,20 @@ struct ctf_stream_pos *ctf_pos(struct stream_pos *pos) return container_of(pos, struct ctf_stream_pos, parent); } -void ctf_integer_read(struct stream_pos *pos, struct definition *definition); -void ctf_integer_write(struct stream_pos *pos, struct definition *definition); -void ctf_float_read(struct stream_pos *pos, struct definition *definition); -void ctf_float_write(struct stream_pos *pos, struct definition *definition); -void ctf_string_read(struct stream_pos *pos, struct definition *definition); -void ctf_string_write(struct stream_pos *pos, struct definition *definition); -void ctf_enum_read(struct stream_pos *pos, struct definition *definition); -void ctf_enum_write(struct stream_pos *pos, struct definition *definition); -void ctf_struct_rw(struct stream_pos *pos, struct definition *definition); -void ctf_variant_rw(struct stream_pos *pos, struct definition *definition); -void ctf_array_rw(struct stream_pos *pos, struct definition *definition); -void ctf_sequence_rw(struct stream_pos *pos, struct definition *definition); +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); @@ -91,16 +101,29 @@ void ctf_fini_pos(struct ctf_stream_pos *pos); 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 (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); + printf_debug("ctf_move_pos_slow (after call): %zd\n", + pos->offset); return; } } pos->offset += bit_offset; + printf_debug("ctf_move_pos after increment: %zd\n", pos->offset); } /* @@ -137,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; } @@ -148,4 +171,31 @@ void ctf_pos_pad_packet(struct ctf_stream_pos *pos) ctf_move_pos(pos, pos->packet_size - pos->offset); } +static inline +int ctf_pos_access_ok(struct ctf_stream_pos *pos, size_t bit_len) +{ + if (unlikely(pos->offset == EOF)) + return 0; + 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); + pos->move_pos_slow(pos, 0, SEEK_CUR); + printf_debug("ctf_move_pos_slow (after call): %zd\n", + pos->offset); + } +} + #endif /* _BABELTRACE_CTF_TYPES_H */