X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fstream-class.c;h=73d96f0e8a67e9b4284072caaea7080abfbc4d4f;hb=867eb7632255f6a84234542198bd7edaac1bce12;hp=e6c2c8f6177cad16e0a1872d4b5cfa3b8d540f0c;hpb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;p=babeltrace.git diff --git a/src/lib/trace-ir/stream-class.c b/src/lib/trace-ir/stream-class.c index e6c2c8f6..73d96f0e 100644 --- a/src/lib/trace-ir/stream-class.c +++ b/src/lib/trace-ir/stream-class.c @@ -8,7 +8,7 @@ #define BT_LOG_TAG "LIB/STREAM-CLASS" #include "lib/logging.h" -#include "lib/assert-pre.h" +#include "lib/assert-cond.h" #include #include "compat/compiler.h" #include "common/align.h" @@ -31,8 +31,9 @@ #include "lib/value.h" #include "lib/func-status.h" -#define BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(_sc) \ - BT_ASSERT_PRE_DEV_HOT((_sc), "Stream class", ": %!+S", (_sc)) +#define BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(_sc) \ + BT_ASSERT_PRE_DEV_HOT("stream-class", (_sc), "Stream class", \ + ": %!+S", (_sc)) static void destroy_stream_class(struct bt_object *obj) @@ -99,7 +100,8 @@ struct bt_stream_class *create_stream_class_with_id( int ret; BT_ASSERT(tc); - BT_ASSERT_PRE(stream_class_id_is_unique(tc, id), + BT_ASSERT_PRE("stream-class-id-is-unique", + 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); @@ -162,8 +164,9 @@ end: struct bt_stream_class *bt_stream_class_create(struct bt_trace_class *tc) { BT_ASSERT_PRE_NO_ERROR(); - BT_ASSERT_PRE_NON_NULL(tc, "Trace class"); - BT_ASSERT_PRE(tc->assigns_automatic_stream_class_id, + BT_ASSERT_PRE_TC_NON_NULL(tc); + BT_ASSERT_PRE("trace-class-automatically-assigns-stream-class-ids", + 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, @@ -174,8 +177,10 @@ struct bt_stream_class *bt_stream_class_create_with_id( struct bt_trace_class *tc, uint64_t id) { BT_ASSERT_PRE_NO_ERROR(); - BT_ASSERT_PRE_NON_NULL(tc, "Trace class"); - BT_ASSERT_PRE(!tc->assigns_automatic_stream_class_id, + BT_ASSERT_PRE_TC_NON_NULL(tc); + BT_ASSERT_PRE( + "trace-class-does-not-automatically-assigns-stream-class-ids", + !tc->assigns_automatic_stream_class_id, "Trace class automatically assigns stream class IDs: " "%![sc-]+T", tc); return create_stream_class_with_id(tc, id); @@ -184,7 +189,7 @@ struct bt_stream_class *bt_stream_class_create_with_id( struct bt_trace_class *bt_stream_class_borrow_trace_class( struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return bt_stream_class_borrow_trace_class_inline(stream_class); } @@ -196,7 +201,7 @@ const struct bt_trace_class *bt_stream_class_borrow_trace_class_const( const char *bt_stream_class_get_name(const struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return stream_class->name.value; } @@ -205,8 +210,8 @@ enum bt_stream_class_set_name_status bt_stream_class_set_name( const char *name) { BT_ASSERT_PRE_NO_ERROR(); - BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); - BT_ASSERT_PRE_NON_NULL(name, "Name"); + BT_ASSERT_PRE_SC_NON_NULL(stream_class); + BT_ASSERT_PRE_NAME_NON_NULL(name); BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class); g_string_assign(stream_class->name.str, name); stream_class->name.value = stream_class->name.str->str; @@ -216,21 +221,21 @@ enum bt_stream_class_set_name_status bt_stream_class_set_name( uint64_t bt_stream_class_get_id(const struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return stream_class->id; } uint64_t bt_stream_class_get_event_class_count( const struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return (uint64_t) stream_class->event_classes->len; } struct bt_event_class *bt_stream_class_borrow_event_class_by_index( struct bt_stream_class *stream_class, uint64_t index) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); BT_ASSERT_PRE_DEV_VALID_INDEX(index, stream_class->event_classes->len); return g_ptr_array_index(stream_class->event_classes, index); } @@ -249,7 +254,7 @@ struct bt_event_class *bt_stream_class_borrow_event_class_by_id( struct bt_event_class *event_class = NULL; uint64_t i; - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); for (i = 0; i < stream_class->event_classes->len; i++) { struct bt_event_class *event_class_candidate = @@ -277,7 +282,7 @@ const struct bt_field_class * bt_stream_class_borrow_packet_context_field_class_const( const struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return stream_class->packet_context_fc; } @@ -285,7 +290,7 @@ struct bt_field_class * bt_stream_class_borrow_packet_context_field_class( struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return stream_class->packet_context_fc; } @@ -303,17 +308,16 @@ bt_stream_class_set_packet_context_field_class( }; BT_ASSERT_PRE_NO_ERROR(); - BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); - BT_ASSERT_PRE(stream_class->supports_packets, + BT_ASSERT_PRE_SC_NON_NULL(stream_class); + BT_ASSERT_PRE("supports-packets", + stream_class->supports_packets, "Stream class does not support packets: %![sc-]+S", stream_class); - BT_ASSERT_PRE_NON_NULL(field_class, "Field class"); + BT_ASSERT_PRE_FC_NON_NULL(field_class); BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class); - BT_ASSERT_PRE(bt_field_class_get_type(field_class) == - BT_FIELD_CLASS_TYPE_STRUCTURE, - "Packet context field class is not a structure field class: %!+F", - field_class); - ret = bt_resolve_field_paths(field_class, &resolve_ctx); + BT_ASSERT_PRE_FC_IS_STRUCT("field-class", field_class, + "Packet context field class"); + ret = bt_resolve_field_paths(field_class, &resolve_ctx, __func__); if (ret) { /* * This is the only reason for which @@ -340,7 +344,7 @@ 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_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return stream_class->event_common_context_fc; } @@ -348,7 +352,7 @@ struct bt_field_class * bt_stream_class_borrow_event_common_context_field_class( struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return stream_class->event_common_context_fc; } @@ -366,15 +370,13 @@ bt_stream_class_set_event_common_context_field_class( }; BT_ASSERT_PRE_NO_ERROR(); - BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); - BT_ASSERT_PRE_NON_NULL(field_class, "Field class"); + BT_ASSERT_PRE_SC_NON_NULL(stream_class); + BT_ASSERT_PRE_FC_NON_NULL(field_class); BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class); - BT_ASSERT_PRE(bt_field_class_get_type(field_class) == - BT_FIELD_CLASS_TYPE_STRUCTURE, - "Event common context field class is not a structure field class: %!+F", - field_class); + BT_ASSERT_PRE_FC_IS_STRUCT("field-class", field_class, + "Event common context field class"); resolve_ctx.packet_context = stream_class->packet_context_fc; - ret = bt_resolve_field_paths(field_class, &resolve_ctx); + ret = bt_resolve_field_paths(field_class, &resolve_ctx, __func__); if (ret) { /* * This is the only reason for which @@ -415,8 +417,8 @@ bt_stream_class_set_default_clock_class( struct bt_clock_class *clock_class) { BT_ASSERT_PRE_NO_ERROR(); - BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); - BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class"); + BT_ASSERT_PRE_SC_NON_NULL(stream_class); + BT_ASSERT_PRE_CLK_CLS_NON_NULL(clock_class); BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class); bt_object_put_ref(stream_class->default_clock_class); stream_class->default_clock_class = clock_class; @@ -430,21 +432,21 @@ bt_stream_class_set_default_clock_class( struct bt_clock_class *bt_stream_class_borrow_default_clock_class( struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_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_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return stream_class->default_clock_class; } bt_bool bt_stream_class_assigns_automatic_event_class_id( const struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return (bt_bool) stream_class->assigns_automatic_event_class_id; } @@ -452,7 +454,7 @@ 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_SC_NON_NULL(stream_class); BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class); stream_class->assigns_automatic_event_class_id = (bool) value; BT_LIB_LOGD("Set stream class's automatic event class ID " @@ -462,7 +464,7 @@ void bt_stream_class_set_assigns_automatic_event_class_id( bt_bool bt_stream_class_assigns_automatic_stream_id( const struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return (bt_bool) stream_class->assigns_automatic_stream_id; } @@ -471,14 +473,16 @@ void bt_stream_class_set_supports_discarded_events( bt_bool supports_discarded_events, bt_bool with_default_clock_snapshots) { - BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_SC_NON_NULL(stream_class); BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class); - BT_ASSERT_PRE(supports_discarded_events || - !with_default_clock_snapshots, + BT_ASSERT_PRE("supports-discarded-events-for-default-clock-snapshots", + supports_discarded_events || + !with_default_clock_snapshots, "Discarded events cannot have default clock snapshots when " "not supported: %!+S", stream_class); - BT_ASSERT_PRE(!with_default_clock_snapshots || - stream_class->default_clock_class, + BT_ASSERT_PRE("has-default-clock-class-for-default-clock-snapshots", + !with_default_clock_snapshots || + stream_class->default_clock_class, "Stream class has no default clock class: %!+S", stream_class); stream_class->supports_discarded_events = (bool) supports_discarded_events; @@ -491,14 +495,14 @@ void bt_stream_class_set_supports_discarded_events( bt_bool bt_stream_class_supports_discarded_events( const struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return (bt_bool) stream_class->supports_discarded_events; } bt_bool bt_stream_class_discarded_events_have_default_clock_snapshots( const struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return (bt_bool) stream_class->discarded_events_have_default_clock_snapshots; } @@ -507,18 +511,21 @@ void bt_stream_class_set_supports_discarded_packets( bt_bool supports_discarded_packets, bt_bool with_default_clock_snapshots) { - BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_SC_NON_NULL(stream_class); BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class); - BT_ASSERT_PRE(!supports_discarded_packets || - stream_class->supports_packets, + BT_ASSERT_PRE("supports-packets-for-discarded-packets-support", + !supports_discarded_packets || + stream_class->supports_packets, "Stream class does not support packets: %!+S", stream_class); - BT_ASSERT_PRE(supports_discarded_packets || - !with_default_clock_snapshots, + BT_ASSERT_PRE("supports-discarded-packets-for-default-clock-snapshots", + supports_discarded_packets || + !with_default_clock_snapshots, "Discarded packets cannot have default clock snapshots when " "not supported: %!+S", stream_class); - BT_ASSERT_PRE(!with_default_clock_snapshots || - stream_class->default_clock_class, + BT_ASSERT_PRE("has-default-clock-class-for-default-clock-snapshots", + !with_default_clock_snapshots || + stream_class->default_clock_class, "Stream class has no default clock class: %!+S", stream_class); stream_class->supports_discarded_packets = (bool) supports_discarded_packets; @@ -531,14 +538,14 @@ void bt_stream_class_set_supports_discarded_packets( bt_bool bt_stream_class_supports_discarded_packets( const struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return (bt_bool) stream_class->supports_discarded_packets; } bt_bool bt_stream_class_discarded_packets_have_default_clock_snapshots( const struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return (bt_bool) stream_class->discarded_packets_have_default_clock_snapshots; } @@ -551,20 +558,23 @@ void bt_stream_class_set_supports_packets( bt_bool with_default_clock_snapshot = with_beginning_default_clock_snapshot || with_end_default_clock_snapshot; - BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_SC_NON_NULL(stream_class); BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class); - BT_ASSERT_PRE(supports_packets || - !with_default_clock_snapshot, + BT_ASSERT_PRE("supports-packets-for-default-clock-snapshot", + supports_packets || + !with_default_clock_snapshot, "Packets cannot have default clock snapshots when " "not supported: %!+S", stream_class); - BT_ASSERT_PRE(!with_default_clock_snapshot || - stream_class->default_clock_class, + BT_ASSERT_PRE("has-default-clock-class-for-default-clock-snapshot", + !with_default_clock_snapshot || + stream_class->default_clock_class, "Stream class has no default clock class: %!+S", stream_class); - BT_ASSERT_PRE(supports_packets || !stream_class->packet_context_fc, + BT_ASSERT_PRE("supports-packets-for-packet-context-field-class", + supports_packets || !stream_class->packet_context_fc, "Stream class already has a packet context field class: %!+S", stream_class); - BT_ASSERT_PRE(supports_packets || - !stream_class->supports_discarded_packets, + BT_ASSERT_PRE("supports-packets-for-discarded-packets-support", + supports_packets || !stream_class->supports_discarded_packets, "Stream class already supports discarded packets: %!+S", stream_class); stream_class->supports_packets = (bool) supports_packets; @@ -579,21 +589,21 @@ void bt_stream_class_set_supports_packets( bt_bool bt_stream_class_supports_packets( const struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_SC_NON_NULL(stream_class); return (bt_bool) stream_class->supports_packets; } bt_bool bt_stream_class_packets_have_beginning_default_clock_snapshot( const struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return (bt_bool) stream_class->packets_have_beginning_default_clock_snapshot; } bt_bool bt_stream_class_packets_have_end_default_clock_snapshot( const struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return (bt_bool) stream_class->packets_have_end_default_clock_snapshot; } @@ -601,7 +611,7 @@ 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_SC_NON_NULL(stream_class); BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class); stream_class->assigns_automatic_stream_id = (bool) value; BT_LIB_LOGD("Set stream class's automatic stream ID " @@ -611,7 +621,7 @@ void bt_stream_class_set_assigns_automatic_stream_id( const struct bt_value *bt_stream_class_borrow_user_attributes_const( const struct bt_stream_class *stream_class) { - BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class"); + BT_ASSERT_PRE_DEV_SC_NON_NULL(stream_class); return stream_class->user_attributes; } @@ -626,10 +636,9 @@ void bt_stream_class_set_user_attributes( struct bt_stream_class *stream_class, const struct bt_value *user_attributes) { - BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); - BT_ASSERT_PRE_NON_NULL(user_attributes, "User attributes"); - BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP, - "User attributes object is not a map value object."); + BT_ASSERT_PRE_SC_NON_NULL(stream_class); + BT_ASSERT_PRE_USER_ATTRS_NON_NULL(user_attributes); + BT_ASSERT_PRE_USER_ATTRS_IS_MAP(user_attributes); BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class); bt_object_put_ref_no_null_check(stream_class->user_attributes); stream_class->user_attributes = (void *) user_attributes;