Use inheritance for trace descriptor and positions

[babeltrace.git] / include / babeltrace / ctf / types.h

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 91c3303c2835b92529d773966b9a8cd0adbc52b7..d47cab8203b4e8fbcd1f8085c904b8b81f4a7eba 100644 (file)
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -20,6 +20,8 @@
  */
 
 #include <babeltrace/types.h>
+#include <sys/mman.h>
+#include <errno.h>
 #include <stdint.h>
 #include <unistd.h>
 #include <glib.h>
@@ -31,22 +33,33 @@ struct packet_index {
 };
 
 /*
- * Always update stream_pos with move_pos and init_pos.
+ * Always update ctf_stream_pos with ctf_move_pos and ctf_init_pos.
  */
-struct stream_pos {
+struct ctf_stream_pos {
+       struct stream_pos parent;
        int fd;                 /* backing file fd. -1 if unset. */
        GArray *packet_index;   /* contains struct packet_index */
+       int prot;               /* mmap protection */
+       int flags;              /* mmap flags */
 
        /* Current position */
        off_t mmap_offset;      /* mmap offset in the file, in bytes */
        size_t packet_size;     /* current packet size, in bits */
        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 */
+       size_t cur_index;       /* current index in packet index */
 
        int dummy;              /* dummy position, for length calculation */
 };
 
+static inline
+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.
@@ -111,19 +124,10 @@ void ctf_sequence_begin(struct stream_pos *pos,
 void ctf_sequence_end(struct stream_pos *pos,
                const struct declaration_sequence *sequence_declaration);
 
-void move_pos_slow(struct stream_pos *pos, size_t offset);
+void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset);
 
-static inline
-void init_pos(struct stream_pos *pos, int fd)
-{
-       pos->fd = fd;
-       pos->mmap_offset = 0;
-       pos->packet_size = 0;
-       pos->content_size = 0;
-       pos->base = NULL;
-       pos->offset = 0;
-       pos->dummy = false;
-}
+void ctf_init_pos(struct ctf_stream_pos *pos, int fd);
+void ctf_fini_pos(struct ctf_stream_pos *pos);
 
 /*
  * move_pos - move position of a relative bit offset
@@ -131,12 +135,18 @@ void init_pos(struct stream_pos *pos, int fd)
  * TODO: allow larger files by updating base too.
  */
 static inline
-void move_pos(struct stream_pos *pos, size_t offset)
+void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
 {
-       if (pos->fd >= 0 && pos->offset + offset >= pos->content_size)
-               move_pos_slow(pos, offset);
-       else
-               pos->offset += offset;
+       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);
+                       return;
+               }
+       }
+       pos->offset += bit_offset;
 }
 
 /*
@@ -145,23 +155,43 @@ void move_pos(struct stream_pos *pos, size_t offset)
  * TODO: allow larger files by updating base too.
  */
 static inline
-void align_pos(struct stream_pos *pos, size_t offset)
+void ctf_align_pos(struct ctf_stream_pos *pos, size_t bit_offset)
 {
-       pos->offset += offset_align(pos->offset, offset);
+       ctf_move_pos(pos, offset_align(pos->offset, bit_offset));
 }
 
 static inline
-void copy_pos(struct stream_pos *dest, struct stream_pos *src)
+char *ctf_get_pos_addr(struct ctf_stream_pos *pos)
 {
-       memcpy(dest, src, sizeof(struct stream_pos));
+       /* Only makes sense to get the address after aligning on CHAR_BIT */
+       assert(!(pos->offset % CHAR_BIT));
+       return pos->base + (pos->offset / CHAR_BIT);
 }
 
 static inline
-char *get_pos_addr(struct stream_pos *pos)
+void ctf_dummy_pos(struct ctf_stream_pos *pos, struct ctf_stream_pos *dummy)
 {
-       /* Only makes sense to get the address after aligning on CHAR_BIT */
-       assert(!(pos->offset % CHAR_BIT));
-       return pos->base + (pos->offset / CHAR_BIT);
+       memcpy(dummy, pos, sizeof(struct ctf_stream_pos));
+       dummy->dummy = 1;
+       dummy->fd = -1;
+}
+
+/*
+ * Check if current packet can hold data.
+ * Returns 0 for success, negative error otherwise.
+ */
+static inline
+int ctf_pos_packet(struct ctf_stream_pos *dummy)
+{
+       if (dummy->offset > dummy->packet_size)
+               return -ENOSPC;
+       return 0;
+}
+
+static inline
+void ctf_pos_pad_packet(struct ctf_stream_pos *pos)
+{
+       ctf_move_pos(pos, pos->packet_size - pos->offset);
 }
 
 #endif /* _BABELTRACE_CTF_TYPES_H */