X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fmessage%2Fevent.c;h=e194fce0b1822b7c35140a46607707f4665169d8;hb=d98421f2abfc5adab28ab7ee9b63537a6c7261cc;hp=4222a5a0a33d87b2ed646e433131fe3464fe4b4b;hpb=5084732e40a7925d22f741e4ed08f19d36078fbe;p=babeltrace.git diff --git a/src/lib/graph/message/event.c b/src/lib/graph/message/event.c index 4222a5a0..e194fce0 100644 --- a/src/lib/graph/message/event.c +++ b/src/lib/graph/message/event.c @@ -1,32 +1,15 @@ /* + * SPDX-License-Identifier: MIT + * * Copyright 2017-2018 Philippe Proulx * Copyright 2016 Jérémie Galarneau - * - * 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 "LIB/MSG-EVENT" #include "lib/logging.h" #include "common/assert.h" -#include "lib/assert-pre.h" -#include "lib/assert-post.h" +#include "lib/assert-cond.h" #include "compat/compiler.h" #include "lib/object.h" #include @@ -36,8 +19,7 @@ #include #include "lib/trace-ir/clock-snapshot.h" #include "lib/graph/graph.h" -#include -#include +#include #include #include #include @@ -49,7 +31,7 @@ static inline bool event_class_has_trace(struct bt_event_class *event_class) struct bt_stream_class *stream_class; stream_class = bt_event_class_borrow_stream_class_inline(event_class); - BT_ASSERT(stream_class); + BT_ASSERT_DBG(stream_class); return bt_stream_class_borrow_trace_class(stream_class); } @@ -85,7 +67,7 @@ struct bt_message *create_event_message( const struct bt_stream *c_stream, bool with_cs, uint64_t raw_value) { - struct bt_self_component_port_input_message_iterator *msg_iter = + struct bt_message_iterator *msg_iter = (void *) self_msg_iter; struct bt_message_event *message = NULL; struct bt_event_class *event_class = (void *) c_event_class; @@ -94,13 +76,13 @@ struct bt_message *create_event_message( struct bt_stream *stream = (void *) c_stream; struct bt_event *event; - BT_ASSERT(stream); + BT_ASSERT_DBG(stream); BT_ASSERT_PRE_NON_NULL(msg_iter, "Message iterator"); BT_ASSERT_PRE_NON_NULL(event_class, "Event class"); BT_ASSERT_PRE(event_class_has_trace(event_class), "Event class is not part of a trace: %!+E", event_class); stream_class = bt_event_class_borrow_stream_class_inline(event_class); - BT_ASSERT(stream_class); + BT_ASSERT_DBG(stream_class); BT_ASSERT_PRE((with_cs && stream_class->default_clock_class) || (!with_cs && !stream_class->default_clock_class), "Creating an event message with a default clock snapshot, but without " @@ -141,7 +123,7 @@ struct bt_message *create_event_message( } if (with_cs) { - BT_ASSERT(stream_class->default_clock_class); + BT_ASSERT_DBG(stream_class->default_clock_class); message->default_cs = bt_clock_snapshot_create( stream_class->default_clock_class); if (!message->default_cs) { @@ -151,7 +133,7 @@ struct bt_message *create_event_message( bt_clock_snapshot_set_raw_value(message->default_cs, raw_value); } - BT_ASSERT(!message->event); + BT_ASSERT_DBG(!message->event); message->event = event; if (packet) { @@ -177,6 +159,7 @@ struct bt_message *bt_message_event_create( const struct bt_event_class *event_class, const struct bt_stream *stream) { + BT_ASSERT_PRE_DEV_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(stream, "Stream"); return create_event_message(msg_iter, event_class, NULL, stream, false, 0); } @@ -186,6 +169,7 @@ struct bt_message *bt_message_event_create_with_packet( const struct bt_event_class *event_class, const struct bt_packet *packet) { + BT_ASSERT_PRE_DEV_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(packet, "Packet"); return create_event_message(msg_iter, event_class, packet, packet->stream, false, 0); @@ -197,6 +181,7 @@ struct bt_message *bt_message_event_create_with_default_clock_snapshot( const struct bt_stream *stream, uint64_t raw_value) { + BT_ASSERT_PRE_DEV_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(stream, "Stream"); return create_event_message(msg_iter, event_class, NULL, stream, true, raw_value); @@ -209,6 +194,7 @@ bt_message_event_create_with_packet_and_default_clock_snapshot( const struct bt_packet *packet, uint64_t raw_value) { + BT_ASSERT_PRE_DEV_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(packet, "Packet"); return create_event_message(msg_iter, event_class, packet, packet->stream, true, raw_value); @@ -241,7 +227,7 @@ void bt_message_event_recycle(struct bt_message *msg) struct bt_message_event *event_msg = (void *) msg; struct bt_graph *graph; - BT_ASSERT(event_msg); + BT_ASSERT_DBG(event_msg); if (G_UNLIKELY(!msg->graph)) { bt_message_event_destroy(msg); @@ -251,7 +237,7 @@ void bt_message_event_recycle(struct bt_message *msg) BT_LIB_LOGD("Recycling event message: %![msg-]+n, %![event-]+e", msg, event_msg->event); bt_message_reset(msg); - BT_ASSERT(event_msg->event); + BT_ASSERT_DBG(event_msg->event); bt_event_recycle(event_msg->event); event_msg->event = NULL; @@ -300,7 +286,7 @@ bt_message_event_borrow_default_clock_snapshot_const( BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_EVENT); stream_class = bt_event_class_borrow_stream_class_inline( event_msg->event->class); - BT_ASSERT(stream_class); + BT_ASSERT_DBG(stream_class); BT_ASSERT_PRE_DEV(stream_class->default_clock_class, "Message's stream's class has no default clock class: " "%![msg-]+n, %![sc-]+S", msg, stream_class); @@ -318,6 +304,6 @@ bt_message_event_borrow_stream_class_default_clock_class_const( BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_EVENT); stream_class = bt_event_class_borrow_stream_class_inline( event_msg->event->class); - BT_ASSERT(stream_class); + BT_ASSERT_DBG(stream_class); return stream_class->default_clock_class; }