diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-02-26 08:49:59 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-02-26 13:48:11 +0100 |
| commit | 49a8969bd6ff2cf89984a101677c5f09191a48ea (patch) | |
| tree | e1bbcdde091c976ed511dc24ee7e175512875343 | |
| parent | de3b4a248e46b5bed1cce20774dceafc74c74073 (diff) | |
counters: split rach:sent into rach:drop, rach:ho, rach:cs and rach:ps
Change-Id: I51e9938df0e05b8fdb12686b9a9bb6994546deed
| -rw-r--r-- | include/osmo-bts/bts.h | 5 | ||||
| -rw-r--r-- | src/common/bts.c | 5 | ||||
| -rw-r--r-- | src/common/l1sap.c | 8 |
3 files changed, 14 insertions, 4 deletions
diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 76f8ba51..34ba9568 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -15,7 +15,10 @@ enum { BTS_CTR_PAGING_DROP, BTS_CTR_PAGING_SENT, BTS_CTR_RACH_RCVD, - BTS_CTR_RACH_SENT, + BTS_CTR_RACH_DROP, + BTS_CTR_RACH_HO, + BTS_CTR_RACH_CS, + BTS_CTR_RACH_PS, BTS_CTR_AGCH_RCVD, BTS_CTR_AGCH_SENT, BTS_CTR_AGCH_DELETED, diff --git a/src/common/bts.c b/src/common/bts.c index 60a309e2..b10d7f21 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -87,7 +87,10 @@ static const struct rate_ctr_desc bts_ctr_desc[] = { [BTS_CTR_PAGING_SENT] = {"paging:sent", "Sent paging requests (Um)"}, [BTS_CTR_RACH_RCVD] = {"rach:rcvd", "Received RACH requests (Um)"}, - [BTS_CTR_RACH_SENT] = {"rach:sent", "Sent RACH requests (Abis)"}, + [BTS_CTR_RACH_DROP] = {"rach:drop", "Dropped RACH requests (Um)"}, + [BTS_CTR_RACH_HO] = {"rach:handover", "Received RACH requests (Handover)"}, + [BTS_CTR_RACH_CS] = {"rach:cs", "Received RACH requests (CS/Abis)"}, + [BTS_CTR_RACH_PS] = {"rach:ps", "Received RACH requests (PS/PCU)"}, [BTS_CTR_AGCH_RCVD] = {"agch:rcvd", "Received AGCH requests (Abis)"}, [BTS_CTR_AGCH_SENT] = {"agch:sent", "Sent AGCH requests (Abis)"}, diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 88d5a345..2623d84a 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1198,6 +1198,7 @@ static int l1sap_ph_rach_ind(struct gsm_bts_trx *trx, if (!check_acc_delay(rach_ind, btsb, &acc_delay)) { LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "ignoring RACH request %u > max_ta(%u)\n", acc_delay, btsb->max_ta); + rate_ctr_inc2(trx->bts->ctrs, BTS_CTR_RACH_DROP); return 0; } @@ -1205,12 +1206,15 @@ static int l1sap_ph_rach_ind(struct gsm_bts_trx *trx, set_ms_to_data(get_lchan_by_chan_nr(trx, rach_ind->chan_nr), acc_delay, false); /* check for handover rach */ - if (!L1SAP_IS_CHAN_RACH(rach_ind->chan_nr)) + if (!L1SAP_IS_CHAN_RACH(rach_ind->chan_nr)) { + rate_ctr_inc2(trx->bts->ctrs, BTS_CTR_RACH_HO); return l1sap_handover_rach(trx, l1sap, rach_ind); + } /* check for packet access */ if ((trx == bts->c0 && L1SAP_IS_PACKET_RACH(rach_ind->ra)) || (trx == bts->c0 && rach_ind->is_11bit)) { + rate_ctr_inc2(trx->bts->ctrs, BTS_CTR_RACH_PS); LOGPFN(DL1P, LOGL_INFO, rach_ind->fn, "RACH for packet access (toa=%d, ra=%d)\n", rach_ind->acc_delay, rach_ind->ra); @@ -1223,7 +1227,7 @@ static int l1sap_ph_rach_ind(struct gsm_bts_trx *trx, LOGPFN(DL1P, LOGL_INFO, rach_ind->fn, "RACH for RR access (toa=%d, ra=%d)\n", rach_ind->acc_delay, rach_ind->ra); - rate_ctr_inc2(trx->bts->ctrs, BTS_CTR_RACH_SENT); + rate_ctr_inc2(trx->bts->ctrs, BTS_CTR_RACH_CS); lapdm_phsap_up(&l1sap->oph, &lc->lapdm_dcch); return 0; |