counter->count.packet_begin +
counter->count.packet_end +
counter->count.inactivity +
- counter->count.discarded_events +
- counter->count.discarded_packets +
counter->count.other;
}
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",
void destroy_private_counter_data(struct counter *counter)
{
- bt_put(counter->notif_iter);
+ bt_object_put_ref(counter->notif_iter);
g_free(counter);
}
counter = bt_private_component_get_user_data(component);
BT_ASSERT(counter);
try_print_last(counter);
- bt_put(counter->notif_iter);
+ bt_object_put_ref(counter->notif_iter);
g_free(counter);
}
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;
- (void) bt_value_integer_get(step, &val);
-
+ val = bt_value_integer_get(step);
if (val >= 0) {
counter->step = (uint64_t) val;
}
}
- 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;
- (void) bt_value_bool_get(hide_zero, &val);
+ val = bt_value_bool_get(hide_zero);
counter->hide_zero = (bool) val;
}
return ret;
}
-void counter_port_connected(
+enum bt_component_status counter_port_connected(
struct bt_private_component *component,
struct bt_private_port *self_port,
struct bt_port *other_port)
{
+ enum bt_component_status status = BT_COMPONENT_STATUS_OK;
struct counter *counter;
struct bt_notification_iterator *iterator;
struct bt_private_connection *connection;
conn_status = bt_private_connection_create_notification_iterator(
connection, &iterator);
if (conn_status != BT_CONNECTION_STATUS_OK) {
- counter->error = true;
+ status = BT_COMPONENT_STATUS_ERROR;
goto end;
}
- BT_MOVE(counter->notif_iter, iterator);
+ BT_OBJECT_MOVE_REF(counter->notif_iter, iterator);
end:
- bt_put(connection);
+ bt_object_put_ref(connection);
+ return status;
}
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;
counter = bt_private_component_get_user_data(component);
BT_ASSERT(counter);
- if (unlikely(counter->error)) {
- ret = BT_COMPONENT_STATUS_ERROR;
- goto end;
- }
-
if (unlikely(!counter->notif_iter)) {
try_print_last(counter);
ret = BT_COMPONENT_STATUS_END;
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++;
}
- bt_put(notif);
+ bt_object_put_ref(notif);
}
}
default: