X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=60749a6c9f8ec8b368413b19c47f84288025a270;hb=b086c01a10fc706dacf1a5a8ea2c4a8acfa0ee24;hp=58352ef7b15a7bf4b39ba08842bcc3ff34543e1b;hpb=70bd0a12b09ce7f233189cf07e090fda593ebc48;p=babeltrace.git

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 58352ef7..60749a6c 100644
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -31,6 +31,8 @@
 #include <glib.h>
 #include <stdio.h>
 
+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 */
@@ -58,8 +60,11 @@ struct ctf_stream_pos {
 	char *base;		/* mmap base address */
 	ssize_t offset;		/* offset from base, in bits. EOF for end of file. */
 	size_t cur_index;	/* current index in packet index */
+	void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+			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
@@ -97,7 +102,7 @@ static inline
 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) {
@@ -108,7 +113,7 @@ void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
 		 * packet.
 		 */
 		if ((pos->prot == PROT_WRITE)
-		    	&& (pos->offset + bit_offset >= pos->packet_size)) {
+		    	&& (unlikely(pos->offset + bit_offset >= pos->packet_size))) {
 			printf_debug("ctf_move_pos_slow (before call): %zd\n",
 				     pos->offset);
 			ctf_move_pos_slow(pos, bit_offset, SEEK_CUR);
@@ -155,7 +160,7 @@ void ctf_dummy_pos(struct ctf_stream_pos *pos, struct ctf_stream_pos *dummy)
 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;
 }
@@ -169,9 +174,9 @@ void ctf_pos_pad_packet(struct ctf_stream_pos *pos)
 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;
 }