X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Flttng-utils%2Fdebug-info%2Fdebug-info.c;h=545a4eee8c1c929ad6aef23a1d5605998c3fb6a2;hb=9db4399ff6a1c1e182f416985f85f6e2fcb0b5c4;hp=10e5a7de6f710698009bb94925c0f4c75ef38d6c;hpb=8e01f2d9837d5ba9a85c678121dcc8adf8dbe72e;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 10e5a7de..545a4eee 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>
 
@@ -119,7 +119,7 @@ struct debug_info {
 	bt_self_component *self_comp;
 	struct debug_info_component *comp;
 	const bt_trace *input_trace;
-	uint64_t destruction_listener_id;
+	bt_listener_id destruction_listener_id;
 
 	/*
 	 * Hash table of VPIDs (pointer to int64_t) to
@@ -1990,8 +1990,8 @@ 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(
-		input_port);
+	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;
 		goto error;