Fix: sink.text.pretty: check that port is connected before creating message iterator

[babeltrace.git] / src / plugins / text / pretty / pretty.c

diff --git a/src/plugins/text/pretty/pretty.c b/src/plugins/text/pretty/pretty.c
index 1e248644398022c43b59e94173a15235ef0d25f6..f31e9d72681eb23f1e85ab3fd1b202a2754fd6c8 100644 (file)
--- a/src/plugins/text/pretty/pretty.c
+++ b/src/plugins/text/pretty/pretty.c
@@ -50,7 +50,7 @@ void destroy_pretty_data(struct pretty_component *pretty)
                goto end;
        }
 
-       bt_self_component_port_input_message_iterator_put_ref(pretty->iterator);
+       bt_message_iterator_put_ref(pretty->iterator);
 
        if (pretty->string) {
                (void) g_string_free(pretty->string, TRUE);
@@ -139,21 +139,35 @@ bt_message_iterator_class_next_method_status handle_message(
 
 BT_HIDDEN
 bt_component_class_sink_graph_is_configured_method_status
-pretty_graph_is_configured(bt_self_component_sink *comp)
+pretty_graph_is_configured(bt_self_component_sink *self_comp_sink)
 {
        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;
+       bt_self_component *self_comp =
+               bt_self_component_sink_as_self_component(self_comp_sink);
+       const bt_component *comp = bt_self_component_as_component(self_comp);
+       bt_self_component_port_input *in_port;
+       bt_logging_level log_level = bt_component_get_logging_level(comp);
 
-       pretty = bt_self_component_get_data(
-                       bt_self_component_sink_as_self_component(comp));
+       pretty = bt_self_component_get_data(self_comp);
        BT_ASSERT(pretty);
        BT_ASSERT(!pretty->iterator);
-       msg_iter_status = bt_self_component_port_input_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) {
+
+       in_port = bt_self_component_sink_borrow_input_port_by_name(self_comp_sink,
+               in_port_name);
+       if (!bt_port_is_connected(bt_port_input_as_port_const(
+                       bt_self_component_port_input_as_port_input(in_port)))) {
+               BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Single input port is not connected: "
+                       "port-name=\"%s\"", in_port_name);
+               status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_ERROR;
+               goto end;
+       }
+
+       msg_iter_status = bt_message_iterator_create_from_sink_component(
+               self_comp_sink, in_port, &pretty->iterator);
+       if (msg_iter_status != BT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
                status = (int) msg_iter_status;
                goto end;
        }
@@ -171,7 +185,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;
@@ -179,7 +193,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) {
@@ -191,7 +205,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: