X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Fstream-class.c;h=fa3b54fb6ef8bb661bed139cef957acc10570a2a;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hp=2d3b2fbae70e51448d51304196a82e0eec19e56c;hpb=94c1a13b2867da334582f9284e4ac1e9bb11eb5d;p=babeltrace.git diff --git a/src/ctf-writer/stream-class.c b/src/ctf-writer/stream-class.c index 2d3b2fba..fa3b54fb 100644 --- a/src/ctf-writer/stream-class.c +++ b/src/ctf-writer/stream-class.c @@ -1,31 +1,14 @@ /* + * SPDX-License-Identifier: MIT + * * Copyright 2013, 2014 Jérémie Galarneau * Copyright 2017-2018 Philippe Proulx - * - * 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 - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. */ #define BT_LOG_TAG "CTF-WRITER/STREAM-CLASS" #include "logging.h" #include -#include #include #include @@ -166,8 +149,9 @@ int bt_ctf_stream_class_common_add_event_class( const enum bt_ctf_validation_flag validation_flags = BT_CTF_VALIDATION_FLAG_EVENT; struct bt_ctf_clock_class *expected_clock_class = NULL; + struct bt_ctf_search_query query = { .value = event_class, .found = 0 }; - 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: " @@ -238,7 +222,6 @@ int bt_ctf_stream_class_common_add_event_class( } /* Check for duplicate event classes */ - struct bt_ctf_search_query query = { .value = event_class, .found = 0 }; g_ptr_array_foreach(stream_class->event_classes, event_class_exists, &query); if (query.found) { @@ -271,8 +254,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 = @@ -371,7 +354,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); } @@ -478,8 +461,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 +521,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) { @@ -747,14 +730,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); @@ -782,7 +765,7 @@ int try_map_clock_class(struct bt_ctf_stream_class *stream_class, 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); @@ -810,7 +793,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 */ @@ -946,7 +929,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) {