cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

ctrs: Correctly count load total for dynamic timeslots. 

From the CS perspective, there is no difference whether this is
a dynamic TS in NONE/PDCH mode or a static TCH in UNUSED mode since
BSC can switch into USED mode at any moment. So we should count
dynamic timeslots in the "total" count.

A bit of a challenge here is that GSM_PCHAN_TCH_F_TCH_H_PDCH
timeslots could be either switched to a single TCH/F or to
two TCH/H, so the total can't be calculated reliably beforehand.
In this code we assume TCH/F since this gives a lower total
count.

Change-Id: Iabd70e8adbf15eb3b7a7be597281ea99b352317b
This commit is contained in:
Alexander Chemeris 2020-05-06 02:25:21 +03:00 committed by ipse
parent b405e6e315
commit 241f058aeb
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/osmo-bsc/chan_alloc.c
View File

@ -58,6 +58,28 @@ void bts_chan_load(struct pchan_load *cl, const struct gsm_bts *bts)
if (!nm_is_running(&ts->mo.nm_state))
continue;
/* Dynamic timeslots have to be counted separately
* when not in TCH/F or TCH/H mode because they don't
* have an lchan's allocated to them. At the same time,
* dynamic timeslots in NONE and PDCH modes are same
* as in UNUSED mode from the CS channel load perspective
* beause they can be switched to TCH mode at any moment.
* I.e. they are "available" for TCH. */
if ((ts->pchan_on_init == GSM_PCHAN_TCH_F_TCH_H_PDCH ||
ts->pchan_on_init == GSM_PCHAN_TCH_F_PDCH) &&
(ts->pchan_is == GSM_PCHAN_NONE ||
ts->pchan_is == GSM_PCHAN_PDCH)) {
pl->total++;
}
/* Count allocated logical channels.
* Note: A GSM_PCHAN_TCH_F_TCH_H_PDCH can be switched
* to a single TCH/F or to two TCH/H. So when it's in
* the TCH/H mode, total number of available channels
* is 1 more than when it's in the TCH/F mode.
* I.e. "total" count will fluctuate depending on
* whether GSM_PCHAN_TCH_F_TCH_H_PDCH timeslot is
* in TCH/F or TCH/H (or in NONE/PDCH) mode. */
ts_for_each_lchan(lchan, ts) {
/* don't even count CBCH slots in total */
if (lchan->type == GSM_LCHAN_CBCH)