X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fmessage%2Fstream.c;h=b4b045cf602368ee2ed46d44a2b54530c4e394e1;hb=d98421f2abfc5adab28ab7ee9b63537a6c7261cc;hp=fb596bb17f9887addc3104c443b16ea7283e572d;hpb=82cacf472160d10d6957fe7cb8382ad05845983f;p=babeltrace.git diff --git a/src/lib/graph/message/stream.c b/src/lib/graph/message/stream.c index fb596bb1..b4b045cf 100644 --- a/src/lib/graph/message/stream.c +++ b/src/lib/graph/message/stream.c @@ -1,39 +1,20 @@ /* + * 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-STREAM" #include "lib/logging.h" -#include "lib/assert-pre.h" +#include "lib/assert-cond.h" #include "compat/compiler.h" -#include +#include #include "lib/trace-ir/stream.h" #include #include "lib/trace-ir/stream-class.h" -#include -#include -#include -#include +#include #include "common/assert.h" #include @@ -83,7 +64,7 @@ struct bt_message *create_stream_message( bt_message_init(&message->parent, type, destroy_stream_message, NULL); message->stream = stream; - bt_object_get_no_null_check(message->stream); + bt_object_get_ref_no_null_check(message->stream); if (stream_class->default_clock_class) { message->default_cs = bt_clock_snapshot_create( @@ -113,6 +94,8 @@ struct bt_message *bt_message_stream_beginning_create( struct bt_self_message_iterator *self_msg_iter, const struct bt_stream *stream) { + BT_ASSERT_PRE_DEV_NO_ERROR(); + return create_stream_message(self_msg_iter, (void *) stream, BT_MESSAGE_TYPE_STREAM_BEGINNING); } @@ -121,6 +104,8 @@ struct bt_message *bt_message_stream_end_create( struct bt_self_message_iterator *self_msg_iter, const struct bt_stream *stream) { + BT_ASSERT_PRE_DEV_NO_ERROR(); + return create_stream_message(self_msg_iter, (void *) stream, BT_MESSAGE_TYPE_STREAM_END); } @@ -130,7 +115,7 @@ struct bt_stream *borrow_stream_message_stream(struct bt_message *message) { struct bt_message_stream *stream_msg; - BT_ASSERT(message); + BT_ASSERT_DBG(message); stream_msg = (void *) message; return stream_msg->stream; } @@ -138,16 +123,18 @@ struct bt_stream *borrow_stream_message_stream(struct bt_message *message) struct bt_stream *bt_message_stream_beginning_borrow_stream( struct bt_message *message) { - BT_ASSERT_PRE_NON_NULL(message, "Message"); - BT_ASSERT_PRE_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_STREAM_BEGINNING); + BT_ASSERT_PRE_DEV_NON_NULL(message, "Message"); + BT_ASSERT_PRE_DEV_MSG_IS_TYPE(message, + BT_MESSAGE_TYPE_STREAM_BEGINNING); return borrow_stream_message_stream(message); } struct bt_stream *bt_message_stream_end_borrow_stream( struct bt_message *message) { - BT_ASSERT_PRE_NON_NULL(message, "Message"); - BT_ASSERT_PRE_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_STREAM_END); + BT_ASSERT_PRE_DEV_NON_NULL(message, "Message"); + BT_ASSERT_PRE_DEV_MSG_IS_TYPE(message, + BT_MESSAGE_TYPE_STREAM_END); return borrow_stream_message_stream(message); } @@ -173,7 +160,7 @@ void bt_message_stream_set_default_clock_snapshot( struct bt_stream_class *sc; BT_ASSERT(msg); - BT_ASSERT_PRE_HOT(msg, "Message", ": %!+n", msg); + BT_ASSERT_PRE_DEV_HOT(msg, "Message", ": %!+n", msg); sc = stream_msg->stream->class; BT_ASSERT(sc); BT_ASSERT_PRE(sc->default_clock_class, @@ -211,13 +198,13 @@ bt_message_stream_borrow_default_clock_snapshot_const( struct bt_message_stream *stream_msg = (void *) msg; struct bt_stream_class *sc; - BT_ASSERT(msg); + BT_ASSERT_DBG(msg); sc = stream_msg->stream->class; - BT_ASSERT(sc); - BT_ASSERT_PRE(sc->default_clock_class, + BT_ASSERT_DBG(sc); + BT_ASSERT_PRE_DEV(sc->default_clock_class, "Message's stream's class has no default clock class: " "%![msg-]+n, %![sc-]+S", msg, sc); - BT_ASSERT(stream_msg->default_cs); + BT_ASSERT_DBG(stream_msg->default_cs); *snapshot = stream_msg->default_cs; @@ -228,9 +215,9 @@ enum bt_message_stream_clock_snapshot_state bt_message_stream_beginning_borrow_default_clock_snapshot_const( const bt_message *message, const bt_clock_snapshot **snapshot) { - BT_ASSERT_PRE_NON_NULL(message, "Message"); - BT_ASSERT_PRE_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_STREAM_BEGINNING); - + BT_ASSERT_PRE_DEV_NON_NULL(message, "Message"); + BT_ASSERT_PRE_DEV_MSG_IS_TYPE(message, + BT_MESSAGE_TYPE_STREAM_BEGINNING); return bt_message_stream_borrow_default_clock_snapshot_const( message, snapshot); } @@ -239,9 +226,8 @@ enum bt_message_stream_clock_snapshot_state bt_message_stream_end_borrow_default_clock_snapshot_const( const bt_message *message, const bt_clock_snapshot **snapshot) { - BT_ASSERT_PRE_NON_NULL(message, "Message"); - BT_ASSERT_PRE_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_STREAM_END); - + BT_ASSERT_PRE_DEV_NON_NULL(message, "Message"); + BT_ASSERT_PRE_DEV_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_STREAM_END); return bt_message_stream_borrow_default_clock_snapshot_const( message, snapshot); } @@ -253,7 +239,7 @@ borrow_stream_message_stream_class_default_clock_class( { struct bt_message_stream *stream_msg = (void *) msg; - BT_ASSERT(msg); + BT_ASSERT_DBG(msg); return stream_msg->stream->class->default_clock_class; } @@ -261,8 +247,8 @@ const struct bt_clock_class * bt_message_stream_beginning_borrow_stream_class_default_clock_class_const( const struct bt_message *msg) { - BT_ASSERT_PRE_NON_NULL(msg, "Message"); - BT_ASSERT_PRE_MSG_IS_TYPE(msg, + BT_ASSERT_PRE_DEV_NON_NULL(msg, "Message"); + BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_STREAM_BEGINNING); return borrow_stream_message_stream_class_default_clock_class(msg); } @@ -271,7 +257,7 @@ const struct bt_clock_class * bt_message_stream_end_borrow_stream_class_default_clock_class_const( const struct bt_message *msg) { - BT_ASSERT_PRE_NON_NULL(msg, "Message"); - BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_STREAM_END); + BT_ASSERT_PRE_DEV_NON_NULL(msg, "Message"); + BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_STREAM_END); return borrow_stream_message_stream_class_default_clock_class(msg); }