X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Fevent.c;h=0cd79c585a3fc2119ba625b5005d3ea4e3f663ec;hb=5d70aba9ff10108133afa62f839b27f87a378772;hp=44019efaf5868f8e9fcbf98eac8b710835be6882;hpb=9c7f2f8572e28b311e918168f70e6feebf33c52b;p=babeltrace.git diff --git a/src/ctf-writer/event.c b/src/ctf-writer/event.c index 44019efa..0cd79c58 100644 --- a/src/ctf-writer/event.c +++ b/src/ctf-writer/event.c @@ -1,30 +1,15 @@ /* + * 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/EVENT" #include "logging.h" #include +#include #include #include @@ -72,14 +57,14 @@ int bt_ctf_event_common_validate_types_for_create( struct bt_ctf_private_value *environment = NULL; stream_class = bt_ctf_event_class_common_borrow_stream_class(event_class); - BT_ASSERT(stream_class); + BT_ASSERT_DBG(stream_class); trace = bt_ctf_stream_class_common_borrow_trace(stream_class); if (trace) { BT_LOGD_STR("Event class is part of a trace."); packet_header_type = bt_ctf_trace_common_borrow_packet_header_field_type(trace); trace_valid = trace->valid; - BT_ASSERT(trace_valid); + BT_ASSERT_DBG(trace_valid); environment = trace->environment; } @@ -132,10 +117,10 @@ static int bt_ctf_event_common_create_fields( struct bt_ctf_stream_class_common *stream_class, struct bt_ctf_validation_output *validation_output, - create_field_func create_field_func, - release_field_func release_field_func, - create_header_field_func create_header_field_func, - release_header_field_func release_header_field_func, + create_field_func_type create_field_func, + release_field_func_type release_field_func, + create_header_field_func_type create_header_field_func, + release_header_field_func_type release_header_field_func, struct bt_ctf_field_wrapper **header_field, struct bt_ctf_field_common **stream_event_context_field, struct bt_ctf_field_common **context_field, @@ -219,7 +204,7 @@ int _bt_ctf_event_common_validate(struct bt_ctf_event_common *event) int ret = 0; struct bt_ctf_stream_class_common *stream_class; - BT_ASSERT(event); + BT_ASSERT_DBG(event); if (event->header_field) { ret = bt_ctf_field_common_validate_recursive( event->header_field->field); @@ -237,7 +222,7 @@ int _bt_ctf_event_common_validate(struct bt_ctf_event_common *event) * We should not have been able to create the event without associating * the event class to a stream class. */ - BT_ASSERT(stream_class); + BT_ASSERT_DBG(stream_class); if (stream_class->event_context_field_type) { ret = bt_ctf_field_common_validate_recursive( @@ -276,7 +261,7 @@ BT_HIDDEN void _bt_ctf_event_common_set_is_frozen(struct bt_ctf_event_common *event, bool is_frozen) { - BT_ASSERT(event); + BT_ASSERT_DBG(event); BT_LOGD("Freezing event: addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64, event, bt_ctf_event_class_common_get_name(event->class), @@ -319,10 +304,10 @@ int bt_ctf_event_common_initialize(struct bt_ctf_event_common *event, int (*map_clock_classes_func)(struct bt_ctf_stream_class_common *stream_class, struct bt_ctf_field_type_common *packet_context_field_type, struct bt_ctf_field_type_common *event_header_field_type), - create_field_func create_field_func, - release_field_func release_field_func, - create_header_field_func create_header_field_func, - release_header_field_func release_header_field_func) + create_field_func_type create_field_func, + release_field_func_type release_field_func, + create_header_field_func_type create_header_field_func, + release_header_field_func_type release_header_field_func) { int ret; struct bt_ctf_trace_common *trace = NULL; @@ -348,7 +333,7 @@ int bt_ctf_event_common_initialize(struct bt_ctf_event_common *event, event_class); /* The event class was frozen when added to its stream class */ - BT_ASSERT(event_class->frozen); + BT_ASSERT_DBG(event_class->frozen); trace = bt_ctf_stream_class_common_borrow_trace(stream_class); if (must_be_in_trace) { @@ -518,6 +503,7 @@ end: return ret; } +static int map_clock_classes_func(struct bt_ctf_stream_class_common *stream_class, struct bt_ctf_field_type_common *packet_context_type, struct bt_ctf_field_type_common *event_header_type) @@ -538,7 +524,7 @@ static void destroy_event_header_field(struct bt_ctf_field_wrapper *field_wrapper, struct bt_ctf_stream_class *stream_class) { - BT_ASSERT(field_wrapper); + BT_ASSERT_DBG(field_wrapper); bt_ctf_object_put_ref(field_wrapper->field); bt_ctf_field_wrapper_destroy(field_wrapper); } @@ -580,7 +566,7 @@ static void release_event_header_field(struct bt_ctf_field_wrapper *field_wrapper, struct bt_ctf_event_common *event_common) { - BT_ASSERT(field_wrapper); + BT_ASSERT_DBG(field_wrapper); BT_CTF_OBJECT_PUT_REF_AND_RESET(field_wrapper->field); bt_ctf_field_wrapper_destroy(field_wrapper); } @@ -621,10 +607,10 @@ struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class) (bt_ctf_validation_flag_copy_field_type_func) bt_ctf_field_type_copy, false, map_clock_classes_func, - (create_field_func) bt_ctf_field_create, - (release_field_func) bt_ctf_object_put_ref, - (create_header_field_func) create_event_header_field, - (release_header_field_func) destroy_event_header_field); + (create_field_func_type) bt_ctf_field_create, + (release_field_func_type) bt_ctf_object_put_ref, + (create_header_field_func_type) create_event_header_field, + (release_header_field_func_type) destroy_event_header_field); if (ret) { /* bt_ctf_event_common_initialize() logs errors */ goto error; @@ -645,10 +631,10 @@ struct bt_ctf_event_class *bt_ctf_event_get_class(struct bt_ctf_event *event) return bt_ctf_object_get_ref(bt_ctf_event_common_borrow_class(BT_CTF_TO_COMMON(event))); } -BT_HIDDEN +static struct bt_ctf_stream *bt_ctf_event_borrow_stream(struct bt_ctf_event *event) { - BT_ASSERT(event); + BT_ASSERT_DBG(event); return (struct bt_ctf_stream *) bt_ctf_object_borrow_parent(&BT_CTF_TO_COMMON(event)->base); } @@ -717,8 +703,8 @@ int bt_ctf_event_serialize(struct bt_ctf_event *event, { int ret = 0; - BT_ASSERT(event); - BT_ASSERT(ctfser); + BT_ASSERT_DBG(event); + BT_ASSERT_DBG(ctfser); BT_LOGT_STR("Serializing event's context field."); if (event->common.context_field) { @@ -756,12 +742,6 @@ end: return ret; } -BT_HIDDEN -void _bt_ctf_event_freeze(struct bt_ctf_event *event) -{ - _bt_ctf_event_common_set_is_frozen(BT_CTF_TO_COMMON(event), true); -} - int bt_ctf_event_set_header(struct bt_ctf_event *event, struct bt_ctf_field *header) {