projects / deliverable / babeltrace.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Rename bt_ctf_X -> bt_X, maintain backward compat. for pre-2.0 CTF writer
[deliverable/babeltrace.git] / lib / ctf-writer / serialize.c
diff --git a/lib/ctf-writer/serialize.c b/lib/ctf-writer/serialize.c
index f20ad405cb99cdcebbb76ac1a4f9ae0c53d9e6a7..459cf9df9415fd40fb6ea084a20f0f403aa6c459 100644 (file)
--- a/lib/ctf-writer/serialize.c
+++ b/lib/ctf-writer/serialize.c
@@ -42,6 +42,7 @@
 #include <babeltrace/bitfield-internal.h>
 #include <babeltrace/compat/fcntl-internal.h>
 #include <babeltrace/types.h>
+#include <babeltrace/common-internal.h>
 #include <glib.h>
 
 #if (FLT_RADIX != 2)
@@ -59,16 +60,16 @@ union intval {
  * optimisation.
  */
 static
-int aligned_integer_write(struct bt_ctf_stream_pos *pos,
+int aligned_integer_write(struct bt_stream_pos *pos,
                union intval value, unsigned int alignment, unsigned int size,
-               bt_bool is_signed, enum bt_ctf_byte_order byte_order)
+               bt_bool is_signed, enum bt_byte_order byte_order)
 {
-       bt_bool rbo = (byte_order != BT_CTF_MY_BYTE_ORDER); /* reverse byte order */
+       bt_bool rbo = (byte_order != BT_MY_BYTE_ORDER); /* reverse byte order */
 
-       if (!bt_ctf_stream_pos_align(pos, alignment))
+       if (!bt_stream_pos_align(pos, alignment))
                return -EFAULT;
 
-       if (!bt_ctf_stream_pos_access_ok(pos, size))
+       if (!bt_stream_pos_access_ok(pos, size))
                return -EFAULT;
 
        assert(!(pos->offset % CHAR_BIT));
@@ -78,7 +79,7 @@ int aligned_integer_write(struct bt_ctf_stream_pos *pos,
                {
                        uint8_t v = value.unsignd;
 
-                       memcpy(bt_ctf_stream_pos_get_addr(pos), &v, sizeof(v));
+                       memcpy(bt_stream_pos_get_addr(pos), &v, sizeof(v));
                        break;
                }
                case 16:
@@ -87,7 +88,7 @@ int aligned_integer_write(struct bt_ctf_stream_pos *pos,
 
                        if (rbo)
                                v = GUINT16_SWAP_LE_BE(v);
-                       memcpy(bt_ctf_stream_pos_get_addr(pos), &v, sizeof(v));
+                       memcpy(bt_stream_pos_get_addr(pos), &v, sizeof(v));
                        break;
                }
                case 32:
@@ -96,7 +97,7 @@ int aligned_integer_write(struct bt_ctf_stream_pos *pos,
 
                        if (rbo)
                                v = GUINT32_SWAP_LE_BE(v);
-                       memcpy(bt_ctf_stream_pos_get_addr(pos), &v, sizeof(v));
+                       memcpy(bt_stream_pos_get_addr(pos), &v, sizeof(v));
                        break;
                }
                case 64:
@@ -105,7 +106,7 @@ int aligned_integer_write(struct bt_ctf_stream_pos *pos,
 
                        if (rbo)
                                v = GUINT64_SWAP_LE_BE(v);
-                       memcpy(bt_ctf_stream_pos_get_addr(pos), &v, sizeof(v));
+                       memcpy(bt_stream_pos_get_addr(pos), &v, sizeof(v));
                        break;
                }
                default:
@@ -117,7 +118,7 @@ int aligned_integer_write(struct bt_ctf_stream_pos *pos,
                {
                        uint8_t v = value.signd;
 
-                       memcpy(bt_ctf_stream_pos_get_addr(pos), &v, sizeof(v));
+                       memcpy(bt_stream_pos_get_addr(pos), &v, sizeof(v));
                        break;
                }
                case 16:
@@ -126,7 +127,7 @@ int aligned_integer_write(struct bt_ctf_stream_pos *pos,
 
                        if (rbo)
                                v = GUINT16_SWAP_LE_BE(v);
-                       memcpy(bt_ctf_stream_pos_get_addr(pos), &v, sizeof(v));
+                       memcpy(bt_stream_pos_get_addr(pos), &v, sizeof(v));
                        break;
                }
                case 32:
@@ -135,7 +136,7 @@ int aligned_integer_write(struct bt_ctf_stream_pos *pos,
 
                        if (rbo)
                                v = GUINT32_SWAP_LE_BE(v);
-                       memcpy(bt_ctf_stream_pos_get_addr(pos), &v, sizeof(v));
+                       memcpy(bt_stream_pos_get_addr(pos), &v, sizeof(v));
                        break;
                }
                case 64:
@@ -144,7 +145,7 @@ int aligned_integer_write(struct bt_ctf_stream_pos *pos,
 
                        if (rbo)
                                v = GUINT64_SWAP_LE_BE(v);
-                       memcpy(bt_ctf_stream_pos_get_addr(pos), &v, sizeof(v));
+                       memcpy(bt_stream_pos_get_addr(pos), &v, sizeof(v));
                        break;
                }
                default:
@@ -152,15 +153,15 @@ int aligned_integer_write(struct bt_ctf_stream_pos *pos,
                }
        }
 
-       if (!bt_ctf_stream_pos_move(pos, size))
+       if (!bt_stream_pos_move(pos, size))
                return -EFAULT;
        return 0;
 }
 
 static
-int integer_write(struct bt_ctf_stream_pos *pos, union intval value,
+int integer_write(struct bt_stream_pos *pos, union intval value,
        unsigned int alignment, unsigned int size, bt_bool is_signed,
-       enum bt_ctf_byte_order byte_order)
+       enum bt_byte_order byte_order)
 {
        if (!(alignment % CHAR_BIT)
            && !(size % CHAR_BIT)) {
@@ -168,14 +169,14 @@ int integer_write(struct bt_ctf_stream_pos *pos, union intval value,
                        size, is_signed, byte_order);
        }
 
-       if (!bt_ctf_stream_pos_align(pos, alignment))
+       if (!bt_stream_pos_align(pos, alignment))
                return -EFAULT;
 
-       if (!bt_ctf_stream_pos_access_ok(pos, size))
+       if (!bt_stream_pos_access_ok(pos, size))
                return -EFAULT;
 
        if (!is_signed) {
-               if (byte_order == BT_CTF_BYTE_ORDER_LITTLE_ENDIAN)
+               if (byte_order == BT_BYTE_ORDER_LITTLE_ENDIAN)
                        bt_bitfield_write_le(mmap_align_addr(pos->base_mma) +
                                pos->mmap_base_offset, unsigned char,
                                pos->offset, size, value.unsignd);
@@ -184,7 +185,7 @@ int integer_write(struct bt_ctf_stream_pos *pos, union intval value,
                                pos->mmap_base_offset, unsigned char,
                                pos->offset, size, value.unsignd);
        } else {
-               if (byte_order == BT_CTF_BYTE_ORDER_LITTLE_ENDIAN)
+               if (byte_order == BT_BYTE_ORDER_LITTLE_ENDIAN)
                        bt_bitfield_write_le(mmap_align_addr(pos->base_mma) +
                                pos->mmap_base_offset, unsigned char,
                                pos->offset, size, value.signd);
@@ -194,23 +195,23 @@ int integer_write(struct bt_ctf_stream_pos *pos, union intval value,
                                pos->offset, size, value.signd);
        }
 
-       if (!bt_ctf_stream_pos_move(pos, size))
+       if (!bt_stream_pos_move(pos, size))
                return -EFAULT;
        return 0;
 }
 
 BT_HIDDEN
-int bt_ctf_field_integer_write(struct bt_ctf_field_integer *int_field,
-               struct bt_ctf_stream_pos *pos,
-               enum bt_ctf_byte_order native_byte_order)
+int bt_field_integer_write(struct bt_field_integer *int_field,
+               struct bt_stream_pos *pos,
+               enum bt_byte_order native_byte_order)
 {
-       struct bt_ctf_field_type *type = int_field->parent.type;
-       struct bt_ctf_field_type_integer *int_type = (void *) type;
-       enum bt_ctf_byte_order byte_order;
+       struct bt_field_type *type = int_field->parent.type;
+       struct bt_field_type_integer *int_type = (void *) type;
+       enum bt_byte_order byte_order;
        union intval value;
 
        byte_order = int_type->user_byte_order;
-       if (byte_order == BT_CTF_BYTE_ORDER_NATIVE) {
+       if (byte_order == BT_BYTE_ORDER_NATIVE) {
                byte_order = native_byte_order;
        }
 
@@ -222,19 +223,19 @@ int bt_ctf_field_integer_write(struct bt_ctf_field_integer *int_field,
 }
 
 BT_HIDDEN
-int bt_ctf_field_floating_point_write(
-               struct bt_ctf_field_floating_point *flt_field,
-               struct bt_ctf_stream_pos *pos,
-               enum bt_ctf_byte_order native_byte_order)
+int bt_field_floating_point_write(
+               struct bt_field_floating_point *flt_field,
+               struct bt_stream_pos *pos,
+               enum bt_byte_order native_byte_order)
 {
-       struct bt_ctf_field_type *type = flt_field->parent.type;
-       struct bt_ctf_field_type_floating_point *flt_type = (void *) type;
-       enum bt_ctf_byte_order byte_order;
+       struct bt_field_type *type = flt_field->parent.type;
+       struct bt_field_type_floating_point *flt_type = (void *) type;
+       enum bt_byte_order byte_order;
        union intval value;
        unsigned int size;
 
        byte_order = flt_type->user_byte_order;
-       if (byte_order == BT_CTF_BYTE_ORDER_NATIVE) {
+       if (byte_order == BT_BYTE_ORDER_NATIVE) {
                byte_order = native_byte_order;
        }
 
@@ -265,7 +266,7 @@ int bt_ctf_field_floating_point_write(
 }
 
 BT_HIDDEN
-void bt_ctf_stream_pos_packet_seek(struct bt_ctf_stream_pos *pos, size_t index,
+void bt_stream_pos_packet_seek(struct bt_stream_pos *pos, size_t index,
        int whence)
 {
        int ret;
@@ -284,7 +285,7 @@ void bt_ctf_stream_pos_packet_seek(struct bt_ctf_stream_pos *pos, size_t index,
 
        /* The writer will add padding */
        pos->mmap_offset += pos->packet_size / CHAR_BIT;
-       pos->packet_size = getpagesize() * 8 * CHAR_BIT;
+       pos->packet_size = PACKET_LEN_INCREMENT;
        do {
                ret = bt_posix_fallocate(pos->fd, pos->mmap_offset,
                        pos->packet_size / CHAR_BIT);
BabelTrace - Deliverables
This page took 0.029632 seconds and 5 git commands to generate.