#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <sys/mman.h>
#include <errno.h>
#include <stdint.h>
#include <unistd.h>
#include <glib.h>
#include <stdio.h>
+#include <babeltrace/mmap-align.h>
+
+#define LAST_OFFSET_POISON ((ssize_t) -1L)
struct bt_stream_callbacks;
uint64_t content_size; /* content size, in bits */
uint64_t timestamp_begin;
uint64_t timestamp_end;
- uint32_t events_discarded;
+ uint64_t events_discarded;
+ size_t events_discarded_len; /* length of the field, in bits */
};
/*
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 */
+ off_t mmap_base_offset; /* offset of start of packet in mmap, 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 */
+ struct mmap_align *base_mma;/* 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 (*packet_seek)(struct stream_pos *pos, size_t offset,
+ 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 */
int dummy; /* dummy position, for length calculation */
int ctf_sequence_read(struct stream_pos *pos, struct definition *definition);
int ctf_sequence_write(struct stream_pos *pos, struct definition *definition);
-void ctf_packet_seek(struct stream_pos *pos, size_t offset, int whence);
+void ctf_packet_seek(struct stream_pos *pos, size_t index, 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);
&& (unlikely(pos->offset + bit_offset >= pos->packet_size))) {
printf_debug("ctf_packet_seek (before call): %zd\n",
pos->offset);
- ctf_packet_seek(&pos->parent, bit_offset, SEEK_CUR);
+ ctf_packet_seek(&pos->parent, 0, SEEK_CUR);
printf_debug("ctf_packet_seek (after call): %zd\n",
pos->offset);
return;
{
/* 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
}
}
-void ctf_print_timestamp(FILE *fp, struct ctf_stream *stream,
+void ctf_print_timestamp(FILE *fp, struct ctf_stream_definition *stream,
uint64_t timestamp);
#endif /* _BABELTRACE_CTF_TYPES_H */