X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Fstream-class.c;h=9d016844f83bfe14038dbe1845e1bc78679607c8;hb=238b7404b66983c6ba15c3a44bfbf642f20bdabe;hp=8c5133b1368e902e00c51e553b328900ef4a0f04;hpb=e5be10efe4d5543ba697c7e607ca0a5c33fa3ccb;p=babeltrace.git diff --git a/lib/trace-ir/stream-class.c b/lib/trace-ir/stream-class.c index 8c5133b1..9d016844 100644 --- a/lib/trace-ir/stream-class.c +++ b/lib/trace-ir/stream-class.c @@ -56,23 +56,26 @@ void destroy_stream_class(struct bt_object *obj) BT_LIB_LOGD("Destroying stream class: %!+S", stream_class); BT_LOGD_STR("Putting default clock class."); - bt_object_put_ref(stream_class->default_clock_class); + BT_OBJECT_PUT_REF_AND_RESET(stream_class->default_clock_class); if (stream_class->event_classes) { BT_LOGD_STR("Destroying event classes."); g_ptr_array_free(stream_class->event_classes, TRUE); + stream_class->event_classes = NULL; } if (stream_class->name.str) { g_string_free(stream_class->name.str, TRUE); + stream_class->name.str = NULL; + stream_class->name.value = NULL; } BT_LOGD_STR("Putting event header field classe."); - bt_object_put_ref(stream_class->event_header_fc); + BT_OBJECT_PUT_REF_AND_RESET(stream_class->event_header_fc); BT_LOGD_STR("Putting packet context field classe."); - bt_object_put_ref(stream_class->packet_context_fc); + BT_OBJECT_PUT_REF_AND_RESET(stream_class->packet_context_fc); BT_LOGD_STR("Putting event common context field classe."); - bt_object_put_ref(stream_class->event_common_context_fc); + BT_OBJECT_PUT_REF_AND_RESET(stream_class->event_common_context_fc); bt_object_pool_finalize(&stream_class->event_header_field_pool); bt_object_pool_finalize(&stream_class->packet_context_field_pool); g_free(stream_class); @@ -258,7 +261,7 @@ struct bt_event_class *bt_stream_class_borrow_event_class_by_index( } struct bt_private_event_class * -bt_private_stream_class_borrow_private_event_class_by_index( +bt_private_stream_class_borrow_event_class_by_index( struct bt_private_stream_class *stream_class, uint64_t index) { return (void *) bt_stream_class_borrow_event_class_by_index( @@ -288,7 +291,7 @@ end: } struct bt_private_event_class * -bt_private_stream_class_borrow_private_event_class_by_id( +bt_private_stream_class_borrow_event_class_by_id( struct bt_private_stream_class *stream_class, uint64_t id) { return (void *) bt_stream_class_borrow_event_class_by_id( @@ -303,14 +306,14 @@ struct bt_field_class *bt_stream_class_borrow_packet_context_field_class( } struct bt_private_field_class * -bt_private_stream_class_borrow_packet_context_private_field_class( +bt_private_stream_class_borrow_packet_context_field_class( struct bt_private_stream_class *stream_class) { return (void *) bt_stream_class_borrow_packet_context_field_class( (void *) stream_class); } -int bt_private_stream_class_set_packet_context_private_field_class( +int bt_private_stream_class_set_packet_context_field_class( struct bt_private_stream_class *priv_stream_class, struct bt_private_field_class *priv_field_class) { @@ -359,14 +362,14 @@ struct bt_field_class *bt_stream_class_borrow_event_header_field_class( } struct bt_private_field_class * -bt_private_stream_class_borrow_event_header_private_field_class( +bt_private_stream_class_borrow_event_header_field_class( struct bt_private_stream_class *stream_class) { return (void *) bt_stream_class_borrow_event_header_field_class( (void *) stream_class); } -int bt_private_stream_class_set_event_header_private_field_class( +int bt_private_stream_class_set_event_header_field_class( struct bt_private_stream_class *priv_stream_class, struct bt_private_field_class *priv_field_class) { @@ -416,14 +419,14 @@ struct bt_field_class *bt_stream_class_borrow_event_common_context_field_class( } struct bt_private_field_class * -bt_private_stream_class_borrow_event_common_context_private_field_class( +bt_private_stream_class_borrow_event_common_context_field_class( struct bt_private_stream_class *stream_class) { return (void *) bt_stream_class_borrow_event_common_context_field_class( (void *) stream_class); } -int bt_private_stream_class_set_event_common_context_private_field_class( +int bt_private_stream_class_set_event_common_context_field_class( struct bt_private_stream_class *priv_stream_class, struct bt_private_field_class *priv_field_class) { @@ -506,7 +509,7 @@ bt_bool bt_stream_class_assigns_automatic_event_class_id( return (bt_bool) stream_class->assigns_automatic_event_class_id; } -int bt_private_stream_class_set_assigns_automatic_event_class_id( +void bt_private_stream_class_set_assigns_automatic_event_class_id( struct bt_private_stream_class *priv_stream_class, bt_bool value) { @@ -517,7 +520,6 @@ int bt_private_stream_class_set_assigns_automatic_event_class_id( stream_class->assigns_automatic_event_class_id = (bool) value; BT_LIB_LOGV("Set stream class's automatic event class ID " "assignment property: %!+S", stream_class); - return 0; } bt_bool bt_stream_class_assigns_automatic_stream_id( @@ -527,7 +529,7 @@ bt_bool bt_stream_class_assigns_automatic_stream_id( return (bt_bool) stream_class->assigns_automatic_stream_id; } -int bt_private_stream_class_set_assigns_automatic_stream_id( +void bt_private_stream_class_set_assigns_automatic_stream_id( struct bt_private_stream_class *priv_stream_class, bt_bool value) { @@ -538,7 +540,6 @@ int bt_private_stream_class_set_assigns_automatic_stream_id( stream_class->assigns_automatic_stream_id = (bool) value; BT_LIB_LOGV("Set stream class's automatic stream ID " "assignment property: %!+S", stream_class); - return 0; } bt_bool bt_stream_class_packets_have_discarded_event_counter_snapshot( @@ -548,7 +549,7 @@ bt_bool bt_stream_class_packets_have_discarded_event_counter_snapshot( return (bt_bool) stream_class->packets_have_discarded_event_counter_snapshot; } -int bt_private_stream_class_set_packets_have_discarded_event_counter_snapshot( +void bt_private_stream_class_set_packets_have_discarded_event_counter_snapshot( struct bt_private_stream_class *priv_stream_class, bt_bool value) { @@ -561,7 +562,6 @@ int bt_private_stream_class_set_packets_have_discarded_event_counter_snapshot( BT_LIB_LOGV("Set stream class's " "\"packets have discarded event counter snapshot\" property: " "%!+S", stream_class); - return 0; } bt_bool bt_stream_class_packets_have_packet_counter_snapshot( @@ -571,7 +571,7 @@ bt_bool bt_stream_class_packets_have_packet_counter_snapshot( return (bt_bool) stream_class->packets_have_packet_counter_snapshot; } -int bt_private_stream_class_set_packets_have_packet_counter_snapshot( +void bt_private_stream_class_set_packets_have_packet_counter_snapshot( struct bt_private_stream_class *priv_stream_class, bt_bool value) { @@ -584,7 +584,6 @@ int bt_private_stream_class_set_packets_have_packet_counter_snapshot( BT_LIB_LOGV("Set stream class's " "\"packets have packet counter snapshot\" property: " "%!+S", stream_class); - return 0; } bt_bool bt_stream_class_packets_have_default_beginning_clock_value( @@ -594,7 +593,7 @@ bt_bool bt_stream_class_packets_have_default_beginning_clock_value( return (bt_bool) stream_class->packets_have_default_beginning_cv; } -int bt_private_stream_class_set_packets_have_default_beginning_clock_value( +void bt_private_stream_class_set_packets_have_default_beginning_clock_value( struct bt_private_stream_class *priv_stream_class, bt_bool value) { @@ -609,7 +608,6 @@ int bt_private_stream_class_set_packets_have_default_beginning_clock_value( BT_LIB_LOGV("Set stream class's " "\"packets have default beginning clock value\" property: " "%!+S", stream_class); - return 0; } bt_bool bt_stream_class_packets_have_default_end_clock_value( @@ -619,7 +617,7 @@ bt_bool bt_stream_class_packets_have_default_end_clock_value( return (bt_bool) stream_class->packets_have_default_end_cv; } -int bt_private_stream_class_set_packets_have_default_end_clock_value( +void bt_private_stream_class_set_packets_have_default_end_clock_value( struct bt_private_stream_class *priv_stream_class, bt_bool value) { @@ -634,7 +632,6 @@ int bt_private_stream_class_set_packets_have_default_end_clock_value( BT_LIB_LOGV("Set stream class's " "\"packets have default end clock value\" property: " "%!+S", stream_class); - return 0; } bt_bool bt_stream_class_default_clock_is_always_known( @@ -643,9 +640,3 @@ bt_bool bt_stream_class_default_clock_is_always_known( /* BT_CLOCK_VALUE_STATUS_UNKNOWN is not supported as of 2.0 */ return BT_TRUE; } - -struct bt_stream_class *bt_stream_class_borrow_from_private( - struct bt_private_stream_class *priv_stream_class) -{ - return (void *) priv_stream_class; -}