lib: simplify the public notification iterator interfaces

[babeltrace.git] / plugins / utils / counter / counter.c

diff --git a/plugins/utils/counter/counter.c b/plugins/utils/counter/counter.c
index a1c1cd4b314a3abe3f4be4929ee3f9b6b91a4f50..7ff3d33978759a7a058f607b801db529b91bbb5d 100644 (file)
--- a/plugins/utils/counter/counter.c
+++ b/plugins/utils/counter/counter.c
@@ -20,24 +20,11 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-component-sink.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/port.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/component-sink.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-discarded-events.h>
-#include <babeltrace/graph/notification-discarded-packets.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/common-internal.h>
-#include <babeltrace/values.h>
 #include <plugins-common.h>
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
 #include <inttypes.h>
 #include <stdint.h>
 
@@ -133,9 +120,9 @@ void counter_finalize(struct bt_private_component *component)
 {
        struct counter *counter;
 
-       assert(component);
+       BT_ASSERT(component);
        counter = bt_private_component_get_user_data(component);
-       assert(counter);
+       BT_ASSERT(counter);
        try_print_last(counter);
        bt_put(counter->notif_iter);
        g_free(counter);
@@ -162,24 +149,22 @@ enum bt_component_status counter_init(struct bt_private_component *component,
 
        counter->last_printed_total = -1ULL;
        counter->step = 1000;
-       step = bt_value_map_get(params, "step");
-       if (bt_value_is_integer(step)) {
+       step = bt_value_map_borrow(params, "step");
+       if (step && bt_value_is_integer(step)) {
                int64_t val;
-               int vret = bt_value_integer_get(step, &val);
 
-               assert(vret == 0);
+               (void) bt_value_integer_get(step, &val);
 
                if (val >= 0) {
                        counter->step = (uint64_t) val;
                }
        }
 
-       hide_zero = bt_value_map_get(params, "hide-zero");
-       if (bt_value_is_bool(hide_zero)) {
+       hide_zero = bt_value_map_borrow(params, "hide-zero");
+       if (hide_zero && bt_value_is_bool(hide_zero)) {
                bt_bool val;
-               int vret = bt_value_bool_get(hide_zero, &val);
 
-               assert(vret == 0);
+               (void) bt_value_bool_get(hide_zero, &val);
                counter->hide_zero = (bool) val;
        }
 
@@ -194,8 +179,6 @@ error:
        destroy_private_counter_data(counter);
 
 end:
-       bt_put(step);
-       bt_put(hide_zero);
        return ret;
 }
 
@@ -210,11 +193,11 @@ void counter_port_connected(
        enum bt_connection_status conn_status;
 
        counter = bt_private_component_get_user_data(component);
-       assert(counter);
+       BT_ASSERT(counter);
        connection = bt_private_port_get_private_connection(self_port);
-       assert(connection);
+       BT_ASSERT(connection);
        conn_status = bt_private_connection_create_notification_iterator(
-               connection, NULL, &iterator);
+               connection, &iterator);
        if (conn_status != BT_CONNECTION_STATUS_OK) {
                counter->error = true;
                goto end;
@@ -229,13 +212,13 @@ end:
 enum bt_component_status counter_consume(struct bt_private_component *component)
 {
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-       struct bt_notification *notif = NULL;
        struct counter *counter;
        enum bt_notification_iterator_status it_ret;
        int64_t count;
+       struct bt_notification *notif = NULL;
 
        counter = bt_private_component_get_user_data(component);
-       assert(counter);
+       BT_ASSERT(counter);
 
        if (unlikely(counter->error)) {
                ret = BT_COMPONENT_STATUS_ERROR;
@@ -249,7 +232,8 @@ enum bt_component_status counter_consume(struct bt_private_component *component)
        }
 
        /* Consume one notification  */
-       it_ret = bt_notification_iterator_next(counter->notif_iter);
+       it_ret = bt_private_connection_notification_iterator_next(
+               counter->notif_iter, &notif);
        if (it_ret < 0) {
                ret = BT_COMPONENT_STATUS_ERROR;
                goto end;
@@ -265,10 +249,7 @@ enum bt_component_status counter_consume(struct bt_private_component *component)
                goto end;
        case BT_NOTIFICATION_ITERATOR_STATUS_OK:
        {
-               struct bt_notification *notif =
-                       bt_notification_iterator_get_notification(counter->notif_iter);
-
-               assert(notif);
+               BT_ASSERT(notif);
                switch (bt_notification_get_type(notif)) {
                case BT_NOTIFICATION_TYPE_EVENT:
                        counter->count.event++;
@@ -307,8 +288,6 @@ enum bt_component_status counter_consume(struct bt_private_component *component)
                default:
                        counter->count.other++;
                }
-
-               bt_put(notif);
        }
        default:
                break;