X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=39591c6f2ca34dc07e57ea4e68abdc7b20e66d5f;hb=f3985ab106d89d8e764c1a8dd0c8bda09b755d10;hp=67b24ee4aa940cf3185bff55c57c2a127b2f2904;hpb=0c880b0af719e4d58ccebe61acdd0e77a4479bfd;p=babeltrace.git

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 67b24ee4..39591c6f 100644
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -45,8 +45,8 @@
 struct bt_stream_callbacks;
 
 struct packet_index_time {
-	uint64_t timestamp_begin;
-	uint64_t timestamp_end;
+	int64_t timestamp_begin;
+	int64_t timestamp_end;
 };
 
 struct packet_index {
@@ -58,6 +58,9 @@ struct packet_index {
 	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 */
+	/* CTF_INDEX 1.0 limit */
+	uint64_t stream_instance_id;	/* ID of the channel instance */
+	uint64_t packet_seq_num;	/* packet sequence number */
 };
 
 /*
@@ -132,6 +135,28 @@ int ctf_init_pos(struct ctf_stream_pos *pos, struct bt_trace_descriptor *trace,
 		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
  *
@@ -142,21 +167,17 @@ int ctf_fini_pos(struct ctf_stream_pos *pos);
 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;
 }
 
 /*
@@ -207,22 +228,6 @@ void ctf_pos_pad_packet(struct ctf_stream_pos *pos)
 	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.
@@ -241,7 +246,7 @@ void ctf_pos_get_event(struct ctf_stream_pos *pos)
 }
 
 void ctf_print_timestamp(FILE *fp, struct ctf_stream_definition *stream,
-			uint64_t timestamp);
+			int64_t timestamp);
 int ctf_append_trace_metadata(struct bt_trace_descriptor *tdp,
 			FILE *metadata_fp);