X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Futils%2Fmuxer%2Fmuxer.c;h=3e4d42057b1d49e0a00814cdd6f063f9f11da634;hb=c49bf79b7d7e87cc21d065a7d208bcc238fb0800;hp=50473050dcdf4050e24e767f5231f4c5f211d3a9;hpb=9635b8a6d1a191f48b370595e9b76d7d5c26a0c9;p=babeltrace.git

diff --git a/src/plugins/utils/muxer/muxer.c b/src/plugins/utils/muxer/muxer.c
index 50473050..3e4d4205 100644
--- a/src/plugins/utils/muxer/muxer.c
+++ b/src/plugins/utils/muxer/muxer.c
@@ -247,12 +247,13 @@ void destroy_muxer_comp(struct muxer_comp *muxer_comp)
 }
 
 BT_HIDDEN
-bt_component_class_init_method_status muxer_init(
+bt_component_class_initialize_method_status muxer_init(
 		bt_self_component_filter *self_comp_flt,
+		bt_self_component_filter_configuration *config,
 		const bt_value *params, void *init_data)
 {
-	bt_component_class_init_method_status status =
-		BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK;
+	bt_component_class_initialize_method_status status =
+		BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
 	bt_self_component_add_port_status add_port_status;
 	bt_self_component *self_comp =
 		bt_self_component_filter_as_self_component(self_comp_flt);
@@ -283,9 +284,9 @@ bt_component_class_init_method_status muxer_init(
 			bt_common_func_status_string(add_port_status));
 		if (add_port_status ==
 				BT_SELF_COMPONENT_ADD_PORT_STATUS_MEMORY_ERROR) {
-			status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_MEMORY_ERROR;
+			status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
 		} else {
-			status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
+			status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
 		}
 
 		goto error;
@@ -299,9 +300,9 @@ bt_component_class_init_method_status muxer_init(
 			bt_common_func_status_string(add_port_status));
 		if (add_port_status ==
 				BT_SELF_COMPONENT_ADD_PORT_STATUS_MEMORY_ERROR) {
-			status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_MEMORY_ERROR;
+			status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
 		} else {
-			status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
+			status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
 		}
 
 		goto error;
@@ -317,8 +318,8 @@ error:
 	destroy_muxer_comp(muxer_comp);
 	bt_self_component_set_data(self_comp, NULL);
 
-	if (status == BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK) {
-		status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
+	if (status == BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK) {
+		status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
 	}
 
 end:
@@ -1145,13 +1146,15 @@ void destroy_muxer_msg_iter(struct muxer_msg_iter *muxer_msg_iter)
 }
 
 static
-bt_component_class_message_iterator_init_method_status
+bt_component_class_message_iterator_initialize_method_status
 muxer_msg_iter_init_upstream_iterators(struct muxer_comp *muxer_comp,
-		struct muxer_msg_iter *muxer_msg_iter)
+		struct muxer_msg_iter *muxer_msg_iter,
+		struct bt_self_message_iterator_configuration *config)
 {
 	int64_t count;
 	int64_t i;
-	bt_component_class_message_iterator_init_method_status status;
+	bt_component_class_message_iterator_initialize_method_status status;
+	bool can_seek_forward = true;
 
 	count = bt_component_filter_get_input_port_count(
 		bt_self_component_filter_as_component_filter(
@@ -1160,7 +1163,7 @@ muxer_msg_iter_init_upstream_iterators(struct muxer_comp *muxer_comp,
 		BT_COMP_LOGD("No input port to initialize for muxer component's message iterator: "
 			"muxer-comp-addr=%p, muxer-msg-iter-addr=%p",
 			muxer_comp, muxer_msg_iter);
-		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK;
+		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_OK;
 		goto end;
 	}
 
@@ -1198,27 +1201,39 @@ muxer_msg_iter_init_upstream_iterators(struct muxer_comp *muxer_comp,
 		bt_self_component_port_input_message_iterator_put_ref(
 			upstream_msg_iter);
 		if (int_status) {
-			status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_ERROR;
+			status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_ERROR;
 			/* muxer_msg_iter_add_upstream_msg_iter() logs errors */
 			goto end;
 		}
+
+		can_seek_forward = can_seek_forward &&
+			bt_self_component_port_input_message_iterator_can_seek_forward(
+				upstream_msg_iter);
 	}
 
-	status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK;
+	/*
+	 * This iterator can seek forward if all of its iterators can seek
+	 * forward.
+	 */
+	bt_self_message_iterator_configuration_set_can_seek_forward(
+		config, can_seek_forward);
+
+	status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_OK;
 
 end:
 	return status;
 }
 
 BT_HIDDEN
-bt_component_class_message_iterator_init_method_status muxer_msg_iter_init(
+bt_component_class_message_iterator_initialize_method_status muxer_msg_iter_init(
 		bt_self_message_iterator *self_msg_iter,
+		bt_self_message_iterator_configuration *config,
 		bt_self_component_filter *self_comp,
 		bt_self_component_port_output *port)
 {
 	struct muxer_comp *muxer_comp = NULL;
 	struct muxer_msg_iter *muxer_msg_iter = NULL;
-	bt_component_class_message_iterator_init_method_status status;
+	bt_component_class_message_iterator_initialize_method_status status;
 
 	muxer_comp = bt_self_component_get_data(
 		bt_self_component_filter_as_self_component(self_comp));
@@ -1236,7 +1251,7 @@ bt_component_class_message_iterator_init_method_status muxer_msg_iter_init(
 		BT_COMP_LOGE("Recursive initialization of muxer component's message iterator: "
 			"comp-addr=%p, muxer-comp-addr=%p, msg-iter-addr=%p",
 			self_comp, muxer_comp, self_msg_iter);
-		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_ERROR;
+		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_ERROR;
 		goto error;
 	}
 
@@ -1244,7 +1259,7 @@ bt_component_class_message_iterator_init_method_status muxer_msg_iter_init(
 	muxer_msg_iter = g_new0(struct muxer_msg_iter, 1);
 	if (!muxer_msg_iter) {
 		BT_COMP_LOGE_STR("Failed to allocate one muxer component's message iterator.");
-		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_MEMORY_ERROR;
+		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
 		goto error;
 	}
 
@@ -1256,7 +1271,7 @@ bt_component_class_message_iterator_init_method_status muxer_msg_iter_init(
 			(GDestroyNotify) destroy_muxer_upstream_msg_iter);
 	if (!muxer_msg_iter->active_muxer_upstream_msg_iters) {
 		BT_COMP_LOGE_STR("Failed to allocate a GPtrArray.");
-		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_MEMORY_ERROR;
+		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
 		goto error;
 	}
 
@@ -1265,12 +1280,12 @@ bt_component_class_message_iterator_init_method_status muxer_msg_iter_init(
 			(GDestroyNotify) destroy_muxer_upstream_msg_iter);
 	if (!muxer_msg_iter->ended_muxer_upstream_msg_iters) {
 		BT_COMP_LOGE_STR("Failed to allocate a GPtrArray.");
-		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_MEMORY_ERROR;
+		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
 		goto error;
 	}
 
 	status = muxer_msg_iter_init_upstream_iterators(muxer_comp,
-		muxer_msg_iter);
+		muxer_msg_iter, config);
 	if (status) {
 		BT_COMP_LOGE("Cannot initialize connected input ports for muxer component's message iterator: "
 			"comp-addr=%p, muxer-comp-addr=%p, "
@@ -1395,7 +1410,8 @@ bt_component_class_message_iterator_can_seek_beginning_method_status
 muxer_upstream_msg_iters_can_all_seek_beginning(
 		GPtrArray *muxer_upstream_msg_iters, bt_bool *can_seek)
 {
-	bt_component_class_message_iterator_can_seek_beginning_method_status status;
+	bt_component_class_message_iterator_can_seek_beginning_method_status status =
+		BT_COMPONENT_CLASS_MESSAGE_ITERATOR_CAN_SEEK_BEGINNING_METHOD_STATUS_OK;
 	uint64_t i;
 
 	for (i = 0; i < muxer_upstream_msg_iters->len; i++) {