X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_trace_ir_ref.c;h=f4837c9081ec9acaeabb2600743dd062d336af93;hb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;hp=71b833b4e901a301ea61516e6cec83da446f9a38;hpb=416937235b48b55387c6074adc6a0dd59a5c76f4;p=babeltrace.git diff --git a/tests/lib/test_trace_ir_ref.c b/tests/lib/test_trace_ir_ref.c index 71b833b4..f4837c90 100644 --- a/tests/lib/test_trace_ir_ref.c +++ b/tests/lib/test_trace_ir_ref.c @@ -20,10 +20,10 @@ */ #include "tap/tap.h" -#include -#include -#include -#include +#include +#include +#include +#include #include "common.h" #define NR_TESTS 37 @@ -63,27 +63,27 @@ static const size_t WRITER_USER_NR_ELEMENTS = * - uint16_t payload_16; * - uint32_t payload_32; */ -static bt_field_class *create_integer_struct(void) +static bt_field_class *create_integer_struct(bt_trace_class *trace_class) { int ret; bt_field_class *structure = NULL; bt_field_class *ui8 = NULL, *ui16 = NULL, *ui32 = NULL; - structure = bt_field_class_structure_create(); + structure = bt_field_class_structure_create(trace_class); BT_ASSERT(structure); - ui8 = bt_field_class_unsigned_integer_create(); + ui8 = bt_field_class_unsigned_integer_create(trace_class); BT_ASSERT(ui8); bt_field_class_integer_set_field_value_range(ui8, 8); ret = bt_field_class_structure_append_member(structure, "payload_8", ui8); BT_ASSERT(ret == 0); - ui16 = bt_field_class_unsigned_integer_create(); + ui16 = bt_field_class_unsigned_integer_create(trace_class); BT_ASSERT(ui16); bt_field_class_integer_set_field_value_range(ui16, 16); ret = bt_field_class_structure_append_member(structure, "payload_16", ui16); BT_ASSERT(ret == 0); - ui32 = bt_field_class_unsigned_integer_create(); + ui32 = bt_field_class_unsigned_integer_create(trace_class); BT_ASSERT(ui32); bt_field_class_integer_set_field_value_range(ui32, 32); ret = bt_field_class_structure_append_member(structure, @@ -142,7 +142,7 @@ static bt_event_class *create_simple_event( BT_ASSERT(event); ret = bt_event_class_set_name(event, name); BT_ASSERT(ret == 0); - payload = create_integer_struct(); + payload = create_integer_struct(bt_stream_class_borrow_trace_class(sc)); BT_ASSERT(payload); ret = bt_event_class_set_payload_field_class(event, payload); BT_ASSERT(ret == 0); @@ -160,22 +160,22 @@ static bt_event_class *create_simple_event( * - uint16_t payload_16; * - uint32_t payload_32; */ -static bt_event_class *create_complex_event( - bt_stream_class *sc, +static bt_event_class *create_complex_event(bt_stream_class *sc, const char *name) { int ret; bt_event_class *event = NULL; bt_field_class *inner = NULL, *outer = NULL; + bt_trace_class *trace_class = bt_stream_class_borrow_trace_class(sc); BT_ASSERT(name); event = bt_event_class_create(sc); BT_ASSERT(event); ret = bt_event_class_set_name(event, name); BT_ASSERT(ret == 0); - outer = create_integer_struct(); + outer = create_integer_struct(trace_class); BT_ASSERT(outer); - inner = create_integer_struct(); + inner = create_integer_struct(trace_class); BT_ASSERT(inner); ret = bt_field_class_structure_append_member(outer, "payload_struct", inner); @@ -190,44 +190,32 @@ static bt_event_class *create_complex_event( static void set_stream_class_field_classes( bt_stream_class *stream_class) { + bt_trace_class *trace_class = + bt_stream_class_borrow_trace_class(stream_class); bt_field_class *packet_context_type; - bt_field_class *event_header_type; bt_field_class *fc; int ret; - packet_context_type = bt_field_class_structure_create(); + packet_context_type = bt_field_class_structure_create(trace_class); BT_ASSERT(packet_context_type); - fc = bt_field_class_unsigned_integer_create(); + fc = bt_field_class_unsigned_integer_create(trace_class); BT_ASSERT(fc); bt_field_class_integer_set_field_value_range(fc, 32); ret = bt_field_class_structure_append_member(packet_context_type, "packet_size", fc); BT_ASSERT(ret == 0); bt_field_class_put_ref(fc); - fc = bt_field_class_unsigned_integer_create(); + fc = bt_field_class_unsigned_integer_create(trace_class); BT_ASSERT(fc); bt_field_class_integer_set_field_value_range(fc, 32); ret = bt_field_class_structure_append_member(packet_context_type, "content_size", fc); BT_ASSERT(ret == 0); bt_field_class_put_ref(fc); - event_header_type = bt_field_class_structure_create(); - BT_ASSERT(event_header_type); - fc = bt_field_class_unsigned_integer_create(); - BT_ASSERT(fc); - bt_field_class_integer_set_field_value_range(fc, 32); - ret = bt_field_class_structure_append_member(event_header_type, - "id", fc); - BT_ASSERT(ret == 0); - bt_field_class_put_ref(fc); ret = bt_stream_class_set_packet_context_field_class( stream_class, packet_context_type); BT_ASSERT(ret == 0); - ret = bt_stream_class_set_event_header_field_class( - stream_class, event_header_type); - BT_ASSERT(ret == 0); bt_field_class_put_ref(packet_context_type); - bt_field_class_put_ref(event_header_type); } static void create_sc1(bt_trace_class *trace_class) @@ -272,28 +260,6 @@ static void create_sc2(bt_trace_class *trace_class) BT_STREAM_CLASS_PUT_REF_AND_RESET(sc2); } -static void set_trace_packet_header(bt_trace_class *trace_class) -{ - bt_field_class *packet_header_type; - bt_field_class *fc; - int ret; - - packet_header_type = bt_field_class_structure_create(); - BT_ASSERT(packet_header_type); - fc = bt_field_class_unsigned_integer_create(); - BT_ASSERT(fc); - bt_field_class_integer_set_field_value_range(fc, 32); - ret = bt_field_class_structure_append_member(packet_header_type, - "stream_id", fc); - BT_ASSERT(ret == 0); - bt_field_class_put_ref(fc); - ret = bt_trace_class_set_packet_header_field_class(trace_class, - packet_header_type); - BT_ASSERT(ret == 0); - - bt_field_class_put_ref(packet_header_type); -} - static bt_trace_class *create_tc1(bt_self_component_source *self_comp) { bt_trace_class *tc1 = NULL; @@ -301,7 +267,6 @@ static bt_trace_class *create_tc1(bt_self_component_source *self_comp) tc1 = bt_trace_class_create( bt_self_component_source_as_self_component(self_comp)); BT_ASSERT(tc1); - set_trace_packet_header(tc1); create_sc1(tc1); create_sc2(tc1); return tc1;