X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Flttng-utils%2Fdebug-info%2Fdebug-info.c;h=58809eb2e2aca4ab24c7d26f90f348805cdd8be2;hb=f2fb1b3297ca0bc13b53189a063b63944be7fae9;hp=75eb0175321d307341e198e059f87310eafa4ac1;hpb=acc179dd9c3ad10217c1c350500365fc15368f4c;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 75eb0175..58809eb2 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
@@ -363,7 +363,7 @@ static inline
 void event_get_common_context_signed_integer_field_value(
 		const bt_event *event, const char *field_name, int64_t *value)
 {
-	*value = bt_field_signed_integer_get_value(
+	*value = bt_field_integer_signed_get_value(
 			event_borrow_common_context_field(event, field_name));
 }
 
@@ -417,7 +417,7 @@ int event_get_payload_build_id_value(const bt_event *event,
 			bt_field_array_borrow_element_field_by_index_const(
 					build_id_field, i);
 
-		build_id[i] = bt_field_unsigned_integer_get_value(curr_field);
+		build_id[i] = bt_field_integer_unsigned_get_value(curr_field);
 	}
 
 	return ret;
@@ -427,7 +427,7 @@ static
 void event_get_payload_unsigned_integer_field_value(const bt_event *event,
 		const char *field_name, uint64_t *value)
 {
-	*value = bt_field_unsigned_integer_get_value(
+	*value = bt_field_integer_unsigned_get_value(
 			event_borrow_payload_field(event, field_name));
 }
 
@@ -443,7 +443,7 @@ static inline
 bool event_has_payload_field(const bt_event *event,
 		const char *field_name)
 {
-	return event_borrow_payload_field(event, field_name) != NULL;
+	return event_borrow_payload_field(event, field_name);
 }
 
 static
@@ -1195,8 +1195,8 @@ void fill_debug_info_event_if_needed(struct debug_info_msg_iter *debug_it,
 	ip_field = bt_field_structure_borrow_member_field_by_name_const(
 			out_common_ctx_field, IP_FIELD_NAME);
 
-	vpid = bt_field_signed_integer_get_value(vpid_field);
-	ip = bt_field_unsigned_integer_get_value(ip_field);
+	vpid = bt_field_integer_signed_get_value(vpid_field);
+	ip = bt_field_integer_unsigned_get_value(ip_field);
 
 	/*
 	 * Borrow the debug_info structure needed for the source
@@ -1960,8 +1960,9 @@ bt_component_class_message_iterator_init_method_status debug_info_msg_iter_init(
 		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 +1991,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(
-		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 +2032,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 +2043,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