Values API: standardize function names

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

diff --git a/plugins/utils/counter/counter.c b/plugins/utils/counter/counter.c
index bb53a41f12ccb40461818607309b285e237a647b..353c0f602f65fcc9a71da9fdf1363e85367d5879 100644 (file)
--- a/plugins/utils/counter/counter.c
+++ b/plugins/utils/counter/counter.c
@@ -48,8 +48,6 @@ uint64_t get_total_count(struct counter *counter)
                counter->count.packet_begin +
                counter->count.packet_end +
                counter->count.inactivity +
-               counter->count.discarded_events +
-               counter->count.discarded_packets +
                counter->count.other;
 }
 
@@ -64,14 +62,6 @@ void print_count(struct counter *counter)
        PRINTF_COUNT("packet beginning", "packet beginnings", packet_begin);
        PRINTF_COUNT("packet end", "packet ends", packet_end);
        PRINTF_COUNT("inactivity", "inactivities", inactivity);
-       PRINTF_COUNT("discarded events notification",
-               "discarded events notifications", discarded_events_notifs);
-       PRINTF_COUNT("  known discarded event", "  known discarded events",
-               discarded_events);
-       PRINTF_COUNT("discarded packets notification",
-               "discarded packets notifications", discarded_packets_notifs);
-       PRINTF_COUNT("  known discarded packet", "  known discarded packets",
-               discarded_packets);
 
        if (counter->count.other > 0) {
                PRINTF_COUNT("  other (unknown) notification",
@@ -150,7 +140,7 @@ enum bt_component_status counter_init(struct bt_private_component *component,
 
        counter->last_printed_total = -1ULL;
        counter->step = 1000;
-       step = bt_value_map_borrow(params, "step");
+       step = bt_value_map_borrow_entry_value(params, "step");
        if (step && bt_value_is_integer(step)) {
                int64_t val;
 
@@ -161,7 +151,7 @@ enum bt_component_status counter_init(struct bt_private_component *component,
                }
        }
 
-       hide_zero = bt_value_map_borrow(params, "hide-zero");
+       hide_zero = bt_value_map_borrow_entry_value(params, "hide-zero");
        if (hide_zero && bt_value_is_bool(hide_zero)) {
                bt_bool val;
 
@@ -217,7 +207,6 @@ enum bt_component_status counter_consume(struct bt_private_component *component)
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
        struct counter *counter;
        enum bt_notification_iterator_status it_ret;
-       int64_t count;
        uint64_t notif_count;
        bt_notification_array notifs;
 
@@ -273,22 +262,6 @@ enum bt_component_status counter_consume(struct bt_private_component *component)
                        case BT_NOTIFICATION_TYPE_PACKET_END:
                                counter->count.packet_end++;
                                break;
-                       case BT_NOTIFICATION_TYPE_DISCARDED_EVENTS:
-                               counter->count.discarded_events_notifs++;
-                               count = bt_notification_discarded_events_get_count(
-                                       notif);
-                               if (count >= 0) {
-                                       counter->count.discarded_events += count;
-                               }
-                               break;
-                       case BT_NOTIFICATION_TYPE_DISCARDED_PACKETS:
-                               counter->count.discarded_packets_notifs++;
-                               count = bt_notification_discarded_packets_get_count(
-                                       notif);
-                               if (count >= 0) {
-                                       counter->count.discarded_packets += count;
-                               }
-                               break;
                        default:
                                counter->count.other++;
                        }