X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Ftext%2Fpretty%2Fpretty.c;h=401cfd701ef5650241ac3352e9618db95719dcd4;hb=fbd8a4e0144aa7777bedcd8c05daec61d594634d;hp=3f693e5a815d524f000998a304cbeb3241419789;hpb=828c8a25785e0cedaeb6987256a4dfc3c43b982f;p=babeltrace.git

diff --git a/src/plugins/text/pretty/pretty.c b/src/plugins/text/pretty/pretty.c
index 3f693e5a..401cfd70 100644
--- a/src/plugins/text/pretty/pretty.c
+++ b/src/plugins/text/pretty/pretty.c
@@ -46,7 +46,11 @@ const char * const in_port_name = "in";
 static
 void destroy_pretty_data(struct pretty_component *pretty)
 {
-	bt_self_component_port_input_message_iterator_put_ref(pretty->iterator);
+	if (!pretty) {
+		goto end;
+	}
+
+	bt_message_iterator_put_ref(pretty->iterator);
 
 	if (pretty->string) {
 		(void) g_string_free(pretty->string, TRUE);
@@ -66,6 +70,9 @@ void destroy_pretty_data(struct pretty_component *pretty)
 	}
 	g_free(pretty->options.output_path);
 	g_free(pretty);
+
+end:
+	return;
 }
 
 static
@@ -102,25 +109,25 @@ void pretty_finalize(bt_self_component_sink *comp)
 }
 
 static
-bt_component_class_message_iterator_next_method_status handle_message(
+bt_message_iterator_class_next_method_status handle_message(
 		struct pretty_component *pretty,
 		const bt_message *message)
 {
-	bt_component_class_message_iterator_next_method_status ret =
-		BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
+	bt_message_iterator_class_next_method_status ret =
+		BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK;
 
-	BT_ASSERT(pretty);
+	BT_ASSERT_DBG(pretty);
 
 	switch (bt_message_get_type(message)) {
 	case BT_MESSAGE_TYPE_EVENT:
 		if (pretty_print_event(pretty, message)) {
-			ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
+			ret = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR;
 		}
 		break;
 	case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
 	case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
 		if (pretty_print_discarded_items(pretty, message)) {
-			ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
+			ret = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR;
 		}
 		break;
 	default:
@@ -135,7 +142,7 @@ bt_component_class_sink_graph_is_configured_method_status
 pretty_graph_is_configured(bt_self_component_sink *comp)
 {
 	bt_component_class_sink_graph_is_configured_method_status status;
-	bt_self_component_port_input_message_iterator_create_from_sink_component_status
+	bt_message_iterator_create_from_sink_component_status
 		msg_iter_status;
 	struct pretty_component *pretty;
 
@@ -143,10 +150,10 @@ pretty_graph_is_configured(bt_self_component_sink *comp)
 			bt_self_component_sink_as_self_component(comp));
 	BT_ASSERT(pretty);
 	BT_ASSERT(!pretty->iterator);
-	msg_iter_status = bt_self_component_port_input_message_iterator_create_from_sink_component(
+	msg_iter_status = bt_message_iterator_create_from_sink_component(
 		comp, bt_self_component_sink_borrow_input_port_by_name(comp,
 			in_port_name), &pretty->iterator);
-	if (msg_iter_status != BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
+	if (msg_iter_status != BT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
 		status = (int) msg_iter_status;
 		goto end;
 	}
@@ -164,7 +171,7 @@ bt_component_class_sink_consume_method_status pretty_consume(
 	bt_component_class_sink_consume_method_status ret =
 		BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_OK;
 	bt_message_array_const msgs;
-	bt_self_component_port_input_message_iterator *it;
+	bt_message_iterator *it;
 	struct pretty_component *pretty = bt_self_component_get_data(
 		bt_self_component_sink_as_self_component(comp));
 	bt_message_iterator_next_status next_status;
@@ -172,7 +179,7 @@ bt_component_class_sink_consume_method_status pretty_consume(
 	uint64_t i = 0;
 
 	it = pretty->iterator;
-	next_status = bt_self_component_port_input_message_iterator_next(it,
+	next_status = bt_message_iterator_next(it,
 		&msgs, &count);
 
 	switch (next_status) {
@@ -184,7 +191,7 @@ bt_component_class_sink_consume_method_status pretty_consume(
 		goto end;
 	case BT_MESSAGE_ITERATOR_NEXT_STATUS_END:
 		ret = (int) next_status;
-		BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_PUT_REF_AND_RESET(
+		BT_MESSAGE_ITERATOR_PUT_REF_AND_RESET(
 			pretty->iterator);
 		goto end;
 	default:
@@ -192,7 +199,7 @@ bt_component_class_sink_consume_method_status pretty_consume(
 		goto end;
 	}
 
-	BT_ASSERT(next_status == BT_MESSAGE_ITERATOR_NEXT_STATUS_OK);
+	BT_ASSERT_DBG(next_status == BT_MESSAGE_ITERATOR_NEXT_STATUS_OK);
 
 	for (i = 0; i < count; i++) {
 		ret = (int) handle_message(pretty, msgs[i]);
@@ -289,6 +296,7 @@ end:
 static const char *color_choices[] = { "never", "auto", "always", NULL };
 static const char *show_hide_choices[] = { "show", "hide", NULL };
 
+static
 struct bt_param_validation_map_value_entry_descr pretty_params[] = {
 	{ "color", BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_OPTIONAL, { BT_VALUE_TYPE_STRING, .string = {
 		.choices = color_choices,
@@ -423,7 +431,7 @@ bt_component_class_initialize_method_status apply_params(
 		pretty->options.print_scope_field_names = false;
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	apply_one_bool_if_specified("name-payload", params,
@@ -485,7 +493,7 @@ bt_component_class_initialize_method_status apply_params(
 		pretty->options.print_callsite_field = false;
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	apply_one_bool_if_specified("field-trace", params,
@@ -512,6 +520,7 @@ bt_component_class_initialize_method_status apply_params(
 	apply_one_bool_if_specified("field-callsite", params,
 		&pretty->options.print_callsite_field);
 
+	pretty_print_init();
 	status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
 
 end: