From 308cb0719dca3ba8eed1eff2a2124d44f34d9a28 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Mon, 29 Aug 2016 18:45:42 +0200 Subject: bts: extend bts_chan_load to allow counting tch only Change-Id: I86f1d502649747b6b9aefcb39081b14110e8f494 --- openbsc/src/libbsc/bsc_ctrl_commands.c | 2 +- openbsc/src/libbsc/bsc_vty.c | 2 +- openbsc/src/libbsc/chan_alloc.c | 29 ++++++++++++++++++++++++++--- openbsc/src/libbsc/paging.c | 2 +- 4 files changed, 29 insertions(+), 6 deletions(-) (limited to 'openbsc/src/libbsc') diff --git a/openbsc/src/libbsc/bsc_ctrl_commands.c b/openbsc/src/libbsc/bsc_ctrl_commands.c index 7e8479734..3f4fee2a3 100644 --- a/openbsc/src/libbsc/bsc_ctrl_commands.c +++ b/openbsc/src/libbsc/bsc_ctrl_commands.c @@ -239,7 +239,7 @@ static int get_bts_chan_load(struct ctrl_cmd *cmd, void *data) bts = cmd->node; memset(&pl, 0, sizeof(pl)); - bts_chan_load(&pl, bts); + bts_chan_load(&pl, bts, 0); cmd->reply = talloc_strdup(cmd, ""); diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c index 5c95e85cf..01eec2331 100644 --- a/openbsc/src/libbsc/bsc_vty.c +++ b/openbsc/src/libbsc/bsc_vty.c @@ -329,7 +329,7 @@ static void bts_dump_vty(struct vty *vty, struct gsm_bts *bts) /* FIXME: chan_desc */ memset(&pl, 0, sizeof(pl)); - bts_chan_load(&pl, bts); + bts_chan_load(&pl, bts, 0); vty_out(vty, " Current Channel Load:%s", VTY_NEWLINE); dump_pchan_load_vty(vty, " ", &pl); } diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c index 7b0c3e67d..03d44e01f 100644 --- a/openbsc/src/libbsc/chan_alloc.c +++ b/openbsc/src/libbsc/chan_alloc.c @@ -514,7 +514,28 @@ struct gsm_subscriber_connection *connection_for_subscr(struct gsm_subscriber *s return NULL; } -void bts_chan_load(struct pchan_load *cl, const struct gsm_bts *bts) +static int chan_is_tch(struct gsm_bts_trx_ts *ts) +{ + switch (ts->pchan) { + case GSM_PCHAN_TCH_F: + case GSM_PCHAN_TCH_H: + return 1; + case GSM_PCHAN_TCH_F_PDCH: + case GSM_PCHAN_TCH_F_TCH_H_PDCH: + if (ts->dyn.pchan_is == GSM_PCHAN_TCH_F || + ts->dyn.pchan_is == GSM_PCHAN_TCH_H) + return 1; + else + return 0; + default: + return 0; + } +} + + + +void bts_chan_load(struct pchan_load *cl, const struct gsm_bts *bts, + int only_count_tch) { struct gsm_bts_trx *trx; @@ -536,6 +557,9 @@ void bts_chan_load(struct pchan_load *cl, const struct gsm_bts *bts) if (!nm_is_running(&ts->mo.nm_state)) continue; + if (only_count_tch && !chan_is_tch(ts)) + continue; + subslots = ts_subslots(ts); for (j = 0; j < subslots; j++) { struct gsm_lchan *lchan = &ts->lchan[j]; @@ -561,6 +585,5 @@ void network_chan_load(struct pchan_load *pl, struct gsm_network *net) memset(pl, 0, sizeof(*pl)); llist_for_each_entry(bts, &net->bts_list, list) - bts_chan_load(pl, bts); + bts_chan_load(pl, bts, 0); } - diff --git a/openbsc/src/libbsc/paging.c b/openbsc/src/libbsc/paging.c index fcb4debd9..e3795b305 100644 --- a/openbsc/src/libbsc/paging.c +++ b/openbsc/src/libbsc/paging.c @@ -119,7 +119,7 @@ static int can_send_pag_req(struct gsm_bts *bts, int rsl_type) int count; memset(&pl, 0, sizeof(pl)); - bts_chan_load(&pl, bts); + bts_chan_load(&pl, bts, 0); switch (rsl_type) { case RSL_CHANNEED_TCH_F: -- cgit v1.2.3