lib: use common precond. assert. macros from `assert-cond.h` thru lib

[babeltrace.git] / src / lib / graph / message / stream.c

diff --git a/src/lib/graph/message/stream.c b/src/lib/graph/message/stream.c
index 1ecb452fbdec4ed7604142f6a69c3fc6cb789b6d..f92fc3d068e1b8da5cd91517816f67bcf98a1165 100644 (file)
--- a/src/lib/graph/message/stream.c
+++ b/src/lib/graph/message/stream.c
@@ -1,30 +1,14 @@
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * 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 <babeltrace2/trace-ir/clock-snapshot.h>
 #include "lib/trace-ir/stream.h"
@@ -63,8 +47,8 @@ struct bt_message *create_stream_message(
        struct bt_message_stream *message;
        struct bt_stream_class *stream_class;
 
-       BT_ASSERT_PRE_NON_NULL(self_msg_iter, "Message iterator");
-       BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+       BT_ASSERT_PRE_MSG_ITER_NON_NULL(self_msg_iter);
+       BT_ASSERT_PRE_STREAM_NON_NULL(stream);
        stream_class = bt_stream_borrow_class(stream);
        BT_ASSERT(stream_class);
        BT_LIB_LOGD("Creating stream message object: "
@@ -139,8 +123,8 @@ 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_DEV_NON_NULL(message, "Message");
-       BT_ASSERT_PRE_DEV_MSG_IS_TYPE(message,
+       BT_ASSERT_PRE_DEV_MSG_NON_NULL(message);
+       BT_ASSERT_PRE_DEV_MSG_HAS_TYPE(message,
                BT_MESSAGE_TYPE_STREAM_BEGINNING);
        return borrow_stream_message_stream(message);
 }
@@ -148,8 +132,8 @@ struct bt_stream *bt_message_stream_beginning_borrow_stream(
 struct bt_stream *bt_message_stream_end_borrow_stream(
                struct bt_message *message)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(message, "Message");
-       BT_ASSERT_PRE_DEV_MSG_IS_TYPE(message,
+       BT_ASSERT_PRE_DEV_MSG_NON_NULL(message);
+       BT_ASSERT_PRE_DEV_MSG_HAS_TYPE(message,
                BT_MESSAGE_TYPE_STREAM_END);
        return borrow_stream_message_stream(message);
 }
@@ -179,9 +163,7 @@ void bt_message_stream_set_default_clock_snapshot(
        BT_ASSERT_PRE_DEV_HOT(msg, "Message", ": %!+n", msg);
        sc = stream_msg->stream->class;
        BT_ASSERT(sc);
-       BT_ASSERT_PRE(sc->default_clock_class,
-               "Message's stream's class has no default clock class: "
-               "%![msg-]+n, %![sc-]+S", msg, sc);
+       BT_ASSERT_PRE_DEV_MSG_SC_DEF_CLK_CLS(msg, sc);
        BT_ASSERT(stream_msg->default_cs);
        bt_clock_snapshot_set_raw_value(stream_msg->default_cs, raw_value);
        stream_msg->default_cs_state = BT_MESSAGE_STREAM_CLOCK_SNAPSHOT_STATE_KNOWN;
@@ -192,8 +174,8 @@ void bt_message_stream_set_default_clock_snapshot(
 void bt_message_stream_beginning_set_default_clock_snapshot(
                struct bt_message *message, uint64_t raw_value)
 {
-       BT_ASSERT_PRE_NON_NULL(message, "Message");
-       BT_ASSERT_PRE_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_STREAM_BEGINNING);
+       BT_ASSERT_PRE_MSG_NON_NULL(message);
+       BT_ASSERT_PRE_MSG_HAS_TYPE(message, BT_MESSAGE_TYPE_STREAM_BEGINNING);
 
        bt_message_stream_set_default_clock_snapshot(message, raw_value);
 }
@@ -201,8 +183,8 @@ void bt_message_stream_beginning_set_default_clock_snapshot(
 void bt_message_stream_end_set_default_clock_snapshot(
                struct bt_message *message, uint64_t raw_value)
 {
-       BT_ASSERT_PRE_NON_NULL(message, "Message");
-       BT_ASSERT_PRE_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_STREAM_END);
+       BT_ASSERT_PRE_MSG_NON_NULL(message);
+       BT_ASSERT_PRE_MSG_HAS_TYPE(message, BT_MESSAGE_TYPE_STREAM_END);
 
        return bt_message_stream_set_default_clock_snapshot(message, raw_value);
 }
@@ -217,9 +199,7 @@ bt_message_stream_borrow_default_clock_snapshot_const(
        BT_ASSERT_DBG(msg);
        sc = stream_msg->stream->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_PRE_DEV_MSG_SC_DEF_CLK_CLS(msg, sc);
        BT_ASSERT_DBG(stream_msg->default_cs);
 
        *snapshot = stream_msg->default_cs;
@@ -231,8 +211,8 @@ 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_DEV_NON_NULL(message, "Message");
-       BT_ASSERT_PRE_DEV_MSG_IS_TYPE(message,
+       BT_ASSERT_PRE_DEV_MSG_NON_NULL(message);
+       BT_ASSERT_PRE_DEV_MSG_HAS_TYPE(message,
                BT_MESSAGE_TYPE_STREAM_BEGINNING);
        return bt_message_stream_borrow_default_clock_snapshot_const(
                message, snapshot);
@@ -242,8 +222,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_DEV_NON_NULL(message, "Message");
-       BT_ASSERT_PRE_DEV_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_STREAM_END);
+       BT_ASSERT_PRE_DEV_MSG_NON_NULL(message);
+       BT_ASSERT_PRE_DEV_MSG_HAS_TYPE(message, BT_MESSAGE_TYPE_STREAM_END);
        return bt_message_stream_borrow_default_clock_snapshot_const(
                message, snapshot);
 }
@@ -263,8 +243,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_DEV_NON_NULL(msg, "Message");
-       BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg,
+       BT_ASSERT_PRE_DEV_MSG_NON_NULL(msg);
+       BT_ASSERT_PRE_DEV_MSG_HAS_TYPE(msg,
                BT_MESSAGE_TYPE_STREAM_BEGINNING);
        return borrow_stream_message_stream_class_default_clock_class(msg);
 }
@@ -273,7 +253,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_DEV_NON_NULL(msg, "Message");
-       BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_STREAM_END);
+       BT_ASSERT_PRE_DEV_MSG_NON_NULL(msg);
+       BT_ASSERT_PRE_DEV_MSG_HAS_TYPE(msg, BT_MESSAGE_TYPE_STREAM_END);
        return borrow_stream_message_stream_class_default_clock_class(msg);
 }