Implement ctf.lttng-live component

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

diff --git a/plugins/text/pretty/pretty.c b/plugins/text/pretty/pretty.c
index 21272d41204ac92276e62543d9ff0bc67c9e435b..d7346de1ed92bd202dbd37a34c9ffa8ee39d3e0c 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",
@@ -129,8 +130,20 @@ enum bt_component_status handle_notification(struct pretty_component *pretty,
 
        assert(pretty);
 
-       if (bt_notification_get_type(notification) == BT_NOTIFICATION_TYPE_EVENT) {
+       switch (bt_notification_get_type(notification)) {
+       case BT_NOTIFICATION_TYPE_EVENT:
                ret = pretty_print_event(pretty, notification);
+               break;
+       case BT_NOTIFICATION_TYPE_INACTIVITY:
+               fprintf(stderr, "Inactivity notification\n");
+               break;
+       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
+       case BT_NOTIFICATION_TYPE_PACKET_END:
+       case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
+       case BT_NOTIFICATION_TYPE_STREAM_END:
+               break;
+       default:
+               fprintf(stderr, "Unhandled notification type\n");
        }
 
        return ret;
@@ -144,6 +157,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 +168,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;
@@ -179,20 +197,24 @@ enum bt_component_status pretty_consume(struct bt_private_component *component)
        it_ret = bt_notification_iterator_next(it);
 
        switch (it_ret) {
-       case BT_NOTIFICATION_ITERATOR_STATUS_ERROR:
-               ret = BT_COMPONENT_STATUS_ERROR;
-               goto end;
        case BT_NOTIFICATION_ITERATOR_STATUS_END:
                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);
+
 end:
        bt_put(notification);
        return ret;
@@ -222,7 +244,7 @@ end:
 }
 
 static
-bool check_param_exists(const char *key, struct bt_value *object, void *data)
+bt_bool check_param_exists(const char *key, struct bt_value *object, void *data)
 {
        struct pretty_component *pretty = data;
        struct bt_value *plugin_opt_map = pretty->plugin_opt_map;
@@ -231,7 +253,7 @@ bool check_param_exists(const char *key, struct bt_value *object, void *data)
                fprintf(pretty->err,
                        "[warning] Parameter \"%s\" unknown to \"text.pretty\" sink component\n", key);
        }
-       return true;
+       return BT_TRUE;
 }
 
 static
@@ -274,12 +296,13 @@ enum bt_component_status apply_one_bool(const char *key,
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
        struct bt_value *value = NULL;
        enum bt_value_status status;
+       bt_bool bool_val;
 
        value = bt_value_map_get(params, key);
        if (!value) {
                goto end;
        }
-       status = bt_value_bool_get(value, option);
+       status = bt_value_bool_get(value, &bool_val);
        switch (status) {
        case BT_VALUE_STATUS_OK:
                break;
@@ -287,6 +310,7 @@ enum bt_component_status apply_one_bool(const char *key,
                ret = BT_COMPONENT_STATUS_ERROR;
                goto end;
        }
+       *option = (bool) bool_val;
        if (found) {
                *found = true;
        }
@@ -380,9 +404,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;
        }
@@ -700,12 +722,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;
 
@@ -721,7 +753,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;