struct bt_stream_callbacks;
+struct packet_index_time {
+ uint64_t timestamp_begin;
+ uint64_t timestamp_end;
+};
+
struct packet_index {
off_t offset; /* offset of the packet in the file, in bytes */
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 */
+ struct packet_index_time ts_cycles; /* timestamp in cycles */
+ struct packet_index_time ts_real; /* realtime timestamp */
};
/*
struct bt_stream_pos parent;
int fd; /* backing file fd. -1 if unset. */
FILE *index_fp; /* backing index file fp. NULL if unset. */
- GArray *packet_cycles_index; /* contains struct packet_index in cycles */
- GArray *packet_real_index; /* contains struct packet_index in ns */
+ GArray *packet_index; /* contains struct packet_index */
int prot; /* mmap protection */
int flags; /* mmap flags */
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 */
+ int64_t data_offset; /* offset of data in current packet */
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 fd, int open_flags);
int ctf_fini_pos(struct ctf_stream_pos *pos);
+static inline
+int ctf_pos_access_ok(struct ctf_stream_pos *pos, uint64_t bit_len)
+{
+ uint64_t max_len;
+
+ if (unlikely(pos->offset == EOF))
+ return 0;
+ if (pos->prot == PROT_READ) {
+ /*
+ * Reads may only reach up to the "content_size",
+ * regardless of the packet_size.
+ */
+ max_len = pos->content_size;
+ } else {
+ /* Writes may take place up to the end of the packet. */
+ max_len = pos->packet_size;
+ }
+ if (unlikely(pos->offset + bit_len > max_len))
+ return 0;
+ return 1;
+}
+
/*
* move_pos - move position of a relative bit offset
*
static inline
int ctf_move_pos(struct ctf_stream_pos *pos, uint64_t bit_offset)
{
- uint64_t max_len;
+ int ret = 0;
printf_debug("ctf_move_pos test EOF: %" PRId64 "\n", pos->offset);
- if (unlikely(pos->offset == EOF))
- return 0;
- if (pos->prot == PROT_READ)
- max_len = pos->content_size;
- else
- max_len = pos->packet_size;
- if (unlikely(pos->offset + bit_offset > max_len))
- return 0;
-
+ ret = ctf_pos_access_ok(pos, bit_offset);
+ if (!ret) {
+ goto end;
+ }
pos->offset += bit_offset;
printf_debug("ctf_move_pos after increment: %" PRId64 "\n", pos->offset);
- return 1;
+end:
+ return ret;
}
/*
ctf_packet_seek(&pos->parent, 0, SEEK_CUR);
}
-static inline
-int ctf_pos_access_ok(struct ctf_stream_pos *pos, uint64_t bit_len)
-{
- uint64_t max_len;
-
- if (unlikely(pos->offset == EOF))
- return 0;
- if (pos->prot == PROT_READ)
- max_len = pos->content_size;
- else
- max_len = pos->packet_size;
- if (unlikely(pos->offset + bit_len > max_len))
- return 0;
- return 1;
-}
-
/*
* Update the stream position to the current event. This moves to
* the next packet if we are located at the end of the current packet.
void ctf_print_timestamp(FILE *fp, struct ctf_stream_definition *stream,
uint64_t timestamp);
+int ctf_append_trace_metadata(struct bt_trace_descriptor *tdp,
+ FILE *metadata_fp);
#endif /* _BABELTRACE_CTF_TYPES_H */