lib: remove clock class priority map, use default clock value

[babeltrace.git] / lib / ctf-ir / packet.c

diff --git a/lib/ctf-ir/packet.c b/lib/ctf-ir/packet.c
index 227a7fd9c959776e19f0d5ede7f8a84a5f1e431e..ad09416bc52af2209b2fe1fd24f759c5dfcb6da8 100644 (file)
--- a/lib/ctf-ir/packet.c
+++ b/lib/ctf-ir/packet.c
@@ -62,7 +62,7 @@ struct bt_field *bt_packet_borrow_context(struct bt_packet *packet)
 }
 
 BT_HIDDEN
-void _bt_packet_freeze(struct bt_packet *packet)
+void _bt_packet_set_is_frozen(struct bt_packet *packet, bool is_frozen)
 {
        if (!packet || packet->frozen) {
                return;
@@ -72,22 +72,24 @@ void _bt_packet_freeze(struct bt_packet *packet)
 
        if (packet->header) {
                BT_LOGD_STR("Freezing packet's header field.");
-               bt_field_set_is_frozen_recursive((void *) packet->header->field, true);
+               bt_field_set_is_frozen_recursive((void *) packet->header->field,
+                       is_frozen);
        }
 
        if (packet->context) {
                BT_LOGD_STR("Freezing packet's context field.");
-               bt_field_set_is_frozen_recursive((void *) packet->context->field, true);
+               bt_field_set_is_frozen_recursive((void *) packet->context->field,
+                       is_frozen);
        }
 
-       packet->frozen = 1;
+       packet->frozen = is_frozen;
 }
 
 static inline
 void bt_packet_reset(struct bt_packet *packet)
 {
        BT_ASSERT(packet);
-       packet->frozen = false;
+       bt_packet_set_is_frozen(packet, false);
 
        if (packet->header) {
                bt_field_set_is_frozen_recursive(
@@ -100,6 +102,9 @@ void bt_packet_reset(struct bt_packet *packet)
                        (void *) packet->context->field, false);
                bt_field_reset_recursive((void *) packet->context->field);
        }
+
+       bt_clock_value_set_reset(&packet->begin_cv_set);
+       bt_clock_value_set_reset(&packet->end_cv_set);
 }
 
 static
@@ -161,7 +166,7 @@ void bt_packet_recycle(struct bt_packet *packet)
        BT_ASSERT(stream);
        packet->stream = NULL;
        bt_object_pool_recycle_object(&stream->packet_pool, packet);
-       bt_put(stream);
+       bt_object_put_no_null_check(&stream->common.base);
 }
 
 BT_HIDDEN
@@ -191,6 +196,8 @@ void bt_packet_destroy(struct bt_packet *packet)
                }
        }
 
+       bt_clock_value_set_finalize(&packet->begin_cv_set);
+       bt_clock_value_set_finalize(&packet->end_cv_set);
        BT_LOGD_STR("Putting packet's stream.");
        bt_put(packet->stream);
        g_free(packet);
@@ -251,6 +258,16 @@ struct bt_packet *bt_packet_new(struct bt_stream *stream)
                }
        }
 
+       if (bt_clock_value_set_initialize(&packet->begin_cv_set)) {
+               BT_PUT(packet);
+               goto end;
+       }
+
+       if (bt_clock_value_set_initialize(&packet->end_cv_set)) {
+               BT_PUT(packet);
+               goto end;
+       }
+
        BT_LOGD("Created packet object: addr=%p", packet);
 
 end:
@@ -263,24 +280,20 @@ struct bt_packet *bt_packet_create(struct bt_stream *stream)
 
        BT_ASSERT_PRE_NON_NULL(stream, "Stream");
        packet = bt_object_pool_create_object(&stream->packet_pool);
