X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Flttng-utils%2Fdebug-info%2Fdebug-info.c;h=fa2a492e9a8884d435a838112a300fb275cb61f7;hb=8d8b141db4c46135a35be19e4a1c192f6a36d67b;hp=f3ba254f58be5cb9923336d2aecfd9d8ec89b299;hpb=2054a0d13fbfba65d23d17a1e35c9dd62f28c2ab;p=babeltrace.git

diff --git a/src/plugins/lttng-utils/debug-info/debug-info.c b/src/plugins/lttng-utils/debug-info/debug-info.c
index f3ba254f..fa2a492e 100644
--- a/src/plugins/lttng-utils/debug-info/debug-info.c
+++ b/src/plugins/lttng-utils/debug-info/debug-info.c
@@ -29,7 +29,7 @@
 #define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL log_level
 #define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <glib.h>
 
@@ -1748,6 +1748,7 @@ int init_from_params(struct debug_info_component *debug_info_component,
 BT_HIDDEN
 bt_component_class_init_method_status debug_info_comp_init(
 		bt_self_component_filter *self_comp_flt,
+		bt_self_component_filter_configuration *config,
 		const bt_value *params, __attribute__((unused)) void *init_method_data)
 {
 	int ret;
@@ -1957,11 +1958,13 @@ end:
 BT_HIDDEN
 bt_component_class_message_iterator_init_method_status debug_info_msg_iter_init(
 		bt_self_message_iterator *self_msg_iter,
+		bt_self_message_iterator_configuration *config,
 		bt_self_component_filter *self_comp_flt,
 		bt_self_component_port_output *self_port)
 {
-	bt_component_class_message_iterator_init_method_status status =
-		BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK;
+	bt_component_class_message_iterator_init_method_status status;
+	bt_self_component_port_input_message_iterator_create_from_message_iterator_status
+		msg_iter_status;
 	struct bt_self_component_port_input *input_port = NULL;
 	bt_self_component_port_input_message_iterator *upstream_iterator = NULL;
 	struct debug_info_msg_iter *debug_info_msg_iter = NULL;
@@ -1990,10 +1993,10 @@ bt_component_class_message_iterator_init_method_status debug_info_msg_iter_init(
 	debug_info_msg_iter->self_comp = self_comp;
 
 	/* Create an iterator on the upstream component. */
-	upstream_iterator = bt_self_component_port_input_message_iterator_create_from_message_iterator(
-		self_msg_iter, input_port);
-	if (!upstream_iterator) {
-		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_MEMORY_ERROR;
+	msg_iter_status = bt_self_component_port_input_message_iterator_create_from_message_iterator(
+		self_msg_iter, input_port, &upstream_iterator);
+	if (msg_iter_status != BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_CREATE_FROM_MESSAGE_ITERATOR_STATUS_OK) {
+		status = (int) msg_iter_status;
 		goto error;
 	}
 
@@ -2031,6 +2034,7 @@ bt_component_class_message_iterator_init_method_status debug_info_msg_iter_init(
 	bt_self_message_iterator_set_data(self_msg_iter, debug_info_msg_iter);
 	debug_info_msg_iter->input_iterator = self_msg_iter;
 
+	status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK;
 	goto end;
 
 error:
@@ -2041,15 +2045,16 @@ end:
 }
 
 BT_HIDDEN
-bt_bool debug_info_msg_iter_can_seek_beginning(
-		bt_self_message_iterator *self_msg_iter)
+bt_component_class_message_iterator_can_seek_beginning_method_status
+debug_info_msg_iter_can_seek_beginning(
+	bt_self_message_iterator *self_msg_iter, bt_bool *can_seek)
 {
 	struct debug_info_msg_iter *debug_info_msg_iter =
 		bt_self_message_iterator_get_data(self_msg_iter);
 	BT_ASSERT(debug_info_msg_iter);
 
-	return bt_self_component_port_input_message_iterator_can_seek_beginning(
-			debug_info_msg_iter->msg_iter);
+	return (int) bt_self_component_port_input_message_iterator_can_seek_beginning(
+		debug_info_msg_iter->msg_iter, can_seek);
 }
 
 BT_HIDDEN