Subscribe to notifications when creating a notif. iterator

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

diff --git a/plugins/text/pretty/pretty.c b/plugins/text/pretty/pretty.c
index 88fc521d60cd3562d054687721cfefaca6cc7b0a..043ba4fc5d265a5123a269fdedc6a81b0fc4a9cb 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,7 +53,7 @@
 static
 const char *plugin_options[] = {
        "color",
-       "output-path",
+       "path",
        "no-delta",
        "clock-cycles",
        "clock-seconds",
@@ -144,6 +145,10 @@ void pretty_port_connected(
 {
        struct bt_private_connection *connection;
        struct pretty_component *pretty;
+       static const enum bt_notification_type notif_types[] = {
+               BT_NOTIFICATION_TYPE_EVENT,
+               BT_NOTIFICATION_TYPE_SENTINEL,
+       };
 
        pretty = bt_private_component_get_user_data(component);
        assert(pretty);
@@ -151,7 +156,8 @@ void pretty_port_connected(
        connection = bt_private_port_get_private_connection(self_port);
        assert(connection);
        pretty->input_iterator =
-               bt_private_connection_create_notification_iterator(connection);
+               bt_private_connection_create_notification_iterator(connection,
+                       notif_types);
 
        if (!pretty->input_iterator) {
                pretty->error = true;
@@ -387,9 +393,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;
        }
@@ -707,12 +711,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;
 
@@ -728,7 +742,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;