X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=95c0d5e2659056aeee33b1d09d0f23ce8a7fe2a4;hp=9a1a4d41c4569015a2bd7b6cb812f5ba4165ed4f;hb=670977d3f384db208f375255a83060d90075d626;hpb=8563e754804a60faf870282d494ea419dc87016b

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 9a1a4d41..95c0d5e2 100644
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -20,6 +20,7 @@
  */
 
 #include <babeltrace/types.h>
+#include <babeltrace/babeltrace.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -28,9 +29,11 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <glib.h>
+#include <stdio.h>
 
 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 */
 	size_t packet_size;	/* packet size, in bits */
 	size_t content_size;	/* content size, in bits */
 };
@@ -51,7 +54,7 @@ struct ctf_stream_pos {
 	size_t content_size;	/* current content size, in bits */
 	uint32_t *content_size_loc; /* pointer to current content size */
 	char *base;		/* mmap base address */
-	size_t offset;		/* offset from base, in bits */
+	ssize_t offset;		/* offset from base, in bits. EOF for end of file. */
 	size_t cur_index;	/* current index in packet index */
 
 	int dummy;		/* dummy position, for length calculation */
@@ -63,29 +66,20 @@ struct ctf_stream_pos *ctf_pos(struct stream_pos *pos)
 	return container_of(pos, struct ctf_stream_pos, parent);
 }
 
-/*
- * IMPORTANT: All lengths (len) and offsets (start, end) are expressed in bits,
- *            *not* in bytes.
- *
- * All write primitives, as well as read for dynamically sized entities, can
- * receive a NULL ptr/dest parameter. In this case, no write is performed, but
- * the size is returned.
- */
-
-void ctf_integer_read(struct stream_pos *pos, struct definition *definition);
-void ctf_integer_write(struct stream_pos *pos, struct definition *definition);
-void ctf_float_read(struct stream_pos *pos, struct definition *definition);
-void ctf_float_write(struct stream_pos *pos, struct definition *definition);
-void ctf_string_read(struct stream_pos *pos, struct definition *definition);
-void ctf_string_write(struct stream_pos *pos, struct definition *definition);
-void ctf_enum_read(struct stream_pos *pos, struct definition *definition);
-void ctf_enum_write(struct stream_pos *pos, struct definition *definition);
-void ctf_struct_rw(struct stream_pos *pos, struct definition *definition);
-void ctf_variant_rw(struct stream_pos *pos, struct definition *definition);
-void ctf_array_rw(struct stream_pos *pos, struct definition *definition);
-void ctf_sequence_rw(struct stream_pos *pos, struct definition *definition);
-
-void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset);
+int ctf_integer_read(struct stream_pos *pos, struct definition *definition);
+int ctf_integer_write(struct stream_pos *pos, struct definition *definition);
+int ctf_float_read(struct stream_pos *pos, struct definition *definition);
+int ctf_float_write(struct stream_pos *pos, struct definition *definition);
+int ctf_string_read(struct stream_pos *pos, struct definition *definition);
+int ctf_string_write(struct stream_pos *pos, struct definition *definition);
+int ctf_enum_read(struct stream_pos *pos, struct definition *definition);
+int ctf_enum_write(struct stream_pos *pos, struct definition *definition);
+int ctf_struct_rw(struct stream_pos *pos, struct definition *definition);
+int ctf_variant_rw(struct stream_pos *pos, struct definition *definition);
+int ctf_array_rw(struct stream_pos *pos, struct definition *definition);
+int ctf_sequence_rw(struct stream_pos *pos, struct definition *definition);
+
+void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence);
 
 void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags);
 void ctf_fini_pos(struct ctf_stream_pos *pos);
@@ -98,16 +92,25 @@ void ctf_fini_pos(struct ctf_stream_pos *pos);
 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)
+		return;
+
 	if (pos->fd >= 0) {
 		if (((pos->prot == PROT_READ)
 		      && (pos->offset + bit_offset >= pos->content_size))
 		    || ((pos->prot == PROT_WRITE)
 		      && (pos->offset + bit_offset >= pos->packet_size))) {
-			ctf_move_pos_slow(pos, bit_offset);
+			printf_debug("ctf_move_pos_slow (before call): %zd\n",
+				     pos->offset);
+			ctf_move_pos_slow(pos, bit_offset, SEEK_CUR);
+			printf_debug("ctf_move_pos_slow (after call): %zd\n",
+				     pos->offset);
 			return;
 		}
 	}
 	pos->offset += bit_offset;
+	printf_debug("ctf_move_pos after increment: %zd\n", pos->offset);
 }
 
 /*
@@ -155,4 +158,14 @@ void ctf_pos_pad_packet(struct ctf_stream_pos *pos)
 	ctf_move_pos(pos, pos->packet_size - pos->offset);
 }
 
+static inline
+int ctf_pos_access_ok(struct ctf_stream_pos *pos, size_t bit_len)
+{
+	if (pos->offset == EOF)
+		return 0;
+	if (pos->offset + bit_len > pos->packet_size)
+		return 0;
+	return 1;
+}
+
 #endif /* _BABELTRACE_CTF_TYPES_H */