X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fmessage%2Fmessage-iterator-inactivity.c;h=6ead8bd59397e635fec6aa2b3defc1abb165f3eb;hb=d98421f2abfc5adab28ab7ee9b63537a6c7261cc;hp=e5776ae0490fdd982b7c5ab0e296a0a8e8c3bbfe;hpb=17f3083a0b4d318d3303c8a5bfa63db6a874ec73;p=babeltrace.git

diff --git a/src/lib/graph/message/message-iterator-inactivity.c b/src/lib/graph/message/message-iterator-inactivity.c
index e5776ae0..6ead8bd5 100644
--- a/src/lib/graph/message/message-iterator-inactivity.c
+++ b/src/lib/graph/message/message-iterator-inactivity.c
@@ -1,36 +1,19 @@
 /*
- * Copyright 2017-2018 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 2017-2018 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_LOG_TAG "LIB/MSG-MSG-ITER-INACTIVITY"
 #include "lib/logging.h"
 
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.h"
 #include "lib/object.h"
 #include "compat/compiler.h"
 #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 +26,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,20 +36,20 @@ 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_LIB_LOGE_APPEND_CAUSE(
@@ -78,12 +61,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);
@@ -97,7 +80,7 @@ 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;
@@ -105,5 +88,5 @@ bt_message_message_iterator_inactivity_borrow_default_clock_snapshot_const(
 	BT_ASSERT_PRE_DEV_NON_NULL(msg, "Message");
 	BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg,
 		BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY);
-	return inactivity->default_cs;
+	return inactivity->cs;
 }