X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fmessage%2Fstream.c;h=a3723e4ac8f485179284d0ed7c857d7604f66850;hb=1e123ed605bf4936226d675e6725691bff249f7f;hp=b4b045cf602368ee2ed46d44a2b54530c4e394e1;hpb=d98421f2abfc5adab28ab7ee9b63537a6c7261cc;p=babeltrace.git

diff --git a/src/lib/graph/message/stream.c b/src/lib/graph/message/stream.c
index b4b045cf..a3723e4a 100644
--- a/src/lib/graph/message/stream.c
+++ b/src/lib/graph/message/stream.c
@@ -20,6 +20,14 @@
 
 #include "stream.h"
 
+#define BT_ASSERT_PRE_DEV_MSG_IS_STREAM_BEGINNING(_msg)			\
+	BT_ASSERT_PRE_DEV_MSG_HAS_TYPE("message", (_msg),		\
+		"stream-beginning", BT_MESSAGE_TYPE_STREAM_BEGINNING)
+
+#define BT_ASSERT_PRE_DEV_MSG_IS_STREAM_END(_msg)			\
+	BT_ASSERT_PRE_DEV_MSG_HAS_TYPE("message", (_msg),		\
+		"stream-end", BT_MESSAGE_TYPE_STREAM_END)
+
 static
 void destroy_stream_message(struct bt_object *obj)
 {
@@ -42,18 +50,19 @@ void destroy_stream_message(struct bt_object *obj)
 static inline
 struct bt_message *create_stream_message(
 		struct bt_self_message_iterator *self_msg_iter,
-		struct bt_stream *stream, enum bt_message_type type)
+		struct bt_stream *stream, enum bt_message_type type,
+		const char *api_func)
 {
 	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_FROM_FUNC(api_func, self_msg_iter);
+	BT_ASSERT_PRE_STREAM_NON_NULL_FROM_FUNC(api_func, stream);
 	stream_class = bt_stream_borrow_class(stream);
 	BT_ASSERT(stream_class);
 	BT_LIB_LOGD("Creating stream message object: "
 		"type=%s, %![stream-]+s, %![sc-]+S",
-		bt_message_type_string(type), stream, stream_class);
+		bt_common_message_type_string(type), stream, stream_class);
 	message = g_new0(struct bt_message_stream, 1);
 	if (!message) {
 		BT_LIB_LOGE_APPEND_CAUSE(
@@ -97,7 +106,7 @@ struct bt_message *bt_message_stream_beginning_create(
 	BT_ASSERT_PRE_DEV_NO_ERROR();
 
 	return create_stream_message(self_msg_iter, (void *) stream,
-		BT_MESSAGE_TYPE_STREAM_BEGINNING);
+		BT_MESSAGE_TYPE_STREAM_BEGINNING, __func__);
 }
 
 struct bt_message *bt_message_stream_end_create(
@@ -107,7 +116,7 @@ struct bt_message *bt_message_stream_end_create(
 	BT_ASSERT_PRE_DEV_NO_ERROR();
 
 	return create_stream_message(self_msg_iter, (void *) stream,
-		BT_MESSAGE_TYPE_STREAM_END);
+		BT_MESSAGE_TYPE_STREAM_END, __func__);
 }
 
 static inline
@@ -123,18 +132,16 @@ 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_MESSAGE_TYPE_STREAM_BEGINNING);
+	BT_ASSERT_PRE_DEV_MSG_NON_NULL(message);
+	BT_ASSERT_PRE_DEV_MSG_IS_STREAM_BEGINNING(message);
 	return borrow_stream_message_stream(message);
 }
 
 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_MESSAGE_TYPE_STREAM_END);
+	BT_ASSERT_PRE_DEV_MSG_NON_NULL(message);
+	BT_ASSERT_PRE_DEV_MSG_IS_STREAM_END(message);
 	return borrow_stream_message_stream(message);
 }
 
@@ -153,19 +160,19 @@ const struct bt_stream *bt_message_stream_end_borrow_stream_const(
 }
 
 static
-void bt_message_stream_set_default_clock_snapshot(
-		struct bt_message *msg, uint64_t raw_value)
+void set_stream_default_clock_snapshot(
+		struct bt_message *msg, uint64_t raw_value,
+		const char *api_func)
 {
 	struct bt_message_stream *stream_msg = (void *) msg;
 	struct bt_stream_class *sc;
 
 	BT_ASSERT(msg);
-	BT_ASSERT_PRE_DEV_HOT(msg, "Message", ": %!+n", msg);
+	BT_ASSERT_PRE_DEV_HOT_FROM_FUNC(api_func, "message", 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_MSG_SC_DEF_CLK_CLS_FROM_FUNC(api_func, 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;
@@ -176,24 +183,23 @@ 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_message_stream_set_default_clock_snapshot(message, raw_value);
+	BT_ASSERT_PRE_MSG_NON_NULL(message);
+	BT_ASSERT_PRE_DEV_MSG_IS_STREAM_BEGINNING(message);
+	set_stream_default_clock_snapshot(message, raw_value, __func__);
 }
 
 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);
-
-	return bt_message_stream_set_default_clock_snapshot(message, raw_value);
+	BT_ASSERT_PRE_MSG_NON_NULL(message);
+	BT_ASSERT_PRE_DEV_MSG_IS_STREAM_END(message);
+	return set_stream_default_clock_snapshot(message, raw_value, __func__);
 }
 
 static enum bt_message_stream_clock_snapshot_state
-bt_message_stream_borrow_default_clock_snapshot_const(
-		const bt_message *msg, const bt_clock_snapshot **snapshot)
+borrow_stream_message_default_clock_snapshot_const(
+		const bt_message *msg, const bt_clock_snapshot **snapshot,
+		const char *api_func)
 {
 	struct bt_message_stream *stream_msg = (void *) msg;
 	struct bt_stream_class *sc;
@@ -201,9 +207,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_FROM_FUNC(api_func, msg, sc);
 	BT_ASSERT_DBG(stream_msg->default_cs);
 
 	*snapshot = stream_msg->default_cs;
@@ -215,21 +219,20 @@ 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_MESSAGE_TYPE_STREAM_BEGINNING);
-	return bt_message_stream_borrow_default_clock_snapshot_const(
-		message, snapshot);
+	BT_ASSERT_PRE_DEV_MSG_NON_NULL(message);
+	BT_ASSERT_PRE_DEV_MSG_IS_STREAM_BEGINNING(message);
+	return borrow_stream_message_default_clock_snapshot_const(
+		message, snapshot, __func__);
 }
 
 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);
-	return bt_message_stream_borrow_default_clock_snapshot_const(
-		message, snapshot);
+	BT_ASSERT_PRE_DEV_MSG_NON_NULL(message);
+	BT_ASSERT_PRE_DEV_MSG_IS_STREAM_END(message);
+	return borrow_stream_message_default_clock_snapshot_const(
+		message, snapshot, __func__);
 }
 
 static inline
@@ -247,9 +250,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_MESSAGE_TYPE_STREAM_BEGINNING);
+	BT_ASSERT_PRE_DEV_MSG_NON_NULL(msg);
+	BT_ASSERT_PRE_DEV_MSG_IS_STREAM_BEGINNING(msg);
 	return borrow_stream_message_stream_class_default_clock_class(msg);
 }
 
@@ -257,7 +259,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_IS_STREAM_END(msg);
 	return borrow_stream_message_stream_class_default_clock_class(msg);
 }