Remove default port API

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

diff --git a/plugins/text/pretty/pretty.c b/plugins/text/pretty/pretty.c
index 14f8560c108f96bded8c82b0ee2fec4369a6962d..cea5fe688f080511e9b5c63903f020864380f86c 100644 (file)
--- a/plugins/text/pretty/pretty.c
+++ b/plugins/text/pretty/pretty.c
@@ -30,6 +30,7 @@
 #include <babeltrace/plugin/plugin-dev.h>
 #include <babeltrace/graph/component.h>
 #include <babeltrace/graph/private-component.h>
+#include <babeltrace/graph/private-component-sink.h>
 #include <babeltrace/graph/component-sink.h>
 #include <babeltrace/graph/port.h>
 #include <babeltrace/graph/private-port.h>
@@ -52,10 +53,7 @@
 static
 const char *plugin_options[] = {
        "color",
-       "output-path",
-       "debug-info-dir",
-       "debug-info-target-prefix",
-       "debug-info-full-path",
+       "path",
        "no-delta",
        "clock-cycles",
        "clock-seconds",
@@ -92,8 +90,6 @@ void destroy_pretty_data(struct pretty_component *pretty)
                }
        }
        g_free(pretty->options.output_path);
-       g_free(pretty->options.debug_info_dir);
-       g_free(pretty->options.debug_info_target_prefix);
        g_free(pretty);
 }
 
@@ -132,38 +128,12 @@ enum bt_component_status handle_notification(struct pretty_component *pretty,
 {
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 
-       if (!pretty) {
-               ret = BT_COMPONENT_STATUS_ERROR;
-               goto end;
-       }
-
-       switch (bt_notification_get_type(notification)) {
-       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
-               break;
-       case BT_NOTIFICATION_TYPE_PACKET_END:
-               break;
-       case BT_NOTIFICATION_TYPE_EVENT:
-       {
-               struct bt_ctf_event *event = bt_notification_event_get_event(
-                               notification);
+       assert(pretty);
 
-               if (!event) {
-                       ret = BT_COMPONENT_STATUS_ERROR;
-                       goto end;
-               }
-               ret = pretty_print_event(pretty, event);
-               bt_put(event);
-               if (ret != BT_COMPONENT_STATUS_OK) {
-                       goto end;
-               }
-               break;
-       }
-       case BT_NOTIFICATION_TYPE_STREAM_END:
-               break;
-       default:
-               puts("Unhandled notification type");
+       if (bt_notification_get_type(notification) == BT_NOTIFICATION_TYPE_EVENT) {
+               ret = pretty_print_event(pretty, notification);
        }
-end:
+
        return ret;
 }
 
@@ -217,14 +187,20 @@ enum bt_component_status pretty_consume(struct bt_private_component *component)
                ret = BT_COMPONENT_STATUS_END;
                BT_PUT(pretty->input_iterator);
                goto end;
-       default:
+       case BT_NOTIFICATION_ITERATOR_STATUS_AGAIN:
+               ret = BT_COMPONENT_STATUS_AGAIN;
+               goto end;
+       case BT_NOTIFICATION_ITERATOR_STATUS_OK:
                break;
+       default:
+               ret = BT_COMPONENT_STATUS_ERROR;
+               goto end;
        }
 
        notification = bt_notification_iterator_get_notification(it);
        assert(notification);
        ret = handle_notification(pretty, notification);
-       pretty->processed_first_event = true;
+
 end:
        bt_put(notification);
        return ret;
@@ -412,9 +388,7 @@ enum bt_component_status apply_params(struct pretty_component *pretty,
                bt_put(color_value);
        }
 
-       ret = apply_one_string("output-path",
-                       params,
-                       &pretty->options.output_path);
+       ret = apply_one_string("path", params, &pretty->options.output_path);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto end;
        }
@@ -423,27 +397,6 @@ enum bt_component_status apply_params(struct pretty_component *pretty,
                goto end;
        }
 
-       ret = apply_one_string("debug-info-dir",
-                       params,
-                       &pretty->options.debug_info_dir);
-       if (ret != BT_COMPONENT_STATUS_OK) {
-               goto end;
-       }
-
-       ret = apply_one_string("debug-info-target-prefix",
-                       params,
-                       &pretty->options.debug_info_target_prefix);
-       if (ret != BT_COMPONENT_STATUS_OK) {
-               goto end;
-       }
-
-       value = false;          /* Default. */
-       ret = apply_one_bool("debug-info-full-path", params, &value, NULL);
-       if (ret != BT_COMPONENT_STATUS_OK) {
-               goto end;
-       }
-       pretty->options.debug_info_full_path = value;
-
        value = false;          /* Default. */
        ret = apply_one_bool("no-delta", params, &value, NULL);
        if (ret != BT_COMPONENT_STATUS_OK) {
@@ -753,12 +706,22 @@ enum bt_component_status pretty_init(
 {
        enum bt_component_status ret;
        struct pretty_component *pretty = create_pretty();
+       void *priv_port;
 
        if (!pretty) {
                ret = BT_COMPONENT_STATUS_NOMEM;
                goto end;
        }
 
+       priv_port = bt_private_component_sink_add_input_private_port(component,
+               "in", NULL);
+       if (!priv_port) {
+               ret = BT_COMPONENT_STATUS_NOMEM;
+               goto end;
+       }
+
+       bt_put(priv_port);
+
        pretty->out = stdout;
        pretty->err = stderr;
 
@@ -774,7 +737,6 @@ enum bt_component_status pretty_init(
        }
 
        set_use_colors(pretty);
-
        ret = bt_private_component_set_user_data(component, pretty);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto error;