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

paging: constify bts param in some functions 

Related: libosmocore.git Change-Id Ib11bfe57f546a5618f70152b9b75115808e54bf6
Change-Id: Icb85fecba142151b05f289adae8894cd50396224
This commit is contained in:
Pau Espin 2022-11-24 17:05:53 +01:00
parent 94951af66a
commit 934a9b06c7
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osmocom/bsc/paging.h
View File

@ -135,12 +135,12 @@ void paging_request_cancel(struct bsc_subscr *bsub, enum bsc_paging_reason reaso
void paging_update_buffer_space(struct gsm_bts *bts, uint16_t);
/* pending paging requests */
unsigned int paging_pending_requests_nr(struct gsm_bts *bts);
unsigned int paging_pending_requests_nr(const struct gsm_bts *bts);
void paging_flush_bts(struct gsm_bts *bts, struct bsc_msc_data *msc);
void paging_flush_network(struct gsm_network *net, struct bsc_msc_data *msc);
uint16_t paging_estimate_available_slots(struct gsm_bts *bts, unsigned int time_span_s);
uint16_t paging_estimate_available_slots(const struct gsm_bts *bts, unsigned int time_span_s);
int bsc_paging_start(struct bsc_paging_params *params);
#endif

18
src/osmo-bsc/paging.c
View File

@ -626,7 +626,7 @@ void paging_update_buffer_space(struct gsm_bts *bts, uint16_t free_slots)
}
/*! Count the number of pending paging requests on given BTS */
unsigned int paging_pending_requests_nr(struct gsm_bts *bts)
unsigned int paging_pending_requests_nr(const struct gsm_bts *bts)
{
return bts->paging.pending_requests_len;
}
@ -658,10 +658,18 @@ void paging_flush_network(struct gsm_network *net, struct bsc_msc_data *msc)
paging_flush_bts(bts, msc);
}
/*! Estimate available_slots credit over a time period, used when below CCCH Load Indication Threshold */
uint16_t paging_estimate_available_slots(struct gsm_bts *bts, unsigned int time_span_s)
/* Shim to avoid problems when compiling against libosmocore <= 1.7.0, since
* gsm0502_get_n_pag_blocks() was not declared const despite being readonly. Once
* osmo-bsc depends on libosmocore > 1.7.0, this shim can be dropped. */
static inline unsigned int _gsm0502_get_n_pag_blocks(const struct gsm48_control_channel_descr *chan_desc)
{
unsigned int n_pag_blocks = gsm0502_get_n_pag_blocks(&bts->si_common.chan_desc);
return gsm0502_get_n_pag_blocks((struct gsm48_control_channel_descr *)chan_desc);
}
/*! Estimate available_slots credit over a time period, used when below CCCH Load Indication Threshold */
uint16_t paging_estimate_available_slots(const struct gsm_bts *bts, unsigned int time_span_s)
{
unsigned int n_pag_blocks = _gsm0502_get_n_pag_blocks(&bts->si_common.chan_desc);
uint16_t available_slots = n_pag_blocks * time_span_s * 1000000 / GSM51_MFRAME_DURATION_us;
LOG_BTS(bts, DPAG, LOGL_DEBUG, "Estimated %u paging available_slots over %u seconds\n",
available_slots, time_span_s);
@ -676,7 +684,7 @@ static unsigned int paging_estimate_delay_us(struct gsm_bts *bts, unsigned int n
{
unsigned int n_pag_blocks, n_mframes, time_us = 0;
n_pag_blocks = gsm0502_get_n_pag_blocks(&bts->si_common.chan_desc);
n_pag_blocks = _gsm0502_get_n_pag_blocks(&bts->si_common.chan_desc);
/* First of all, we need to extend the timeout in relation to the amount
* of paging requests in the BSC queue. In here we don't care about the