lib: rename `bt_object_{get,put}_no` -> `bt_object_{get,put}_ref_no`

[babeltrace.git] / src / lib / trace-ir / packet.c

diff --git a/src/lib/trace-ir/packet.c b/src/lib/trace-ir/packet.c
index 8f8625b6123b7f7b9ea8b2f46b62dd4200f80126..e3fdf5bbb62e4b5154402add3ee90fa652dc36c0 100644 (file)
--- a/src/lib/trace-ir/packet.c
+++ b/src/lib/trace-ir/packet.c
@@ -41,12 +41,9 @@
 #include "trace.h"
 #include "lib/func-status.h"
 
-#define BT_ASSERT_PRE_PACKET_HOT(_packet) \
-       BT_ASSERT_PRE_HOT((_packet), "Packet", ": %!+a", (_packet))
-
 struct bt_stream *bt_packet_borrow_stream(struct bt_packet *packet)
 {
-       BT_ASSERT_PRE_NON_NULL(packet, "Packet");
+       BT_ASSERT_PRE_DEV_NON_NULL(packet, "Packet");
        return packet->stream;
 }
 
@@ -58,7 +55,7 @@ const struct bt_stream *bt_packet_borrow_stream_const(
 
 struct bt_field *bt_packet_borrow_context_field(struct bt_packet *packet)
 {
-       BT_ASSERT_PRE_NON_NULL(packet, "Packet");
+       BT_ASSERT_PRE_DEV_NON_NULL(packet, "Packet");
        return packet->context_field ? packet->context_field->field : NULL;
 }
 
@@ -147,7 +144,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_object_put_no_null_check(&stream->base);
+       bt_object_put_ref_no_null_check(&stream->base);
 }
 
 BT_HIDDEN
@@ -190,7 +187,7 @@ struct bt_packet *bt_packet_new(struct bt_stream *stream)
        bt_object_init_shared(&packet->base,
                (bt_object_release_func) bt_packet_recycle);
        packet->stream = stream;
-       bt_object_get_no_null_check(stream);
+       bt_object_get_ref_no_null_check(stream);
        trace_class = bt_stream_class_borrow_trace_class_inline(stream->class);
        BT_ASSERT(trace_class);
 
@@ -235,7 +232,7 @@ struct bt_packet *bt_packet_create(const struct bt_stream *c_stream)
 
        if (G_LIKELY(!packet->stream)) {
                packet->stream = stream;
-               bt_object_get_no_null_check_no_parent_check(
+               bt_object_get_ref_no_null_check_no_parent_check(
                        &packet->stream->base);
        }
 
@@ -250,14 +247,14 @@ enum bt_packet_move_context_field_status bt_packet_move_context_field(
        struct bt_stream_class *stream_class;
        struct bt_field_wrapper *field_wrapper = (void *) context_field;
 
-       BT_ASSERT_PRE_NON_NULL(packet, "Packet");
-       BT_ASSERT_PRE_NON_NULL(field_wrapper, "Context field");
-       BT_ASSERT_PRE_HOT(packet, "Packet", ": %!+a", packet);
+       BT_ASSERT_PRE_DEV_NON_NULL(packet, "Packet");
+       BT_ASSERT_PRE_DEV_NON_NULL(field_wrapper, "Context field");
+       BT_ASSERT_PRE_DEV_HOT(packet, "Packet", ": %!+a", packet);
        stream_class = packet->stream->class;
-       BT_ASSERT_PRE(stream_class->packet_context_fc,
+       BT_ASSERT_PRE_DEV(stream_class->packet_context_fc,
                "Stream class has no packet context field class: %!+S",
                stream_class);
-       BT_ASSERT_PRE(field_wrapper->field->class ==
+       BT_ASSERT_PRE_DEV(field_wrapper->field->class ==
                stream_class->packet_context_fc,
                "Unexpected packet context field's class: "
                "%![fc-]+F, %![expected-fc-]+F", field_wrapper->field->class,