X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fmessage%2Fdiscarded-items.c;h=e7646377648220e6f57b9ba7d66b163e7c72b2c6;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=d83c8820d5d0aed18766bbbdbd92fe98b2692db3;hpb=6871026b82224d83bb63cbb44cc33c16c766d96d;p=babeltrace.git

diff --git a/src/lib/graph/message/discarded-items.c b/src/lib/graph/message/discarded-items.c
index d83c8820..e7646377 100644
--- a/src/lib/graph/message/discarded-items.c
+++ b/src/lib/graph/message/discarded-items.c
@@ -23,6 +23,8 @@
 #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 +34,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"
 
@@ -162,7 +160,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 +182,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 +194,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 +209,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 +221,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 +233,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 +296,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 +308,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 +375,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;
 }