<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25815">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ts_alloc: Rename s/tbf_/tbf/<br><br>My the top of my head: The tbf_ was kept during a previous refactoring<br>a while ago to avoid changing lots of more lines in the same patch.<br><br>Change-Id: I8ae689a272b7c4d244576ff157f6019a87041abc<br>---<br>M src/gprs_rlcmac_ts_alloc.cpp<br>1 file changed, 24 insertions(+), 26 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/15/25815/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp</span><br><span>index 3c16d8a..5b3b355 100644</span><br><span>--- a/src/gprs_rlcmac_ts_alloc.cpp</span><br><span>+++ b/src/gprs_rlcmac_ts_alloc.cpp</span><br><span>@@ -338,12 +338,12 @@</span><br><span> * Assign single slot for uplink and downlink</span><br><span> *</span><br><span> * \param[in,out] bts Pointer to BTS struct</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in,out] tbf_ Pointer to TBF struct</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in,out] tbf Pointer to TBF struct</span><br><span> * \param[in] single flag indicating if we should force single-slot allocation</span><br><span> * \param[in] use_trx which TRX to use or -1 if it should be selected during allocation</span><br><span> * \returns negative error code or 0 on success</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf_, bool single,</span><br><span style="color: hsl(120, 100%, 40%);">+int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, bool single,</span><br><span> int8_t use_trx)</span><br><span> {</span><br><span> struct gprs_rlcmac_pdch *pdch;</span><br><span>@@ -354,8 +354,7 @@</span><br><span> int usf = -1;</span><br><span> uint8_t mask = 0xff;</span><br><span> const char *mask_reason = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct GprsMs *ms = tbf_->ms();</span><br><span style="color: hsl(0, 100%, 40%);">- const gprs_rlcmac_tbf *tbf = tbf_;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct GprsMs *ms = tbf->ms();</span><br><span> gprs_rlcmac_trx *trx = ms_current_trx(ms);</span><br><span> </span><br><span> LOGPAL(tbf, "A", single, use_trx, LOGL_DEBUG, "Alloc start\n");</span><br><span>@@ -404,24 +403,24 @@</span><br><span> </span><br><span> pdch = &trx->pdch[ts];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* The allocation will be successful, so the system state and tbf_/ms_</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The allocation will be successful, so the system state and tbf/ms</span><br><span> * may be modified from now on. */</span><br><span> if (tbf->direction == GPRS_RLCMAC_UL_TBF) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf_);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf);</span><br><span> LOGPSL(tbf, LOGL_DEBUG, "Assign uplink TS=%d TFI=%d USF=%d\n", ts, tfi, usf);</span><br><span> assign_uplink_tbf_usf(pdch, ul_tbf, tfi, usf);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf_);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf);</span><br><span> LOGPSL(tbf, LOGL_DEBUG, "Assign downlink TS=%d TFI=%d\n", ts, tfi);</span><br><span> assign_dlink_tbf(pdch, dl_tbf, tfi);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- tbf_->trx = trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->trx = trx;</span><br><span> /* the only one TS is the common TS */</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_->first_ts = tbf_->first_common_ts = ts;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->first_ts = tbf->first_common_ts = ts;</span><br><span> ms_set_reserved_slots(ms, trx, 1 << ts, 1 << ts);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- tbf_->upgrade_to_multislot = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->upgrade_to_multislot = false;</span><br><span> bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_ALGO_A);</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -856,12 +855,12 @@</span><br><span> * Assign one uplink slot. (With free USF)</span><br><span> *</span><br><span> * \param[in,out] bts Pointer to BTS struct</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in,out] tbf_ Pointer to TBF struct</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in,out] tbf Pointer to TBF struct</span><br><span> * \param[in] single flag indicating if we should force single-slot allocation</span><br><span> * \param[in] use_trx which TRX to use or -1 if it should be selected during allocation</span><br><span> * \returns negative error code or 0 on success</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf_, bool single,</span><br><span style="color: hsl(120, 100%, 40%);">+int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, bool single,</span><br><span> int8_t use_trx)</span><br><span> {</span><br><span> uint8_t dl_slots;</span><br><span>@@ -875,8 +874,7 @@</span><br><span> int usf[8] = {-1, -1, -1, -1, -1, -1, -1, -1};</span><br><span> int rc;</span><br><span> int tfi;</span><br><span style="color: hsl(0, 100%, 40%);">- struct GprsMs *ms = tbf_->ms();</span><br><span style="color: hsl(0, 100%, 40%);">- const gprs_rlcmac_tbf *tbf = tbf_;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct GprsMs *ms = tbf->ms();</span><br><span> gprs_rlcmac_trx *trx;</span><br><span> </span><br><span> LOGPAL(tbf, "B", single, use_trx, LOGL_DEBUG, "Alloc start\n");</span><br><span>@@ -942,28 +940,28 @@</span><br><span> }</span><br><span> </span><br><span> if (single && slotcount) {</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_->upgrade_to_multislot = (avail_count > slotcount);</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->upgrade_to_multislot = (avail_count > slotcount);</span><br><span> LOGPAL(tbf, "B", single, use_trx, LOGL_INFO, "using single slot at TS %d\n", first_ts);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_->upgrade_to_multislot = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->upgrade_to_multislot = false;</span><br><span> LOGPAL(tbf, "B", single, use_trx, LOGL_INFO, "using %d slots\n", slotcount);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* The allocation will be successful, so the system state and tbf_/ms_</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The allocation will be successful, so the system state and tbf/ms</span><br><span> * may be modified from now on. */</span><br><span> </span><br><span> /* Step 4: Update MS and TBF and really allocate the resources */</span><br><span> </span><br><span> update_ms_reserved_slots(trx, ms, reserved_ul_slots, reserved_dl_slots, ul_slots, dl_slots);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- tbf_->trx = trx;</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_->first_common_ts = first_common_ts;</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_->first_ts = first_ts;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->trx = trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->first_common_ts = first_common_ts;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->first_ts = first_ts;</span><br><span> </span><br><span> if (tbf->direction == GPRS_RLCMAC_DL_TBF)</span><br><span style="color: hsl(0, 100%, 40%);">- assign_dl_tbf_slots(as_dl_tbf(tbf_), trx, dl_slots, tfi);</span><br><span style="color: hsl(120, 100%, 40%);">+ assign_dl_tbf_slots(as_dl_tbf(tbf), trx, dl_slots, tfi);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- assign_ul_tbf_slots(as_ul_tbf(tbf_), trx, ul_slots, tfi, usf);</span><br><span style="color: hsl(120, 100%, 40%);">+ assign_ul_tbf_slots(as_ul_tbf(tbf), trx, ul_slots, tfi, usf);</span><br><span> </span><br><span> bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_ALGO_B);</span><br><span> </span><br><span>@@ -979,12 +977,12 @@</span><br><span> * goal is to provide the highest possible bandwidth per MS.</span><br><span> *</span><br><span> * \param[in,out] bts Pointer to BTS struct</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in,out] tbf_ Pointer to TBF struct</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in,out] tbf Pointer to TBF struct</span><br><span> * \param[in] single flag indicating if we should force single-slot allocation</span><br><span> * \param[in] use_trx which TRX to use or -1 if it should be selected during allocation</span><br><span> * \returns negative error code or 0 on success</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-int alloc_algorithm_dynamic(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf_, bool single,</span><br><span style="color: hsl(120, 100%, 40%);">+int alloc_algorithm_dynamic(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, bool single,</span><br><span> int8_t use_trx)</span><br><span> {</span><br><span> int rc;</span><br><span>@@ -997,7 +995,7 @@</span><br><span> }</span><br><span> </span><br><span> if (!bts->multislot_disabled) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = alloc_algorithm_b(bts, tbf_, single, use_trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = alloc_algorithm_b(bts, tbf, single, use_trx);</span><br><span> if (rc >= 0)</span><br><span> return rc;</span><br><span> </span><br><span>@@ -1006,7 +1004,7 @@</span><br><span> bts->multislot_disabled = 1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return alloc_algorithm_a(bts, tbf_, single, use_trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ return alloc_algorithm_a(bts, tbf, single, use_trx);</span><br><span> }</span><br><span> </span><br><span> int gprs_alloc_max_dl_slots_per_ms(const struct gprs_rlcmac_bts *bts, uint8_t ms_class)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25815">change 25815</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/+/25815"/><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: I8ae689a272b7c4d244576ff157f6019a87041abc </div>
<div style="display:none"> Gerrit-Change-Number: 25815 </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>