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

ts_alloc: rename variable to clarify meaning 

The variable counts reserved slots, not available one. It can easily be
seen by checking function count_slots() documentation "Number of
reserved TS".

The previous naming was used probably to indicate "available to reserve"
TS, but the naming is misleading.

Change-Id: Ib58e87d5a067d20d0b331fe32dff61b95ecc3e3f
This commit is contained in:
Pau Espin 2021-11-09 17:35:30 +01:00
parent 978071bce9
commit 853cdf85eb
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gprs_rlcmac_ts_alloc.cpp
View File

@ -659,12 +659,12 @@ int find_multi_slots(struct gprs_rlcmac_trx *trx, uint8_t mslot_class, uint8_t *
* \param[in] slots Timeslots in use * \param[in] slots Timeslots in use
* \param[in] reserved_slots Reserved timeslots * \param[in] reserved_slots Reserved timeslots
* \param[out] slotcount Number of TS in use * \param[out] slotcount Number of TS in use
* \param[out] avail_count Number of reserved TS * \param[out] reserve_count Number of reserved TS
*/ */
static void count_slots(uint8_t slots, uint8_t reserved_slots, uint8_t *slotcount, uint8_t *avail_count) static void count_slots(uint8_t slots, uint8_t reserved_slots, uint8_t *slotcount, uint8_t *reserve_count)
{ {
(*slotcount) = pcu_bitcount(slots); (*slotcount) = pcu_bitcount(slots);
(*avail_count) = pcu_bitcount(reserved_slots); (*reserve_count) = pcu_bitcount(reserved_slots);
} }
/*! Return slot mask with single TS from a given UL/DL set according to TBF's direction, ts pointer is set to that TS /*! Return slot mask with single TS from a given UL/DL set according to TBF's direction, ts pointer is set to that TS
@ -867,7 +867,7 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf,
uint8_t reserved_ul_slots; uint8_t reserved_ul_slots;
int8_t first_common_ts; int8_t first_common_ts;
uint8_t slotcount = 0; uint8_t slotcount = 0;
uint8_t avail_count = 0, trx_no; uint8_t reserve_count = 0, trx_no;
int first_ts = -1; int first_ts = -1;
int usf[8] = {-1, -1, -1, -1, -1, -1, -1, -1}; int usf[8] = {-1, -1, -1, -1, -1, -1, -1, -1};
int rc; int rc;
@ -910,7 +910,7 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf,
/* Step 3b: Derive the slot set for a given direction */ /* Step 3b: Derive the slot set for a given direction */
if (tbf->direction == GPRS_RLCMAC_DL_TBF) { if (tbf->direction == GPRS_RLCMAC_DL_TBF) {
dl_slots = rc; dl_slots = rc;
count_slots(dl_slots, reserved_dl_slots, &slotcount, &avail_count); count_slots(dl_slots, reserved_dl_slots, &slotcount, &reserve_count);
} else { } else {
rc = allocate_usf(trx, rc, dl_slots, usf); rc = allocate_usf(trx, rc, dl_slots, usf);
if (rc < 0) if (rc < 0)
@ -919,7 +919,7 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf,
ul_slots = rc; ul_slots = rc;
reserved_ul_slots = ul_slots; reserved_ul_slots = ul_slots;
count_slots(ul_slots, reserved_ul_slots, &slotcount, &avail_count); count_slots(ul_slots, reserved_ul_slots, &slotcount, &reserve_count);
} }
first_ts = ffs(rc) - 1; first_ts = ffs(rc) - 1;
@ -936,7 +936,7 @@ int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf,
} }
if (single && slotcount) { if (single && slotcount) {
tbf->upgrade_to_multislot = (avail_count > slotcount); tbf->upgrade_to_multislot = (reserve_count > slotcount);
LOGPAL(tbf, "B", single, use_trx, LOGL_INFO, "using single slot at TS %d\n", first_ts); LOGPAL(tbf, "B", single, use_trx, LOGL_INFO, "using single slot at TS %d\n", first_ts);
} else { } else {
tbf->upgrade_to_multislot = false; tbf->upgrade_to_multislot = false;