X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Fstream-class.c;h=b032b8ee6f2f2a704a2033d22fad80d1b2318a63;hb=c5b9b4417bedfbec9b5dd23b8395ccdd4eeffc44;hp=cc51cced718acaf6a8757e7b27251d8caafbcd71;hpb=65300d60e4b4f167e5fc8f584677757ce09a3844;p=babeltrace.git diff --git a/lib/trace-ir/stream-class.c b/lib/trace-ir/stream-class.c index cc51cced..b032b8ee 100644 --- a/lib/trace-ir/stream-class.c +++ b/lib/trace-ir/stream-class.c @@ -1,12 +1,7 @@ /* - * stream-class.c - * - * Babeltrace trace IR - Stream Class - * + * Copyright 2017-2018 Philippe Proulx * Copyright 2013, 2014 Jérémie Galarneau * - * Author: Jérémie Galarneau - * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights @@ -32,13 +27,14 @@ #include #include #include -#include -#include +#include +#include #include +#include +#include #include #include #include -#include #include #include #include @@ -58,23 +54,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_LOGD_STR("Putting packet context field classe."); - bt_object_put_ref(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_LOGD_STR("Putting event header field class."); + BT_OBJECT_PUT_REF_AND_RESET(stream_class->event_header_fc); + BT_LOGD_STR("Putting packet context field class."); + BT_OBJECT_PUT_REF_AND_RESET(stream_class->packet_context_fc); + BT_LOGD_STR("Putting event common context field class."); + 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); @@ -89,14 +88,14 @@ void free_field_wrapper(struct bt_field_wrapper *field_wrapper, BT_ASSERT_PRE_FUNC static -bool stream_class_id_is_unique(struct bt_trace *trace, uint64_t id) +bool stream_class_id_is_unique(const struct bt_trace_class *tc, uint64_t id) { uint64_t i; bool is_unique = true; - for (i = 0; i < trace->stream_classes->len; i++) { - struct bt_stream_class *sc = - trace->stream_classes->pdata[i]; + for (i = 0; i < tc->stream_classes->len; i++) { + const struct bt_stream_class *sc = + tc->stream_classes->pdata[i]; if (sc->id == id) { is_unique = false; @@ -109,18 +108,17 @@ end: } static -struct bt_stream_class *create_stream_class_with_id(struct bt_trace *trace, - uint64_t id) +struct bt_stream_class *create_stream_class_with_id( + struct bt_trace_class *tc, uint64_t id) { struct bt_stream_class *stream_class = NULL; int ret; - BT_ASSERT(trace); - BT_ASSERT_PRE(stream_class_id_is_unique(trace, id), - "Duplicate stream class ID: %![trace-]+t, id=%" PRIu64, - trace, id); - BT_LIB_LOGD("Creating stream class object: %![trace-]+t, id=%" PRIu64, - trace, id); + BT_ASSERT(tc); + BT_ASSERT_PRE(stream_class_id_is_unique(tc, id), + "Duplicate stream class ID: %![tc-]+T, id=%" PRIu64, tc, id); + BT_LIB_LOGD("Creating stream class object: %![tc-]+T, id=%" PRIu64, + tc, id); stream_class = g_new0(struct bt_stream_class, 1); if (!stream_class) { BT_LOGE_STR("Failed to allocate one stream class."); @@ -167,9 +165,9 @@ struct bt_stream_class *create_stream_class_with_id(struct bt_trace *trace, goto error; } - bt_object_set_parent(&stream_class->base, &trace->base); - g_ptr_array_add(trace->stream_classes, stream_class); - bt_trace_freeze(trace); + bt_object_set_parent(&stream_class->base, &tc->base); + g_ptr_array_add(tc->stream_classes, stream_class); + bt_trace_class_freeze(tc); BT_LIB_LOGD("Created stream class object: %!+S", stream_class); goto end; @@ -180,39 +178,47 @@ end: return stream_class; } -struct bt_stream_class *bt_stream_class_create(struct bt_trace *trace) +struct bt_stream_class *bt_stream_class_create(struct bt_trace_class *tc) { - BT_ASSERT_PRE_NON_NULL(trace, "Trace"); - BT_ASSERT_PRE(trace->assigns_automatic_stream_class_id, - "Trace does not automatically assigns stream class IDs: " - "%![sc-]+t", trace); - return create_stream_class_with_id(trace, - (uint64_t) trace->stream_classes->len); + BT_ASSERT_PRE_NON_NULL(tc, "Trace class"); + BT_ASSERT_PRE(tc->assigns_automatic_stream_class_id, + "Trace class does not automatically assigns stream class IDs: " + "%![sc-]+T", tc); + return create_stream_class_with_id(tc, + (uint64_t) tc->stream_classes->len); } struct bt_stream_class *bt_stream_class_create_with_id( - struct bt_trace *trace, uint64_t id) + struct bt_trace_class *tc, uint64_t id) { - BT_ASSERT_PRE_NON_NULL(trace, "Trace"); - BT_ASSERT_PRE(!trace->assigns_automatic_stream_class_id, - "Trace automatically assigns stream class IDs: " - "%![sc-]+t", trace); - return create_stream_class_with_id(trace, id); + BT_ASSERT_PRE_NON_NULL(tc, "Trace class"); + BT_ASSERT_PRE(!tc->assigns_automatic_stream_class_id, + "Trace class automatically assigns stream class IDs: " + "%![sc-]+T", tc); + return create_stream_class_with_id(tc, id); } -struct bt_trace *bt_stream_class_borrow_trace(struct bt_stream_class *stream_class) +struct bt_trace_class *bt_stream_class_borrow_trace_class( + struct bt_stream_class *stream_class) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); - return bt_stream_class_borrow_trace_inline(stream_class); + return bt_stream_class_borrow_trace_class_inline(stream_class); +} + +const struct bt_trace_class *bt_stream_class_borrow_trace_class_const( + const struct bt_stream_class *stream_class) +{ + return bt_stream_class_borrow_trace_class((void *) stream_class); } -const char *bt_stream_class_get_name(struct bt_stream_class *stream_class) +const char *bt_stream_class_get_name(const struct bt_stream_class *stream_class) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); return stream_class->name.value; } -int bt_stream_class_set_name(struct bt_stream_class *stream_class, +int bt_stream_class_set_name( + struct bt_stream_class *stream_class, const char *name) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); @@ -224,14 +230,14 @@ int bt_stream_class_set_name(struct bt_stream_class *stream_class, return 0; } -uint64_t bt_stream_class_get_id(struct bt_stream_class *stream_class) +uint64_t bt_stream_class_get_id(const struct bt_stream_class *stream_class) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); return stream_class->id; } uint64_t bt_stream_class_get_event_class_count( - struct bt_stream_class *stream_class) + const struct bt_stream_class *stream_class) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); return (uint64_t) stream_class->event_classes->len; @@ -245,17 +251,25 @@ struct bt_event_class *bt_stream_class_borrow_event_class_by_index( return g_ptr_array_index(stream_class->event_classes, index); } +const struct bt_event_class * +bt_stream_class_borrow_event_class_by_index_const( + const struct bt_stream_class *stream_class, uint64_t index) +{ + return bt_stream_class_borrow_event_class_by_index( + (void *) stream_class, index); +} + struct bt_event_class *bt_stream_class_borrow_event_class_by_id( - struct bt_stream_class *trace, uint64_t id) + struct bt_stream_class *stream_class, uint64_t id) { struct bt_event_class *event_class = NULL; uint64_t i; - BT_ASSERT_PRE_NON_NULL(trace, "Trace"); + BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); - for (i = 0; i < trace->event_classes->len; i++) { + for (i = 0; i < stream_class->event_classes->len; i++) { struct bt_event_class *event_class_candidate = - g_ptr_array_index(trace->event_classes, i); + g_ptr_array_index(stream_class->event_classes, i); if (event_class_candidate->id == id) { event_class = event_class_candidate; @@ -267,8 +281,17 @@ end: return event_class; } -struct bt_field_class *bt_stream_class_borrow_packet_context_field_class( - struct bt_stream_class *stream_class) +const struct bt_event_class * +bt_stream_class_borrow_event_class_by_id_const( + const struct bt_stream_class *stream_class, uint64_t id) +{ + return bt_stream_class_borrow_event_class_by_id( + (void *) stream_class, id); +} + +const struct bt_field_class * +bt_stream_class_borrow_packet_context_field_class_const( + const struct bt_stream_class *stream_class) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); return stream_class->packet_context_fc; @@ -293,28 +316,29 @@ int bt_stream_class_set_packet_context_field_class( BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class); BT_ASSERT_PRE(bt_field_class_get_type(field_class) == BT_FIELD_CLASS_TYPE_STRUCTURE, - "Packet context field classe is not a structure field classe: %!+F", + "Packet context field class is not a structure field class: %!+F", field_class); resolve_ctx.packet_header = - bt_stream_class_borrow_trace_inline(stream_class)->packet_header_fc; + bt_stream_class_borrow_trace_class_inline(stream_class)->packet_header_fc; ret = bt_resolve_field_paths(field_class, &resolve_ctx); if (ret) { goto end; } - bt_field_class_make_part_of_trace(field_class); + bt_field_class_make_part_of_trace_class(field_class); bt_object_put_ref(stream_class->packet_context_fc); - stream_class->packet_context_fc = bt_object_get_ref(field_class); + stream_class->packet_context_fc = field_class; + bt_object_get_no_null_check(stream_class->packet_context_fc); bt_field_class_freeze(field_class); - BT_LIB_LOGV("Set stream class's packet context field classe: %!+S", + BT_LIB_LOGV("Set stream class's packet context field class: %!+S", stream_class); end: return ret; } -struct bt_field_class *bt_stream_class_borrow_event_header_field_class( - struct bt_stream_class *stream_class) +const struct bt_field_class *bt_stream_class_borrow_event_header_field_class_const( + const struct bt_stream_class *stream_class) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); return stream_class->event_header_fc; @@ -339,29 +363,31 @@ int bt_stream_class_set_event_header_field_class( BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class); BT_ASSERT_PRE(bt_field_class_get_type(field_class) == BT_FIELD_CLASS_TYPE_STRUCTURE, - "Event header field classe is not a structure field classe: %!+F", + "Event header field class is not a structure field class: %!+F", field_class); resolve_ctx.packet_header = - bt_stream_class_borrow_trace_inline(stream_class)->packet_header_fc; + bt_stream_class_borrow_trace_class_inline(stream_class)->packet_header_fc; resolve_ctx.packet_context = stream_class->packet_context_fc; ret = bt_resolve_field_paths(field_class, &resolve_ctx); if (ret) { goto end; } - bt_field_class_make_part_of_trace(field_class); + bt_field_class_make_part_of_trace_class(field_class); bt_object_put_ref(stream_class->event_header_fc); - stream_class->event_header_fc = bt_object_get_ref(field_class); + stream_class->event_header_fc = field_class; + bt_object_get_no_null_check(stream_class->event_header_fc); bt_field_class_freeze(field_class); - BT_LIB_LOGV("Set stream class's event header field classe: %!+S", + BT_LIB_LOGV("Set stream class's event header field class: %!+S", stream_class); end: return ret; } -struct bt_field_class *bt_stream_class_borrow_event_common_context_field_class( - struct bt_stream_class *stream_class) +const struct bt_field_class * +bt_stream_class_borrow_event_common_context_field_class_const( + const struct bt_stream_class *stream_class) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); return stream_class->event_common_context_fc; @@ -386,10 +412,10 @@ int bt_stream_class_set_event_common_context_field_class( BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class); BT_ASSERT_PRE(bt_field_class_get_type(field_class) == BT_FIELD_CLASS_TYPE_STRUCTURE, - "Event common context field classe is not a structure field classe: %!+F", + "Event common context field class is not a structure field class: %!+F", field_class); resolve_ctx.packet_header = - bt_stream_class_borrow_trace_inline(stream_class)->packet_header_fc; + bt_stream_class_borrow_trace_class_inline(stream_class)->packet_header_fc; resolve_ctx.packet_context = stream_class->packet_context_fc; resolve_ctx.event_header = stream_class->event_header_fc; ret = bt_resolve_field_paths(field_class, &resolve_ctx); @@ -397,11 +423,12 @@ int bt_stream_class_set_event_common_context_field_class( goto end; } - bt_field_class_make_part_of_trace(field_class); + bt_field_class_make_part_of_trace_class(field_class); bt_object_put_ref(stream_class->event_common_context_fc); - stream_class->event_common_context_fc = bt_object_get_ref(field_class); + stream_class->event_common_context_fc = field_class; + bt_object_get_no_null_check(stream_class->event_common_context_fc); bt_field_class_freeze(field_class); - BT_LIB_LOGV("Set stream class's event common context field classe: %!+S", + BT_LIB_LOGV("Set stream class's event common context field class: %!+S", stream_class); end: @@ -409,12 +436,12 @@ end: } BT_HIDDEN -void _bt_stream_class_freeze(struct bt_stream_class *stream_class) +void _bt_stream_class_freeze(const struct bt_stream_class *stream_class) { /* The field classes and default clock class are already frozen */ BT_ASSERT(stream_class); BT_LIB_LOGD("Freezing stream class: %!+S", stream_class); - stream_class->frozen = true; + ((struct bt_stream_class *) stream_class)->frozen = true; } int bt_stream_class_set_default_clock_class( @@ -425,7 +452,8 @@ int bt_stream_class_set_default_clock_class( BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class"); BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class); bt_object_put_ref(stream_class->default_clock_class); - stream_class->default_clock_class = bt_object_get_ref(clock_class); + stream_class->default_clock_class = clock_class; + bt_object_get_no_null_check(stream_class->default_clock_class); bt_clock_class_freeze(clock_class); BT_LIB_LOGV("Set stream class's default clock class: %!+S", stream_class); @@ -439,51 +467,59 @@ struct bt_clock_class *bt_stream_class_borrow_default_clock_class( return stream_class->default_clock_class; } +const struct bt_clock_class *bt_stream_class_borrow_default_clock_class_const( + const struct bt_stream_class *stream_class) +{ + BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); + return stream_class->default_clock_class; +} + bt_bool bt_stream_class_assigns_automatic_event_class_id( - struct bt_stream_class *stream_class) + const struct bt_stream_class *stream_class) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); return (bt_bool) stream_class->assigns_automatic_event_class_id; } -int bt_stream_class_set_assigns_automatic_event_class_id( - struct bt_stream_class *stream_class, bt_bool value) +void bt_stream_class_set_assigns_automatic_event_class_id( + struct bt_stream_class *stream_class, + bt_bool value) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class); 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( - struct bt_stream_class *stream_class) + const struct bt_stream_class *stream_class) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); return (bt_bool) stream_class->assigns_automatic_stream_id; } -int bt_stream_class_set_assigns_automatic_stream_id( - struct bt_stream_class *stream_class, bt_bool value) +void bt_stream_class_set_assigns_automatic_stream_id( + struct bt_stream_class *stream_class, + bt_bool value) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class); 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( - struct bt_stream_class *stream_class) + const struct bt_stream_class *stream_class) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); return (bt_bool) stream_class->packets_have_discarded_event_counter_snapshot; } -int bt_stream_class_set_packets_have_discarded_event_counter_snapshot( - struct bt_stream_class *stream_class, bt_bool value) +void bt_stream_class_set_packets_have_discarded_event_counter_snapshot( + struct bt_stream_class *stream_class, + bt_bool value) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class); @@ -492,18 +528,18 @@ int bt_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( - struct bt_stream_class *stream_class) + const struct bt_stream_class *stream_class) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); return (bt_bool) stream_class->packets_have_packet_counter_snapshot; } -int bt_stream_class_set_packets_have_packet_counter_snapshot( - struct bt_stream_class *stream_class, bt_bool value) +void bt_stream_class_set_packets_have_packet_counter_snapshot( + struct bt_stream_class *stream_class, + bt_bool value) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class); @@ -512,18 +548,18 @@ int bt_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( - struct bt_stream_class *stream_class) + const struct bt_stream_class *stream_class) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); return (bt_bool) stream_class->packets_have_default_beginning_cv; } -int bt_stream_class_set_packets_have_default_beginning_clock_value( - struct bt_stream_class *stream_class, bt_bool value) +void bt_stream_class_set_packets_have_default_beginning_clock_value( + struct bt_stream_class *stream_class, + bt_bool value) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class); @@ -534,18 +570,18 @@ int bt_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( - struct bt_stream_class *stream_class) + const struct bt_stream_class *stream_class) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); return (bt_bool) stream_class->packets_have_default_end_cv; } -int bt_stream_class_set_packets_have_default_end_clock_value( - struct bt_stream_class *stream_class, bt_bool value) +void bt_stream_class_set_packets_have_default_end_clock_value( + struct bt_stream_class *stream_class, + bt_bool value) { BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class); @@ -556,12 +592,21 @@ int bt_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( - struct bt_stream_class *stream_class) + const struct bt_stream_class *stream_class) { /* BT_CLOCK_VALUE_STATUS_UNKNOWN is not supported as of 2.0 */ return BT_TRUE; } + +void bt_stream_class_get_ref(const struct bt_stream_class *stream_class) +{ + bt_object_get_ref(stream_class); +} + +void bt_stream_class_put_ref(const struct bt_stream_class *stream_class) +{ + bt_object_put_ref(stream_class); +}