-       if (!packet) {
+       if (unlikely(!packet)) {
                BT_LIB_LOGE("Cannot allocate one packet from stream's packet pool: "
                        "%![stream-]+s", stream);
-               goto error;
+               goto end;
        }
 
-       if (!packet->stream) {
-               packet->stream = bt_get(stream);
+       if (unlikely(!packet->stream)) {
+               packet->stream = stream;
+               bt_object_get_no_null_check_no_parent_check(
+                       &packet->stream->common.base);
        }
 
        goto end;
 
-error:
-       if (packet) {
-               bt_packet_recycle(packet);
-               packet = NULL;
-       }
-
 end:
        return packet;
 }
@@ -293,7 +306,7 @@ int bt_packet_move_header(struct bt_packet *packet,
 
        BT_ASSERT_PRE_NON_NULL(packet, "Event");
        BT_ASSERT_PRE_NON_NULL(field_wrapper, "Header field");
-       BT_ASSERT_PRE_HOT(packet, "Packet", ": +%!+a", packet);
+       BT_ASSERT_PRE_HOT(packet, "Packet", ": %!+a", packet);
        trace = bt_stream_class_borrow_trace(
                bt_stream_borrow_class(packet->stream));
        BT_ASSERT_PRE(trace->common.packet_header_field_type,
@@ -319,7 +332,7 @@ int bt_packet_move_context(struct bt_packet *packet,
 
        BT_ASSERT_PRE_NON_NULL(packet, "Event");
        BT_ASSERT_PRE_NON_NULL(field_wrapper, "Context field");
-       BT_ASSERT_PRE_HOT(packet, "Packet", ": +%!+a", packet);
+       BT_ASSERT_PRE_HOT(packet, "Packet", ": %!+a", packet);
        stream_class = bt_stream_borrow_class(packet->stream);
        BT_ASSERT_PRE(stream_class->common.packet_context_field_type,
                "Stream class has no packet context field type: %!+S",
@@ -335,3 +348,57 @@ int bt_packet_move_context(struct bt_packet *packet,
        packet->context = field_wrapper;
        return 0;
 }
+
+int bt_packet_set_beginning_clock_value(struct bt_packet *packet,
+               struct bt_clock_class *clock_class, uint64_t raw_value,
+               bt_bool is_default)
+{
+       BT_ASSERT_PRE_NON_NULL(packet, "Packet");
+       BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+       BT_ASSERT_PRE_HOT(packet, "Packet", ": %!+a", packet);
+       BT_ASSERT_PRE(is_default,
+               "You can only set a default clock value as of this version.");
+       return bt_clock_value_set_set_clock_value(&packet->begin_cv_set,
+               clock_class, raw_value, is_default);
+}
+
+struct bt_clock_value *bt_packet_borrow_default_begin_clock_value(
+               struct bt_packet *packet)
+{
+       struct bt_clock_value *clock_value = NULL;
+
+       BT_ASSERT_PRE_NON_NULL(packet, "Packet");
+       clock_value = packet->begin_cv_set.default_cv;
+       if (!clock_value) {
+               BT_LIB_LOGV("No default clock value: %![packet-]+a", packet);
+       }
+
+       return clock_value;
+}
+
+int bt_packet_set_end_clock_value(struct bt_packet *packet,
+               struct bt_clock_class *clock_class, uint64_t raw_value,
+               bt_bool is_default)
+{
+       BT_ASSERT_PRE_NON_NULL(packet, "Packet");
+       BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+       BT_ASSERT_PRE_HOT(packet, "Packet", ": %!+a", packet);
+       BT_ASSERT_PRE(is_default,
+               "You can only set a default clock value as of this version.");
+       return bt_clock_value_set_set_clock_value(&packet->end_cv_set,
+               clock_class, raw_value, is_default);
+}
+
+struct bt_clock_value *bt_packet_borrow_default_end_clock_value(
+               struct bt_packet *packet)
+{
+       struct bt_clock_value *clock_value = NULL;
+
+       BT_ASSERT_PRE_NON_NULL(packet, "Packet");
+       clock_value = packet->end_cv_set.default_cv;
+       if (!clock_value) {
+               BT_LIB_LOGV("No default clock value: %![packet-]+a", packet);
+       }
+
+       return clock_value;
+}