X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fmessage%2Fmessage-iterator-inactivity.c;h=1754f385942d9ebbc2a43976eea9d05e0921e663;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=5e376381fcdbaa3c360a88c3e8318fb76ab40866;hpb=3f7d4d90b0456de9d34fac337350818ef06163bd;p=babeltrace.git

diff --git a/src/lib/graph/message/message-iterator-inactivity.c b/src/lib/graph/message/message-iterator-inactivity.c
index 5e376381..1754f385 100644
--- a/src/lib/graph/message/message-iterator-inactivity.c
+++ b/src/lib/graph/message/message-iterator-inactivity.c
@@ -20,8 +20,8 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "MSG-MESSAGE-ITERATOR-INACTIVITY"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/MSG-MSG-ITER-INACTIVITY"
+#include "lib/logging.h"
 
 #include "lib/assert-pre.h"
 #include "lib/object.h"
@@ -29,8 +29,7 @@
 #include <babeltrace2/trace-ir/clock-class.h>
 #include "lib/trace-ir/clock-snapshot.h"
 #include "lib/graph/message/message.h"
-#include <babeltrace2/graph/message-message-iterator-inactivity-const.h>
-#include <babeltrace2/graph/message-message-iterator-inactivity.h>
+#include <babeltrace2/graph/message.h>
 
 #include "message-iterator-inactivity.h"
 
@@ -43,9 +42,9 @@ void bt_message_message_iterator_inactivity_destroy(struct bt_object *obj)
 	BT_LIB_LOGD("Destroying message iterator inactivity message: %!+n",
 		message);
 
-	if (message->default_cs) {
-		bt_clock_snapshot_recycle(message->default_cs);
-		message->default_cs = NULL;
+	if (message->cs) {
+		bt_clock_snapshot_recycle(message->cs);
+		message->cs = NULL;
 	}
 
 	g_free(message);
@@ -53,22 +52,24 @@ void bt_message_message_iterator_inactivity_destroy(struct bt_object *obj)
 
 struct bt_message *bt_message_message_iterator_inactivity_create(
 		struct bt_self_message_iterator *self_msg_iter,
-		const struct bt_clock_class *default_clock_class,
+		const struct bt_clock_class *clock_class,
 		uint64_t value_cycles)
 {
-	struct bt_self_component_port_input_message_iterator *msg_iter =
+	struct bt_message_iterator *msg_iter =
 		(void *) self_msg_iter;
 	struct bt_message_message_iterator_inactivity *message;
 	struct bt_message *ret_msg = NULL;
 
+	BT_ASSERT_PRE_DEV_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(msg_iter, "Message iterator");
-	BT_ASSERT_PRE_NON_NULL(default_clock_class, "Default clock class");
+	BT_ASSERT_PRE_NON_NULL(clock_class, "Default clock class");
 	BT_LIB_LOGD("Creating message iterator inactivity message object: "
-		"%![iter-]+i, %![default-cc-]+K, value=%" PRIu64, msg_iter,
-		default_clock_class, value_cycles);
+		"%![iter-]+i, %![cc-]+K, value=%" PRIu64, msg_iter,
+		clock_class, value_cycles);
 	message = g_new0(struct bt_message_message_iterator_inactivity, 1);
 	if (!message) {
-		BT_LOGE_STR("Failed to allocate one message iterator "
+		BT_LIB_LOGE_APPEND_CAUSE(
+			"Failed to allocate one message iterator "
 			"inactivity message.");
 		goto error;
 	}
@@ -76,12 +77,12 @@ struct bt_message *bt_message_message_iterator_inactivity_create(
 		BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY,
 		bt_message_message_iterator_inactivity_destroy, NULL);
 	ret_msg = &message->parent;
-	message->default_cs = bt_clock_snapshot_create(
-		(void *) default_clock_class);
-	if (!message->default_cs) {
+	message->cs = bt_clock_snapshot_create(
+		(void *) clock_class);
+	if (!message->cs) {
 		goto error;
 	}
-	bt_clock_snapshot_set_raw_value(message->default_cs, value_cycles);
+	bt_clock_snapshot_set_raw_value(message->cs, value_cycles);
 
 	BT_LIB_LOGD("Created message iterator inactivity message object: %!+n",
 		ret_msg);
@@ -95,12 +96,13 @@ end:
 }
 
 extern const struct bt_clock_snapshot *
-bt_message_message_iterator_inactivity_borrow_default_clock_snapshot_const(
+bt_message_message_iterator_inactivity_borrow_clock_snapshot_const(
 		const bt_message *msg)
 {
 	struct bt_message_message_iterator_inactivity *inactivity = (void *) msg;
 
-	BT_ASSERT_PRE_NON_NULL(msg, "Message");
-	BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY);
-	return inactivity->default_cs;
+	BT_ASSERT_PRE_DEV_NON_NULL(msg, "Message");
+	BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg,
+		BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY);
+	return inactivity->cs;
 }