lib: trace IR, values: reset pointers to `NULL` on destruction

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

diff --git a/lib/trace-ir/packet.c b/lib/trace-ir/packet.c
index 3c01165fbd08e0ace523116f350b4bf68798be68..983887c42ebe1166cd5a8612cf48d7f2e8ad1799 100644 (file)
--- a/lib/trace-ir/packet.c
+++ b/lib/trace-ir/packet.c
@@ -218,6 +218,8 @@ void bt_packet_destroy(struct bt_packet *packet)
                } else {
                        bt_field_wrapper_destroy(packet->header_field);
                }
+
+               packet->header_field = NULL;
        }
 
        if (packet->context_field) {
@@ -228,20 +230,24 @@ void bt_packet_destroy(struct bt_packet *packet)
                } else {
                        bt_field_wrapper_destroy(packet->context_field);
                }
+
+               packet->context_field = NULL;
        }
 
        if (packet->default_beginning_cv) {
                BT_LOGD_STR("Recycling beginning clock value.");
                bt_clock_value_recycle(packet->default_beginning_cv);
+               packet->default_beginning_cv = NULL;
        }
 
        if (packet->default_end_cv) {
                BT_LOGD_STR("Recycling end clock value.");
                bt_clock_value_recycle(packet->default_end_cv);
+               packet->default_end_cv = NULL;
        }
 
        BT_LOGD_STR("Putting packet's stream.");
-       bt_object_put_ref(packet->stream);
+       BT_OBJECT_PUT_REF_AND_RESET(packet->stream);
        g_free(packet);
 }
 
@@ -402,7 +408,7 @@ int bt_private_packet_move_context_field(
        return 0;
 }
 
-int bt_private_packet_set_default_beginning_clock_value(
+void bt_private_packet_set_default_beginning_clock_value(
                struct bt_private_packet *priv_packet,
                uint64_t value_cycles)
 {
@@ -421,10 +427,10 @@ int bt_private_packet_set_default_beginning_clock_value(
                "no default beginning clock value: %![packet-]+a, %![sc-]+S",
                packet, sc);
        BT_ASSERT(packet->default_beginning_cv);
-       bt_clock_value_set_value_inline(packet->default_beginning_cv, value_cycles);
+       bt_clock_value_set_value_inline(packet->default_beginning_cv,
+               value_cycles);
        BT_LIB_LOGV("Set packet's default beginning clock value: "
                "%![packet-]+a, value=%" PRIu64, packet, value_cycles);
-       return 0;
 }
 
 enum bt_clock_value_status bt_packet_borrow_default_beginning_clock_value(
@@ -436,7 +442,7 @@ enum bt_clock_value_status bt_packet_borrow_default_beginning_clock_value(
        return BT_CLOCK_VALUE_STATUS_KNOWN;
 }
 
-int bt_private_packet_set_default_end_clock_value(
+void bt_private_packet_set_default_end_clock_value(
                struct bt_private_packet *priv_packet,
                uint64_t value_cycles)
 {
@@ -458,7 +464,6 @@ int bt_private_packet_set_default_end_clock_value(
        bt_clock_value_set_value_inline(packet->default_end_cv, value_cycles);
        BT_LIB_LOGV("Set packet's default end clock value: "
                "%![packet-]+a, value=%" PRIu64, packet, value_cycles);
-       return 0;
 }
 
 enum bt_clock_value_status bt_packet_borrow_default_end_clock_value(
@@ -479,7 +484,7 @@ enum bt_property_availability bt_packet_get_discarded_event_counter_snapshot(
        return packet->discarded_event_counter_snapshot.base.avail;
 }
 
-int bt_private_packet_set_discarded_event_counter_snapshot(
+void bt_private_packet_set_discarded_event_counter_snapshot(
                struct bt_private_packet *priv_packet, uint64_t value)
 {
        struct bt_packet *packet = (void *) priv_packet;
@@ -490,7 +495,6 @@ int bt_private_packet_set_discarded_event_counter_snapshot(
                "Packet's stream's discarded event counter is not enabled: "
                "%![packet-]+a", packet);
        bt_property_uint_set(&packet->discarded_event_counter_snapshot, value);
-       return 0;
 }
 
 enum bt_property_availability bt_packet_get_packet_counter_snapshot(
@@ -502,7 +506,7 @@ enum bt_property_availability bt_packet_get_packet_counter_snapshot(
        return packet->packet_counter_snapshot.base.avail;
 }
 
-int bt_private_packet_set_packet_counter_snapshot(
+void bt_private_packet_set_packet_counter_snapshot(
                struct bt_private_packet *priv_packet, uint64_t value)
 {
        struct bt_packet *packet = (void *) priv_packet;
@@ -513,11 +517,4 @@ int bt_private_packet_set_packet_counter_snapshot(
                "Packet's stream's packet counter is not enabled: "
                "%![packet-]+a", packet);
        bt_property_uint_set(&packet->packet_counter_snapshot, value);
-       return 0;
-}
-
-struct bt_packet *bt_packet_borrow_from_private(
-               struct bt_private_packet *priv_packet)
-{
-       return (void *) priv_packet;
 }