X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=f268e13aa7fd412984332c143b111db208b86844;hb=992e8cc0c6bf7403301ceeddee347fade28449f2;hp=e1870f09bceb6d7c7ace8121835c179cd959db5e;hpb=fd87c9038583f12a2dece6deb4b703d2e6aa25d7;p=babeltrace.git

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index e1870f09..f268e13a 100644
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -44,15 +44,20 @@
 
 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 */
 };
 
 /*
@@ -61,8 +66,8 @@ struct packet_index {
 struct ctf_stream_pos {
 	struct bt_stream_pos parent;
 	int fd;			/* backing file fd. -1 if unset. */
-	GArray *packet_cycles_index;	/* contains struct packet_index in cycles */
-	GArray *packet_real_index;	/* contains struct packet_index in ns */
+	FILE *index_fp;		/* backing index file fp. NULL if unset. */
+	GArray *packet_index;	/* contains struct packet_index */
 	int prot;		/* mmap protection */
 	int flags;		/* mmap flags */
 
@@ -75,6 +80,7 @@ struct ctf_stream_pos {
 	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,
@@ -82,6 +88,7 @@ struct ctf_stream_pos {
 
 	int dummy;		/* dummy position, for length calculation */
 	struct bt_stream_callbacks *cb;	/* Callbacks registered for iterator. */
+	void *priv;
 };
 
 static inline
@@ -128,28 +135,41 @@ int ctf_fini_pos(struct ctf_stream_pos *pos);
 /*
  * move_pos - move position of a relative bit offset
  *
+ * Return 1 if OK, 0 if out-of-bound.
+ *
  * TODO: allow larger files by updating base too.
  */
 static inline
-void ctf_move_pos(struct ctf_stream_pos *pos, uint64_t bit_offset)
+int ctf_move_pos(struct ctf_stream_pos *pos, uint64_t bit_offset)
 {
+	uint64_t max_len;
+
 	printf_debug("ctf_move_pos test EOF: %" PRId64 "\n", pos->offset);
 	if (unlikely(pos->offset == EOF))
-		return;
+		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;
 
 	pos->offset += bit_offset;
 	printf_debug("ctf_move_pos after increment: %" PRId64 "\n", pos->offset);
+	return 1;
 }
 
 /*
  * align_pos - align position on a bit offset (> 0)
  *
+ * Return 1 if OK, 0 if out-of-bound.
+ *
  * TODO: allow larger files by updating base too.
  */
 static inline
-void ctf_align_pos(struct ctf_stream_pos *pos, uint64_t bit_offset)
+int ctf_align_pos(struct ctf_stream_pos *pos, uint64_t bit_offset)
 {
-	ctf_move_pos(pos, offset_align(pos->offset, bit_offset));
+	return ctf_move_pos(pos, offset_align(pos->offset, bit_offset));
 }
 
 static inline
@@ -190,9 +210,15 @@ void ctf_pos_pad_packet(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 (unlikely(pos->offset + bit_len > pos->packet_size))
+	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;
 }