libbsc/libmsc: convert old osmo counter into rate_ctrgs
rate counters support the export to statsd and can have a delta value.
Change-Id: Ie749cebd53a0bb618d0e23d375885712078bf8dd
diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c
index 74da1d7..d1041b3 100644
--- a/openbsc/src/libmsc/vty_interface_layer3.c
+++ b/openbsc/src/libmsc/vty_interface_layer3.c
@@ -795,34 +795,42 @@
openbsc_vty_print_statistics(vty, net);
vty_out(vty, "Location Update : %lu attach, %lu normal, %lu periodic%s",
- osmo_counter_get(net->stats.loc_upd_type.attach),
- osmo_counter_get(net->stats.loc_upd_type.normal),
- osmo_counter_get(net->stats.loc_upd_type.periodic), VTY_NEWLINE);
+ net->ratectrs->ctr[MSC_CTR_LOC_UPDATE_TYPE_ATTACH].current,
+ net->ratectrs->ctr[MSC_CTR_LOC_UPDATE_TYPE_NORMAL].current,
+ net->ratectrs->ctr[MSC_CTR_LOC_UPDATE_TYPE_PERIODIC].current,
+ VTY_NEWLINE);
vty_out(vty, "IMSI Detach Indications : %lu%s",
- osmo_counter_get(net->stats.loc_upd_type.detach), VTY_NEWLINE);
+ net->ratectrs->ctr[MSC_CTR_LOC_UPDATE_TYPE_DETACH].current,
+ VTY_NEWLINE);
vty_out(vty, "Location Update Response: %lu accept, %lu reject%s",
- osmo_counter_get(net->stats.loc_upd_resp.accept),
- osmo_counter_get(net->stats.loc_upd_resp.reject), VTY_NEWLINE);
+ net->ratectrs->ctr[MSC_CTR_LOC_UPDATE_RESP_ACCEPT].current,
+ net->ratectrs->ctr[MSC_CTR_LOC_UPDATE_RESP_REJECT].current,
+ VTY_NEWLINE);
vty_out(vty, "Handover : %lu attempted, %lu no_channel, %lu timeout, "
"%lu completed, %lu failed%s",
- osmo_counter_get(net->stats.handover.attempted),
- osmo_counter_get(net->stats.handover.no_channel),
- osmo_counter_get(net->stats.handover.timeout),
- osmo_counter_get(net->stats.handover.completed),
- osmo_counter_get(net->stats.handover.failed), VTY_NEWLINE);
+ net->ratectrs->ctr[MSC_CTR_HANDOVER_ATTEMPTED].current,
+ net->ratectrs->ctr[MSC_CTR_HANDOVER_NO_CHANNEL].current,
+ net->ratectrs->ctr[MSC_CTR_HANDOVER_TIMEOUT].current,
+ net->ratectrs->ctr[MSC_CTR_HANDOVER_COMPLETED].current,
+ net->ratectrs->ctr[MSC_CTR_HANDOVER_FAILED].current,
+ VTY_NEWLINE);
vty_out(vty, "SMS MO : %lu submitted, %lu no receiver%s",
- osmo_counter_get(net->stats.sms.submitted),
- osmo_counter_get(net->stats.sms.no_receiver), VTY_NEWLINE);
+ net->ratectrs->ctr[MSC_CTR_SMS_SUBMITTED].current,
+ net->ratectrs->ctr[MSC_CTR_SMS_NO_RECEIVER].current,
+ VTY_NEWLINE);
vty_out(vty, "SMS MT : %lu delivered, %lu no memory, %lu other error%s",
- osmo_counter_get(net->stats.sms.delivered),
- osmo_counter_get(net->stats.sms.rp_err_mem),
- osmo_counter_get(net->stats.sms.rp_err_other), VTY_NEWLINE);
+ net->ratectrs->ctr[MSC_CTR_SMS_DELIVERED].current,
+ net->ratectrs->ctr[MSC_CTR_SMS_RP_ERR_MEM].current,
+ net->ratectrs->ctr[MSC_CTR_SMS_RP_ERR_OTHER].current,
+ VTY_NEWLINE);
vty_out(vty, "MO Calls : %lu setup, %lu connect ack%s",
- osmo_counter_get(net->stats.call.mo_setup),
- osmo_counter_get(net->stats.call.mo_connect_ack), VTY_NEWLINE);
+ net->ratectrs->ctr[MSC_CTR_CALL_MO_SETUP].current,
+ net->ratectrs->ctr[MSC_CTR_CALL_MO_CONNECT_ACK].current,
+ VTY_NEWLINE);
vty_out(vty, "MT Calls : %lu setup, %lu connect%s",
- osmo_counter_get(net->stats.call.mt_setup),
- osmo_counter_get(net->stats.call.mt_connect), VTY_NEWLINE);
+ net->ratectrs->ctr[MSC_CTR_CALL_MT_SETUP].current,
+ net->ratectrs->ctr[MSC_CTR_CALL_MT_CONNECT].current,
+ VTY_NEWLINE);
return CMD_SUCCESS;
}