X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=c5c824fdb8bab26f3d6808ec9562a6f70a807fa9;hb=6743f229982176bfc2bdd2b3ab5c75ca62f45b35;hp=8d57ec74249108b983a6ce294b243529b235c865;hpb=5f643ed7d0d2d21d3797938e34735ef8f1bd9186;p=babeltrace.git

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 8d57ec74..c5c824fd 100644
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -20,7 +20,7 @@
  */
 
 #include <babeltrace/types.h>
-#include <babeltrace/babeltrace.h>
+#include <babeltrace/babeltrace-internal.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.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 */
@@ -38,6 +40,7 @@ struct packet_index {
 	size_t content_size;	/* content size, in bits */
 	uint64_t timestamp_begin;
 	uint64_t timestamp_end;
+	uint32_t events_discarded;
 };
 
 /*
@@ -58,8 +61,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 +103,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 +114,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 +161,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 +175,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;
 }
@@ -187,10 +193,13 @@ void ctf_pos_get_event(struct ctf_stream_pos *pos)
 	if (pos->offset == pos->content_size) {
 		printf_debug("ctf_move_pos_slow (before call): %zd\n",
 			     pos->offset);
-		ctf_move_pos_slow(pos, 0, SEEK_CUR);
+		pos->move_pos_slow(pos, 0, SEEK_CUR);
 		printf_debug("ctf_move_pos_slow (after call): %zd\n",
 			     pos->offset);
 	}
 }
 
+void ctf_print_timestamp(FILE *fp, struct ctf_stream *stream,
+			uint64_t timestamp);
+
 #endif /* _BABELTRACE_CTF_TYPES_H */