lib: rename "notification" -> "message"

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

diff --git a/plugins/text/pretty/pretty.c b/plugins/text/pretty/pretty.c
index 2b83b1def33d8b890249014805902385e6531e06..abf14ecc7bd1b20d2f2b4ef42d4db8269e59ce10 100644 (file)
--- a/plugins/text/pretty/pretty.c
+++ b/plugins/text/pretty/pretty.c
@@ -24,7 +24,6 @@
  */
 
 #include <babeltrace/babeltrace.h>
-#include <babeltrace/values.h>
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/common-internal.h>
 #include <plugins-common.h>
@@ -66,7 +65,7 @@ const char *plugin_options[] = {
 static
 void destroy_pretty_data(struct pretty_component *pretty)
 {
-       bt_object_put_ref(pretty->iterator);
+       bt_self_component_port_input_message_iterator_put_ref(pretty->iterator);
 
        if (pretty->string) {
                (void) g_string_free(pretty->string, TRUE);
@@ -114,7 +113,7 @@ error:
 }
 
 BT_HIDDEN
-void pretty_finalize(struct bt_self_component_sink *comp)
+void pretty_finalize(bt_self_component_sink *comp)
 {
        destroy_pretty_data(
                bt_self_component_get_data(
@@ -122,27 +121,27 @@ void pretty_finalize(struct bt_self_component_sink *comp)
 }
 
 static
-enum bt_self_component_status handle_notification(
+enum bt_self_component_status handle_message(
                struct pretty_component *pretty,
-               struct bt_notification *notification)
+               const bt_message *message)
 {
        enum bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
 
        BT_ASSERT(pretty);
 
-       switch (bt_notification_get_type(notification)) {
-       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
-               if (pretty_print_packet(pretty, notification)) {
+       switch (bt_message_get_type(message)) {
+       case BT_MESSAGE_TYPE_PACKET_BEGINNING:
+               if (pretty_print_packet(pretty, message)) {
                        ret = BT_SELF_COMPONENT_STATUS_ERROR;
                }
                break;
-       case BT_NOTIFICATION_TYPE_EVENT:
-               if (pretty_print_event(pretty, notification)) {
+       case BT_MESSAGE_TYPE_EVENT:
+               if (pretty_print_event(pretty, message)) {
                        ret = BT_SELF_COMPONENT_STATUS_ERROR;
                }
                break;
-       case BT_NOTIFICATION_TYPE_INACTIVITY:
-               fprintf(stderr, "Inactivity notification\n");
+       case BT_MESSAGE_TYPE_INACTIVITY:
+               fprintf(stderr, "Inactivity message\n");
                break;
        default:
                break;
@@ -153,9 +152,9 @@ enum bt_self_component_status handle_notification(
 
 BT_HIDDEN
 enum bt_self_component_status pretty_port_connected(
-               struct bt_self_component_sink *comp,
-               struct bt_self_component_port_input *self_port,
-               struct bt_port_output *other_port)
+               bt_self_component_sink *comp,
+               bt_self_component_port_input *self_port,
+               const bt_port_output *other_port)
 {
        enum bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
        struct pretty_component *pretty;
@@ -164,7 +163,7 @@ enum bt_self_component_status pretty_port_connected(
                        bt_self_component_sink_as_self_component(comp));
        BT_ASSERT(pretty);
        BT_ASSERT(!pretty->iterator);
-       pretty->iterator = bt_self_component_port_input_notification_iterator_create(
+       pretty->iterator = bt_self_component_port_input_message_iterator_create(
                self_port);
        if (!pretty->iterator) {
                status = BT_SELF_COMPONENT_STATUS_NOMEM;
@@ -175,60 +174,61 @@ enum bt_self_component_status pretty_port_connected(
 
 BT_HIDDEN
 enum bt_self_component_status pretty_consume(
-               struct bt_self_component_sink *comp)
+               bt_self_component_sink *comp)
 {
        enum bt_self_component_status ret;
-       bt_notification_array notifs;
-       struct bt_self_component_port_input_notification_iterator *it;
+       bt_message_array_const msgs;
+       bt_self_component_port_input_message_iterator *it;
        struct pretty_component *pretty = bt_self_component_get_data(
                bt_self_component_sink_as_self_component(comp));
-       enum bt_notification_iterator_status it_ret;
+       enum bt_message_iterator_status it_ret;
        uint64_t count = 0;
        uint64_t i = 0;
 
        it = pretty->iterator;
-       it_ret = bt_self_component_port_input_notification_iterator_next(it,
-               &notifs, &count);
+       it_ret = bt_self_component_port_input_message_iterator_next(it,
+               &msgs, &count);
 
        switch (it_ret) {
-       case BT_NOTIFICATION_ITERATOR_STATUS_OK:
+       case BT_MESSAGE_ITERATOR_STATUS_OK:
                break;
-       case BT_NOTIFICATION_ITERATOR_STATUS_NOMEM:
+       case BT_MESSAGE_ITERATOR_STATUS_NOMEM:
                ret = BT_SELF_COMPONENT_STATUS_NOMEM;
                goto end;
-       case BT_NOTIFICATION_ITERATOR_STATUS_AGAIN:
+       case BT_MESSAGE_ITERATOR_STATUS_AGAIN:
                ret = BT_SELF_COMPONENT_STATUS_AGAIN;
                goto end;
-       case BT_NOTIFICATION_ITERATOR_STATUS_END:
+       case BT_MESSAGE_ITERATOR_STATUS_END:
                ret = BT_SELF_COMPONENT_STATUS_END;
-               BT_OBJECT_PUT_REF_AND_RESET(pretty->iterator);
+               BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_PUT_REF_AND_RESET(
+                       pretty->iterator);
                goto end;
        default:
                ret = BT_SELF_COMPONENT_STATUS_ERROR;
                goto end;
        }
 
-       BT_ASSERT(it_ret == BT_NOTIFICATION_ITERATOR_STATUS_OK);
+       BT_ASSERT(it_ret == BT_MESSAGE_ITERATOR_STATUS_OK);
 
        for (i = 0; i < count; i++) {
-               ret = handle_notification(pretty, notifs[i]);
+               ret = handle_message(pretty, msgs[i]);
                if (ret) {
                        goto end;
                }
 
-               bt_object_put_ref(notifs[i]);
+               bt_message_put_ref(msgs[i]);
        }
 
 end:
        for (; i < count; i++) {
-               bt_object_put_ref(notifs[i]);
+               bt_message_put_ref(msgs[i]);
        }
 
        return ret;
 }
 
 static
-int add_params_to_map(struct bt_private_value *plugin_opt_map)
+int add_params_to_map(bt_value *plugin_opt_map)
 {
        int ret = 0;
        unsigned int i;
@@ -237,7 +237,7 @@ int add_params_to_map(struct bt_private_value *plugin_opt_map)
                const char *key = plugin_options[i];
                enum bt_value_status status;
 
-               status = bt_private_value_map_insert_entry(plugin_opt_map, key,
+               status = bt_value_map_insert_entry(plugin_opt_map, key,
                        bt_value_null);
                switch (status) {
                case BT_VALUE_STATUS_OK:
@@ -252,13 +252,13 @@ end:
 }
 
 static
-bt_bool check_param_exists(const char *key, struct bt_value *object, void *data)
+bt_bool check_param_exists(const char *key, const bt_value *object,
+               void *data)
 {
        struct pretty_component *pretty = data;
 
-       if (!bt_value_map_has_entry(
-                       bt_private_value_as_value(pretty->plugin_opt_map),
-                       key)) {
+       if (!bt_value_map_has_entry(pretty->plugin_opt_map,
+                                   key)) {
                fprintf(pretty->err,
                        "[warning] Parameter \"%s\" unknown to \"text.pretty\" sink component\n", key);
        }
@@ -266,12 +266,12 @@ bt_bool check_param_exists(const char *key, struct bt_value *object, void *data)
 }
 
 static
-void apply_one_string(const char *key, struct bt_value *params, char **option)
+void apply_one_string(const char *key, const bt_value *params, char **option)
 {
-       struct bt_value *value = NULL;
+       const bt_value *value = NULL;
        const char *str;
 
-       value = bt_value_map_borrow_entry_value(params, key);
+       value = bt_value_map_borrow_entry_value_const(params, key);
        if (!value) {
                goto end;
        }
@@ -286,13 +286,13 @@ end:
 }
 
 static
-void apply_one_bool(const char *key, struct bt_value *params, bool *option,
+void apply_one_bool(const char *key, const bt_value *params, bool *option,
                bool *found)
 {
-       struct bt_value *value = NULL;
+       const bt_value *value = NULL;
        bt_bool bool_val;
 
-       value = bt_value_map_borrow_entry_value(params, key);
+       value = bt_value_map_borrow_entry_value_const(params, key);
        if (!value) {
                goto end;
        }
@@ -337,14 +337,14 @@ end:
 }
 
 static
-int apply_params(struct pretty_component *pretty, struct bt_value *params)
+int apply_params(struct pretty_component *pretty, const bt_value *params)
 {
        int ret = 0;
        enum bt_value_status status;
        bool value, found;
        char *str = NULL;
 
-       pretty->plugin_opt_map = bt_private_value_map_create();
+       pretty->plugin_opt_map = bt_value_map_create();
        if (!pretty->plugin_opt_map) {
                ret = -1;
                goto end;
@@ -354,7 +354,8 @@ int apply_params(struct pretty_component *pretty, struct bt_value *params)
                goto end;
        }
        /* Report unknown parameters. */
-       status = bt_value_map_foreach_entry(params, check_param_exists, pretty);
+       status = bt_value_map_foreach_entry_const(params,
+               check_param_exists, pretty);
        switch (status) {
        case BT_VALUE_STATUS_OK:
                break;
@@ -365,10 +366,11 @@ int apply_params(struct pretty_component *pretty, struct bt_value *params)
        /* Known parameters. */
        pretty->options.color = PRETTY_COLOR_OPT_AUTO;
        if (bt_value_map_has_entry(params, "color")) {
-               struct bt_value *color_value;
+               const bt_value *color_value;
                const char *color;
 
-               color_value = bt_value_map_borrow_entry_value(params, "color");
+               color_value = bt_value_map_borrow_entry_value_const(params,
+                       "color");
                if (!color_value) {
                        goto end;
                }
@@ -591,7 +593,7 @@ int apply_params(struct pretty_component *pretty, struct bt_value *params)
        }
 
 end:
-       bt_object_put_ref(pretty->plugin_opt_map);
+       bt_value_put_ref(pretty->plugin_opt_map);
        pretty->plugin_opt_map = NULL;
        g_free(str);
        return ret;
@@ -635,8 +637,8 @@ void init_stream_packet_context_quarks(void)
 
 BT_HIDDEN
 enum bt_self_component_status pretty_init(
-               struct bt_self_component_sink *comp,
-               struct bt_value *params,
+               bt_self_component_sink *comp,
+               const bt_value *params,
                UNUSED_VAR void *init_method_data)
 {
        enum bt_self_component_status ret;