<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/24227">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move TBF list from BTS to the TRX structure<br><br>The TBFs are managed per TRX. Move the global list from BTS to TRX.<br><br>Related: OS#1541<br>Change-Id: Id3c59c11d57d765fe68aaebaac94290c0d84feb2<br>---<br>M src/bts.cpp<br>M src/bts.h<br>M src/gprs_rlcmac_sched.cpp<br>M src/pcu_vty_functions.cpp<br>M src/tbf.cpp<br>M src/tbf.h<br>M src/tbf_dl.cpp<br>M src/tbf_ul.cpp<br>M tests/alloc/AllocTest.cpp<br>M tests/ulc/PdchUlcTest.cpp<br>10 files changed, 41 insertions(+), 34 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/27/24227/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.cpp b/src/bts.cpp</span><br><span>index c84f5c4..6e84f01 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -263,9 +263,6 @@</span><br><span> bts->T_defs_bts = T_defs_bts;</span><br><span> osmo_tdefs_reset(bts->T_defs_bts);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&bts->ul_tbfs);</span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&bts->dl_tbfs);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* initialize back pointers */</span><br><span> for (size_t trx_no = 0; trx_no < ARRAY_SIZE(bts->trx); ++trx_no)</span><br><span> bts_trx_init(&bts->trx[trx_no], bts, trx_no);</span><br><span>@@ -1176,6 +1173,9 @@</span><br><span> trx->trx_no = trx_no;</span><br><span> trx->bts = bts;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&trx->ul_tbfs);</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&trx->dl_tbfs);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> for (size_t ts_no = 0; ts_no < ARRAY_SIZE(trx->pdch); ts_no++)</span><br><span> pdch_init(&trx->pdch[ts_no], trx, ts_no);</span><br><span> }</span><br><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index 11b5113..52c89b9 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -59,6 +59,11 @@</span><br><span> struct gprs_rlcmac_bts *bts;</span><br><span> uint8_t trx_no;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* list of uplink TBFs */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head ul_tbfs; /* list of gprs_rlcmac_tbf */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* list of downlink TBFs */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head dl_tbfs; /* list of gprs_rlcmac_tbf */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> };</span><br><span> </span><br><span> </span><br><span>@@ -254,11 +259,6 @@</span><br><span> struct osmo_stat_item_group *statg;</span><br><span> </span><br><span> struct GprsMsStorage *ms_store;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* list of uplink TBFs */</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head ul_tbfs; /* list of gprs_rlcmac_tbf */</span><br><span style="color: hsl(0, 100%, 40%);">- /* list of downlink TBFs */</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head dl_tbfs; /* list of gprs_rlcmac_tbf */</span><br><span> };</span><br><span> </span><br><span> #ifdef __cplusplus</span><br><span>diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp</span><br><span>index 0068eae..5751799 100644</span><br><span>--- a/src/gprs_rlcmac_sched.cpp</span><br><span>+++ b/src/gprs_rlcmac_sched.cpp</span><br><span>@@ -41,15 +41,14 @@</span><br><span> struct gprs_rlcmac_ul_tbf *ul_ack;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void get_ctrl_msg_tbf_candidates(const struct gprs_rlcmac_bts *bts,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gprs_rlcmac_pdch *pdch,</span><br><span style="color: hsl(120, 100%, 40%);">+static void get_ctrl_msg_tbf_candidates(const struct gprs_rlcmac_pdch *pdch,</span><br><span> struct tbf_sched_candidates *tbf_cand)</span><br><span> {</span><br><span> struct gprs_rlcmac_ul_tbf *ul_tbf;</span><br><span> struct gprs_rlcmac_dl_tbf *dl_tbf;</span><br><span> struct llist_item *pos;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(pos, &bts->ul_tbfs, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(pos, &pdch->trx->ul_tbfs, list) {</span><br><span> ul_tbf = as_ul_tbf((struct gprs_rlcmac_tbf *)pos->entry);</span><br><span> OSMO_ASSERT(ul_tbf);</span><br><span> /* this trx, this ts */</span><br><span>@@ -68,7 +67,7 @@</span><br><span> /* FIXME: Is this supposed to be fair? The last TBF for each wins? Maybe use llist_add_tail and skip once we have all</span><br><span> states? */</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(pos, &bts->dl_tbfs, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(pos, &pdch->trx->dl_tbfs, list) {</span><br><span> dl_tbf = as_dl_tbf((struct gprs_rlcmac_tbf *)pos->entry);</span><br><span> OSMO_ASSERT(dl_tbf);</span><br><span> /* this trx, this ts */</span><br><span>@@ -481,7 +480,7 @@</span><br><span> if (usf_tbf && req_mcs_kind == EGPRS && ms_mode(usf_tbf->ms()) != EGPRS)</span><br><span> req_mcs_kind = EGPRS_GMSK;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- get_ctrl_msg_tbf_candidates(bts, pdch, &tbf_cand);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_ctrl_msg_tbf_candidates(pdch, &tbf_cand);</span><br><span> </span><br><span> /* Prio 1: select control message */</span><br><span> if ((msg = sched_select_ctrl_msg(pdch, fn, block_nr, &tbf_cand))) {</span><br><span>diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp</span><br><span>index c2250d9..0b83a68 100644</span><br><span>--- a/src/pcu_vty_functions.cpp</span><br><span>+++ b/src/pcu_vty_functions.cpp</span><br><span>@@ -44,7 +44,7 @@</span><br><span> #include "coding_scheme.h"</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void tbf_print_vty_info(struct vty *vty, gprs_rlcmac_tbf *tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+static void tbf_print_vty_info(struct vty *vty, struct gprs_rlcmac_tbf *tbf)</span><br><span> {</span><br><span> gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf);</span><br><span> gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf);</span><br><span>@@ -104,20 +104,28 @@</span><br><span> int pcu_vty_show_tbf_all(struct vty *vty, struct gprs_rlcmac_bts *bts, uint32_t flags)</span><br><span> {</span><br><span> struct llist_item *iter;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gprs_rlcmac_trx *trx;</span><br><span> struct gprs_rlcmac_tbf *tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t trx_no;</span><br><span> </span><br><span> vty_out(vty, "UL TBFs%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(iter, &bts->ul_tbfs, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- tbf = (struct gprs_rlcmac_tbf *)iter->entry;</span><br><span style="color: hsl(0, 100%, 40%);">- if (tbf->state_flags & flags)</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_print_vty_info(vty, tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (trx_no = 0; trx_no < ARRAY_SIZE(bts->trx); trx_no++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ trx = &bts->trx[trx_no];</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(iter, &trx->ul_tbfs, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf = (struct gprs_rlcmac_tbf *)iter->entry;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tbf->state_flags & flags)</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_print_vty_info(vty, tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> vty_out(vty, "%sDL TBFs%s", VTY_NEWLINE, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(iter, &bts->dl_tbfs, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- tbf = (struct gprs_rlcmac_tbf *)iter->entry;</span><br><span style="color: hsl(0, 100%, 40%);">- if (tbf->state_flags & flags)</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_print_vty_info(vty, tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (trx_no = 0; trx_no < ARRAY_SIZE(bts->trx); trx_no++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ trx = &bts->trx[trx_no];</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(iter, &trx->dl_tbfs, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf = (struct gprs_rlcmac_tbf *)iter->entry;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tbf->state_flags & flags)</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_print_vty_info(vty, tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index adfda95..4dd74ec 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -293,7 +293,7 @@</span><br><span> tbf->stop_timers("freeing TBF");</span><br><span> /* TODO: Could/Should generate bssgp_tx_llc_discarded */</span><br><span> tbf_unlink_pdch(tbf);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(tbf_bts_list(tbf));</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(tbf_trx_list(tbf));</span><br><span> </span><br><span> if (tbf->ms())</span><br><span> tbf->set_ms(NULL);</span><br><span>@@ -1092,11 +1092,11 @@</span><br><span> </span><br><span> void gprs_rlcmac_tbf::rotate_in_list()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(tbf_bts_list((struct gprs_rlcmac_tbf *)this));</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(tbf_trx_list((struct gprs_rlcmac_tbf *)this));</span><br><span> if (direction == GPRS_RLCMAC_UL_TBF)</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add(tbf_bts_list((struct gprs_rlcmac_tbf *)this), &bts->ul_tbfs);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add(tbf_trx_list((struct gprs_rlcmac_tbf *)this), &trx->ul_tbfs);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add(tbf_bts_list((struct gprs_rlcmac_tbf *)this), &bts->dl_tbfs);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add(tbf_trx_list((struct gprs_rlcmac_tbf *)this), &trx->dl_tbfs);</span><br><span> }</span><br><span> </span><br><span> uint8_t gprs_rlcmac_tbf::tsc() const</span><br><span>@@ -1166,7 +1166,7 @@</span><br><span> return &tbf->m_ms_list.list;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct llist_head *tbf_bts_list(struct gprs_rlcmac_tbf *tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+struct llist_head *tbf_trx_list(struct gprs_rlcmac_tbf *tbf)</span><br><span> {</span><br><span> return &tbf->m_bts_list.list;</span><br><span> }</span><br><span>diff --git a/src/tbf.h b/src/tbf.h</span><br><span>index 17f5b18..a9c580c 100644</span><br><span>--- a/src/tbf.h</span><br><span>+++ b/src/tbf.h</span><br><span>@@ -183,7 +183,7 @@</span><br><span> enum gprs_rlcmac_tbf_direction tbf_direction(const struct gprs_rlcmac_tbf *tbf);</span><br><span> void tbf_set_ms(struct gprs_rlcmac_tbf *tbf, struct GprsMs *ms);</span><br><span> struct llist_head *tbf_ms_list(struct gprs_rlcmac_tbf *tbf);</span><br><span style="color: hsl(0, 100%, 40%);">-struct llist_head *tbf_bts_list(struct gprs_rlcmac_tbf *tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+struct llist_head *tbf_trx_list(struct gprs_rlcmac_tbf *tbf);</span><br><span> struct GprsMs *tbf_ms(const struct gprs_rlcmac_tbf *tbf);</span><br><span> bool tbf_timers_pending(struct gprs_rlcmac_tbf *tbf, enum tbf_timers t);</span><br><span> void tbf_free(struct gprs_rlcmac_tbf *tbf);</span><br><span>diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp</span><br><span>index 27dc4cf..45856e8 100644</span><br><span>--- a/src/tbf_dl.cpp</span><br><span>+++ b/src/tbf_dl.cpp</span><br><span>@@ -168,7 +168,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- llist_add(tbf_bts_list((struct gprs_rlcmac_tbf *)tbf), &bts->dl_tbfs);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add(tbf_trx_list((struct gprs_rlcmac_tbf *)tbf), &tbf->trx->dl_tbfs);</span><br><span> bts_do_rate_ctr_inc(tbf->bts, CTR_TBF_DL_ALLOCATED);</span><br><span> </span><br><span> osmo_clock_gettime(CLOCK_MONOTONIC, &tbf->m_bw.dl_bw_tv);</span><br><span>diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp</span><br><span>index 231ed06..4450684 100644</span><br><span>--- a/src/tbf_ul.cpp</span><br><span>+++ b/src/tbf_ul.cpp</span><br><span>@@ -134,7 +134,7 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- llist_add_tail(tbf_bts_list(tbf), &bts->ul_tbfs);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add_tail(tbf_trx_list(tbf), &tbf->trx->ul_tbfs);</span><br><span> bts_do_rate_ctr_inc(tbf->bts, CTR_TBF_UL_ALLOCATED);</span><br><span> </span><br><span> return tbf;</span><br><span>@@ -212,7 +212,7 @@</span><br><span> }</span><br><span> </span><br><span> ms_attach_tbf(ms, ul_tbf);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add(tbf_bts_list((struct gprs_rlcmac_tbf *)ul_tbf), &bts->ul_tbfs);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add(tbf_trx_list((struct gprs_rlcmac_tbf *)ul_tbf), &trx->ul_tbfs);</span><br><span> bts_do_rate_ctr_inc(ul_tbf->bts, CTR_TBF_UL_ALLOCATED);</span><br><span> TBF_SET_ASS_ON(ul_tbf, GPRS_RLCMAC_FLAG_PACCH, false);</span><br><span> TBF_SET_ASS_STATE_UL(ul_tbf, GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ);</span><br><span>diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp</span><br><span>index fe803e3..e3e9614 100644</span><br><span>--- a/tests/alloc/AllocTest.cpp</span><br><span>+++ b/tests/alloc/AllocTest.cpp</span><br><span>@@ -59,8 +59,8 @@</span><br><span> </span><br><span> struct gprs_rlcmac_tbf *tfi_usage[8][8][2][32] = {{{{NULL}}}};</span><br><span> struct llist_head *tbf_lists[2] = {</span><br><span style="color: hsl(0, 100%, 40%);">- &bts->ul_tbfs,</span><br><span style="color: hsl(0, 100%, 40%);">- &bts->dl_tbfs</span><br><span style="color: hsl(120, 100%, 40%);">+ &bts->trx[0].ul_tbfs,</span><br><span style="color: hsl(120, 100%, 40%);">+ &bts->trx[0].dl_tbfs</span><br><span> };</span><br><span> </span><br><span> struct llist_item *pos;</span><br><span>diff --git a/tests/ulc/PdchUlcTest.cpp b/tests/ulc/PdchUlcTest.cpp</span><br><span>index 84035d1..c980e33 100644</span><br><span>--- a/tests/ulc/PdchUlcTest.cpp</span><br><span>+++ b/tests/ulc/PdchUlcTest.cpp</span><br><span>@@ -160,6 +160,7 @@</span><br><span> int _alloc_algorithm_dummy(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf,</span><br><span> bool single, int8_t use_tbf)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->trx = &bts->trx[0];</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -174,7 +175,6 @@</span><br><span> struct gprs_rlcmac_bts *bts = bts_alloc(the_pcu, 0);</span><br><span> struct GprsMs *ms = ms_alloc(bts, 0x12345678);</span><br><span> struct gprs_rlcmac_tbf *tbf1 = tbf_alloc_dl_tbf(bts, ms, 0, true);</span><br><span style="color: hsl(0, 100%, 40%);">- tbf1->trx = &bts->trx[0];</span><br><span> struct gprs_rlcmac_pdch *pdch = &tbf1->trx->pdch[0];</span><br><span> int rc;</span><br><span> uint32_t fn, last_fn;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/24227">change 24227</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-pcu/+/24227"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id3c59c11d57d765fe68aaebaac94290c0d84feb2 </div>
<div style="display:none"> Gerrit-Change-Number: 24227 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>