Make API CTF-agnostic

[babeltrace.git] / include / babeltrace / ctf-writer / serialize-internal.h

diff --git a/include/babeltrace/ctf-writer/serialize-internal.h b/include/babeltrace/ctf-writer/serialize-internal.h
index 937082776ed8b8a3ab4bb3b95dd07c4940dbead5..85e2fec348bd96dbdccf139b0279fd42c89d503b 100644 (file)
--- a/include/babeltrace/ctf-writer/serialize-internal.h
+++ b/include/babeltrace/ctf-writer/serialize-internal.h
@@ -33,17 +33,25 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <babeltrace/ctf-ir/field-types.h>
-#include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/ctf-ir/fields-internal.h>
 #include <babeltrace/align-internal.h>
+#include <babeltrace/endian-internal.h>
 #include <babeltrace/common-internal.h>
 #include <babeltrace/mmap-align-internal.h>
 #include <babeltrace/types.h>
+#include <babeltrace/ctf-writer/field-types.h>
+#include <babeltrace/ctf-writer/fields-internal.h>
+#include <babeltrace/ctf-writer/fields.h>
+#include <babeltrace/assert-internal.h>
 
 #define PACKET_LEN_INCREMENT   (bt_common_get_page_size() * 8 * CHAR_BIT)
 
-struct bt_stream_pos {
+#if (BYTE_ORDER == BIG_ENDIAN)
+# define BT_CTF_MY_BYTE_ORDER  BT_CTF_BYTE_ORDER_BIG_ENDIAN
+#else
+# define BT_CTF_MY_BYTE_ORDER  BT_CTF_BYTE_ORDER_LITTLE_ENDIAN
+#endif
+
+struct bt_ctf_stream_pos {
        int fd;
        int prot;               /* mmap protection */
        int flags;              /* mmap flags */
@@ -57,17 +65,17 @@ struct bt_stream_pos {
 };
 
 BT_HIDDEN
-int bt_field_integer_write(struct bt_field_integer *field,
-               struct bt_stream_pos *pos,
-               enum bt_byte_order native_byte_order);
+int bt_ctf_field_integer_write(struct bt_ctf_field_common *field,
+               struct bt_ctf_stream_pos *pos,
+               enum bt_ctf_byte_order native_byte_order);
 
 BT_HIDDEN
-int bt_field_floating_point_write(struct bt_field_floating_point *field,
-               struct bt_stream_pos *pos,
-               enum bt_byte_order native_byte_order);
+int bt_ctf_field_floating_point_write(struct bt_ctf_field_common *field,
+               struct bt_ctf_stream_pos *pos,
+               enum bt_ctf_byte_order native_byte_order);
 
 static inline
-int bt_stream_pos_access_ok(struct bt_stream_pos *pos, uint64_t bit_len)
+int bt_ctf_stream_pos_access_ok(struct bt_ctf_stream_pos *pos, uint64_t bit_len)
 {
        uint64_t max_len;
 
@@ -93,11 +101,11 @@ int bt_stream_pos_access_ok(struct bt_stream_pos *pos, uint64_t bit_len)
 }
 
 static inline
-int bt_stream_pos_move(struct bt_stream_pos *pos, uint64_t bit_offset)
+int bt_ctf_stream_pos_move(struct bt_ctf_stream_pos *pos, uint64_t bit_offset)
 {
        int ret = 0;
 
-       ret = bt_stream_pos_access_ok(pos, bit_offset);
+       ret = bt_ctf_stream_pos_access_ok(pos, bit_offset);
        if (!ret) {
                goto end;
        }
@@ -107,23 +115,23 @@ end:
 }
 
 static inline
-int bt_stream_pos_align(struct bt_stream_pos *pos, uint64_t bit_offset)
+int bt_ctf_stream_pos_align(struct bt_ctf_stream_pos *pos, uint64_t bit_offset)
 {
-       return bt_stream_pos_move(pos,
+       return bt_ctf_stream_pos_move(pos,
                offset_align(pos->offset, bit_offset));
 }
 
 static inline
-char *bt_stream_pos_get_addr(struct bt_stream_pos *pos)
+char *bt_ctf_stream_pos_get_addr(struct bt_ctf_stream_pos *pos)
 {
        /* Only makes sense to get the address after aligning on CHAR_BIT */
-       assert(!(pos->offset % CHAR_BIT));
+       BT_ASSERT(!(pos->offset % CHAR_BIT));
        return ((char *) mmap_align_addr(pos->base_mma)) +
                pos->mmap_base_offset + (pos->offset / CHAR_BIT);
 }
 
 static inline
-int bt_stream_pos_init(struct bt_stream_pos *pos,
+int bt_ctf_stream_pos_init(struct bt_ctf_stream_pos *pos,
                int fd, int open_flags)
 {
        pos->fd = fd;
@@ -145,7 +153,7 @@ int bt_stream_pos_init(struct bt_stream_pos *pos,
 }
 
 static inline
-int bt_stream_pos_fini(struct bt_stream_pos *pos)
+int bt_ctf_stream_pos_fini(struct bt_ctf_stream_pos *pos)
 {
        if (pos->base_mma) {
                int ret;
@@ -161,7 +169,7 @@ int bt_stream_pos_fini(struct bt_stream_pos *pos)
 }
 
 BT_HIDDEN
-void bt_stream_pos_packet_seek(struct bt_stream_pos *pos, size_t index,
+void bt_ctf_stream_pos_packet_seek(struct bt_ctf_stream_pos *pos, size_t index,
        int whence);
 
 #endif /* BABELTRACE_CTF_WRITER_SERIALIZE_INTERNAL_H */