Move to kernel style SPDX license identifiers

[babeltrace.git] / src / lib / graph / message / discarded-items.c

diff --git a/src/lib/graph/message/discarded-items.c b/src/lib/graph/message/discarded-items.c
index 957861d1c98d92958ddeb88e951532cc8d6426fc..a76a094dd2feda5b84a430186e145c94e7cb0f51 100644 (file)
--- a/src/lib/graph/message/discarded-items.c
+++ b/src/lib/graph/message/discarded-items.c
@@ -1,28 +1,14 @@
 /*
- * Copyright 2019 Philippe Proulx <pproulx@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:
+ * SPDX-License-Identifier: MIT
  *
- * 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.
+ * Copyright 2019 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_LOG_TAG "LIB/MSG-DISCARDED-ITEMS"
 #include "lib/logging.h"
 
+#include <stdbool.h>
+
 #include "lib/assert-pre.h"
 #include "lib/object.h"
 #include "compat/compiler.h"
@@ -32,10 +18,6 @@
 #include "lib/trace-ir/stream.h"
 #include "lib/property.h"
 #include "lib/graph/message/message.h"
-#include <babeltrace2/graph/message-discarded-events.h>
-#include <babeltrace2/graph/message-discarded-events-const.h>
-#include <babeltrace2/graph/message-discarded-packets.h>
-#include <babeltrace2/graph/message-discarded-packets-const.h>
 
 #include "discarded-items.h"
 
@@ -121,7 +103,7 @@ struct bt_message *create_discarded_items_message(
        bt_message_init(&message->parent, type,
                destroy_discarded_items_message, NULL);
        message->stream = stream;
-       bt_object_get_no_null_check(message->stream);
+       bt_object_get_ref_no_null_check(message->stream);
 
        if (with_cs) {
                BT_ASSERT(stream_class->default_clock_class);
@@ -162,7 +144,7 @@ struct bt_stream *borrow_discarded_items_message_stream(
 {
        struct bt_message_discarded_items *disc_items_msg = (void *) message;
 
-       BT_ASSERT(message);
+       BT_ASSERT_DBG(message);
        return disc_items_msg->stream;
 }
 
@@ -184,7 +166,7 @@ enum bt_property_availability get_discarded_items_message_count(
        struct bt_message_discarded_items *disc_items_msg = (void *) message;
 
        BT_ASSERT_PRE_DEV_NON_NULL(count, "Count (output)");
-       BT_ASSERT(message);
+       BT_ASSERT_DBG(message);
        *count = disc_items_msg->count.value;
        return disc_items_msg->count.base.avail;
 }
@@ -196,7 +178,7 @@ borrow_discarded_items_message_beginning_default_clock_snapshot_const(
 {
        struct bt_message_discarded_items *disc_items_msg = (void *) message;
 
-       BT_ASSERT(message);
+       BT_ASSERT_DBG(message);
        BT_ASSERT_PRE_DEV(disc_items_msg->stream->class->default_clock_class,
                "Message's stream's class has no default clock class: "
                "%![msg-]+n, %![sc-]+S",
@@ -211,7 +193,7 @@ borrow_discarded_items_message_end_default_clock_snapshot_const(
 {
        struct bt_message_discarded_items *disc_items_msg = (void *) message;
 
-       BT_ASSERT(message);
+       BT_ASSERT_DBG(message);
        BT_ASSERT_PRE_DEV(disc_items_msg->stream->class->default_clock_class,
                "Message's stream's class has no default clock class: "
                "%![msg-]+n, %![sc-]+S",
@@ -223,6 +205,8 @@ struct bt_message *bt_message_discarded_events_create(
                struct bt_self_message_iterator *message_iterator,
                const struct bt_stream *stream)
 {
+       BT_ASSERT_PRE_DEV_NO_ERROR();
+
        return create_discarded_items_message(message_iterator,
                BT_MESSAGE_TYPE_DISCARDED_EVENTS, (void *) stream,
                false, 0, 0);
@@ -233,6 +217,8 @@ struct bt_message *bt_message_discarded_events_create_with_default_clock_snapsho
                const struct bt_stream *stream, uint64_t beginning_raw_value,
                uint64_t end_raw_value)
 {
+       BT_ASSERT_PRE_DEV_NO_ERROR();
+
        return create_discarded_items_message(message_iterator,
                BT_MESSAGE_TYPE_DISCARDED_EVENTS, (void *) stream,
                true, beginning_raw_value, end_raw_value);
@@ -294,6 +280,8 @@ struct bt_message *bt_message_discarded_packets_create(
                struct bt_self_message_iterator *message_iterator,
                const struct bt_stream *stream)
 {
+       BT_ASSERT_PRE_DEV_NO_ERROR();
+
        return create_discarded_items_message(message_iterator,
                BT_MESSAGE_TYPE_DISCARDED_PACKETS, (void *) stream,
                false, 0, 0);
@@ -304,6 +292,8 @@ struct bt_message *bt_message_discarded_packets_create_with_default_clock_snapsh
                const struct bt_stream *stream, uint64_t beginning_raw_value,
                uint64_t end_raw_value)
 {
+       BT_ASSERT_PRE_DEV_NO_ERROR();
+
        return create_discarded_items_message(message_iterator,
                BT_MESSAGE_TYPE_DISCARDED_PACKETS, (void *) stream,
                true, beginning_raw_value, end_raw_value);
@@ -369,7 +359,7 @@ borrow_discarded_items_message_stream_class_default_clock_class(
 {
        struct bt_message_discarded_items *disc_items_msg = (void *) msg;
 
-       BT_ASSERT(msg);
+       BT_ASSERT_DBG(msg);
        return disc_items_msg->stream->class->default_clock_class;
 }