X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Fstream-class.c;h=55f3a09b851a8ab8e0855cd224feefc73892312b;hb=98b15851a941e7342b8bb19e265cdc3a40fabfb8;hp=8b5e39b4b5d9cba7ae060ce9e05a6f702e2fec3d;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git diff --git a/src/ctf-writer/stream-class.c b/src/ctf-writer/stream-class.c index 8b5e39b4..55f3a09b 100644 --- a/src/ctf-writer/stream-class.c +++ b/src/ctf-writer/stream-class.c @@ -21,17 +21,17 @@ * SOFTWARE. */ -#define BT_LOG_TAG "CTF-WRITER-STREAM-CLASS" +#define BT_LOG_TAG "CTF-WRITER/STREAM-CLASS" #include "logging.h" #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "common/align.h" #include "common/assert.h" @@ -167,7 +167,7 @@ int bt_ctf_stream_class_common_add_event_class( BT_CTF_VALIDATION_FLAG_EVENT; struct bt_ctf_clock_class *expected_clock_class = NULL; - BT_ASSERT(copy_field_type_func); + BT_ASSERT_DBG(copy_field_type_func); if (!stream_class || !event_class) { BT_LOGW("Invalid parameter: stream class or event class is NULL: " @@ -271,8 +271,8 @@ int bt_ctf_stream_class_common_add_event_class( * The trace and stream class should be valid at this * point. */ - BT_ASSERT(trace->valid); - BT_ASSERT(stream_class->valid); + BT_ASSERT_DBG(trace->valid); + BT_ASSERT_DBG(stream_class->valid); packet_header_type = bt_ctf_trace_common_borrow_packet_header_field_type(trace); packet_context_type = @@ -323,7 +323,7 @@ int bt_ctf_stream_class_common_add_event_class( /* Only set an event ID if none was explicitly set before */ *event_id = bt_ctf_event_class_common_get_id(event_class); if (*event_id < 0) { - BT_LOGV("Event class has no ID: automatically setting it: " + BT_LOGT("Event class has no ID: automatically setting it: " "id=%" PRId64, stream_class->next_event_id); if (bt_ctf_event_class_common_set_id(event_class, @@ -371,7 +371,7 @@ int bt_ctf_stream_class_common_add_event_class( * now if the stream class is frozen. */ if (stream_class->frozen && expected_clock_class) { - BT_ASSERT(!stream_class->clock_class || + BT_ASSERT_DBG(!stream_class->clock_class || stream_class->clock_class == expected_clock_class); BT_CTF_OBJECT_MOVE_REF(stream_class->clock_class, expected_clock_class); } @@ -439,7 +439,7 @@ int bt_ctf_stream_class_common_visit(struct bt_ctf_stream_class_common *stream_c ret = bt_ctf_visitor_helper(&obj, get_event_class_count, get_event_class, visit_event_class, visitor, data); - BT_LOGV("bt_ctf_visitor_helper() returned: ret=%d", ret); + BT_LOGT("bt_ctf_visitor_helper() returned: ret=%d", ret); end: return ret; @@ -478,8 +478,8 @@ int bt_ctf_stream_class_common_validate_single_clock_class( int ret; uint64_t i; - BT_ASSERT(stream_class); - BT_ASSERT(expected_clock_class); + BT_ASSERT_DBG(stream_class); + BT_ASSERT_DBG(expected_clock_class); ret = bt_ctf_field_type_common_validate_single_clock_class( stream_class->packet_context_field_type, expected_clock_class); @@ -538,7 +538,7 @@ int bt_ctf_stream_class_common_validate_single_clock_class( struct bt_ctf_event_class_common *event_class = g_ptr_array_index(stream_class->event_classes, i); - BT_ASSERT(event_class); + BT_ASSERT_DBG(event_class); ret = bt_ctf_event_class_common_validate_single_clock_class( event_class, expected_clock_class); if (ret) { @@ -613,7 +613,7 @@ int init_packet_context(struct bt_ctf_stream_class *stream_class) bt_ctf_field_type_structure_create(); struct bt_ctf_field_type *_uint64_t = get_field_type(FIELD_TYPE_ALIAS_UINT64_T); - struct bt_ctf_field_type *ts_begin_end_uint64_t; + struct bt_ctf_field_type *ts_begin_end_uint64_t = NULL; if (!packet_context_type) { BT_LOGE_STR("Cannot create empty structure field type."); @@ -747,14 +747,14 @@ int try_map_clock_class(struct bt_ctf_stream_class *stream_class, bt_ctf_field_type_structure_get_field_type_by_name(parent_ft, field_name); - BT_ASSERT(stream_class->clock); + BT_ASSERT_DBG(stream_class->clock); if (!ft) { /* Field does not exist: not an error */ goto end; } - BT_ASSERT(((struct bt_ctf_field_type_common *) ft)->id == + BT_ASSERT_DBG(((struct bt_ctf_field_type_common *) ft)->id == BT_CTF_FIELD_TYPE_ID_INTEGER); mapped_clock_class = bt_ctf_field_type_integer_get_mapped_clock_class(ft); @@ -776,16 +776,18 @@ int try_map_clock_class(struct bt_ctf_stream_class *stream_class, if (!ft_copy) { BT_LOGE("Failed to copy integer field type: ft-addr=%p", ft); + ret = -1; + goto end; } ret = bt_ctf_field_type_common_integer_set_mapped_clock_class_no_check_frozen( (void *) ft_copy, stream_class->clock->clock_class); - BT_ASSERT(ret == 0); + BT_ASSERT_DBG(ret == 0); ret = bt_ctf_field_type_common_structure_replace_field( (void *) parent_ft, field_name, (void *) ft_copy); bt_ctf_object_put_ref(ft_copy); - BT_LOGV("Automatically mapped field type to stream class's clock class: " + BT_LOGT("Automatically mapped field type to stream class's clock class: " "stream-class-addr=%p, stream-class-name=\"%s\", " "stream-class-id=%" PRId64 ", ft-addr=%p, " "ft-copy-addr=%p", @@ -808,7 +810,7 @@ int bt_ctf_stream_class_map_clock_class( { int ret = 0; - BT_ASSERT(stream_class); + BT_ASSERT_DBG(stream_class); if (!stream_class->clock) { /* No clock class to map to */ @@ -855,7 +857,7 @@ struct bt_ctf_clock *bt_ctf_stream_class_get_clock( } if (!stream_class->clock) { - BT_LOGV("Stream class has no clock: " + BT_LOGT("Stream class has no clock: " "addr=%p, name=\"%s\", id=%" PRId64, stream_class, bt_ctf_stream_class_get_name(stream_class), @@ -896,7 +898,7 @@ int bt_ctf_stream_class_set_clock( /* Replace the current clock of this stream class. */ bt_ctf_object_put_ref(stream_class->clock); stream_class->clock = bt_ctf_object_get_ref(clock); - BT_LOGV("Set stream class's clock: " + BT_LOGT("Set stream class's clock: " "addr=%p, name=\"%s\", id=%" PRId64 ", " "clock-addr=%p, clock-name=\"%s\"", stream_class, @@ -944,7 +946,7 @@ int bt_ctf_stream_class_serialize(struct bt_ctf_stream_class *stream_class, */ trace = BT_CTF_FROM_COMMON(bt_ctf_stream_class_common_borrow_trace( BT_CTF_TO_COMMON(stream_class))); - BT_ASSERT(trace); + BT_ASSERT_DBG(trace); packet_header_type = bt_ctf_trace_get_packet_header_field_type(trace); trace = NULL; if (packet_header_type) {