*/
#include <babeltrace/types.h>
-#include <babeltrace/babeltrace.h>
+#include <babeltrace/babeltrace-internal.h>
#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;
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 */
uint64_t timestamp_begin;
uint64_t timestamp_end;
+ 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 */
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 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
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_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);
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 (pos->offset == EOF)
+ 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))) {
- printf_debug("ctf_move_pos_slow (before call): %zd\n",
+ /*
+ * 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)
+ && (unlikely(pos->offset + bit_offset >= pos->packet_size))) {
+ printf_debug("ctf_packet_seek (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",
+ 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->offset / CHAR_BIT);
}
static inline
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;
}
static inline
int ctf_pos_access_ok(struct ctf_stream_pos *pos, size_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;
}
+/*
+ * 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_packet_seek (before call): %zd\n",
+ pos->offset);
+ pos->packet_seek(&pos->parent, 0, SEEK_CUR);
+ printf_debug("ctf_packet_seek (after call): %zd\n",
+ pos->offset);
+ }
+}
+
+void ctf_print_timestamp(FILE *fp, struct ctf_stream_definition *stream,
+ uint64_t timestamp);
+
#endif /* _BABELTRACE_CTF_TYPES_H */
projects / babeltrace.git / blobdiff