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 */
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 */
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. */
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. */
int ctf_sequence_read(struct stream_pos *pos, struct definition *definition);
int ctf_sequence_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_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags);
void ctf_fini_pos(struct ctf_stream_pos *pos);
void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags);
void ctf_fini_pos(struct ctf_stream_pos *pos);
void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
{
printf_debug("ctf_move_pos test EOF: %zd\n", pos->offset);
void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
{
printf_debug("ctf_move_pos test EOF: %zd\n", pos->offset);
* 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)
* 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): %zd\n",
- 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): %zd\n",
- 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): %zd\n",