<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/24186">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Simplify helper function tbf_select_slot_set()<br><br>Store direction check to simplify the code.<br>Get rid of 2-step LOGP to avoid multi-row logs in gsmtap log.<br><br>Change-Id: Ia2e061da82ddce564b2d768d8ade1672c22934e2<br>---<br>M src/gprs_rlcmac_ts_alloc.cpp<br>M tests/tbf/TbfTest.err<br>2 files changed, 11 insertions(+), 10 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/86/24186/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 dd921e7..e8c9bc4 100644</span><br><span>--- a/src/gprs_rlcmac_ts_alloc.cpp</span><br><span>+++ b/src/gprs_rlcmac_ts_alloc.cpp</span><br><span>@@ -711,7 +711,8 @@</span><br><span> uint8_t reserved_ul_slots, uint8_t reserved_dl_slots,</span><br><span> int8_t first_common_ts)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t sl = tbf->direction != GPRS_RLCMAC_DL_TBF ? ul_slots : dl_slots;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool is_ul = tbf->direction == GPRS_RLCMAC_UL_TBF;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sl = is_ul ? ul_slots : dl_slots;</span><br><span> char slot_info[9] = { 0 };</span><br><span> </span><br><span> if (single)</span><br><span>@@ -719,22 +720,22 @@</span><br><span> </span><br><span> if (!sl) {</span><br><span> LOGP(DRLCMAC, LOGL_NOTICE, "No %s slots available\n",</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->direction != GPRS_RLCMAC_DL_TBF ? "uplink" : "downlink");</span><br><span style="color: hsl(120, 100%, 40%);">+ is_ul ? "uplink" : "downlink");</span><br><span> bts_do_rate_ctr_inc(trx->bts, CTR_TBF_ALLOC_FAIL_NO_SLOT_AVAIL);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (tbf->direction != GPRS_RLCMAC_DL_TBF) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (is_ul) {</span><br><span> snprintf(slot_info, 9, OSMO_BIT_SPEC, OSMO_BIT_PRINT_EX(reserved_ul_slots, 'u'));</span><br><span> masked_override_with(slot_info, sl, 'U');</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRLCMAC, LOGL_DEBUG, "- Selected UL");</span><br><span> } else {</span><br><span> snprintf(slot_info, 9, OSMO_BIT_SPEC, OSMO_BIT_PRINT_EX(reserved_dl_slots, 'd'));</span><br><span> masked_override_with(slot_info, sl, 'D');</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRLCMAC, LOGL_DEBUG, "- Selected DL");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGPC(DRLCMAC, LOGL_DEBUG, " slots: (TS=0)\"%s\"(TS=7), %s\n", slot_info, single ? "single" : "multi");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DRLCMAC, LOGL_DEBUG, "Selected %s slots: (TS=0)\"%s\"(TS=7), %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ is_ul ? "UL" : "DL",</span><br><span style="color: hsl(120, 100%, 40%);">+ slot_info, single ? "single" : "multi");</span><br><span> </span><br><span> return sl;</span><br><span> }</span><br><span>diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err</span><br><span>index be7caf0..0a826a7 100644</span><br><span>--- a/tests/tbf/TbfTest.err</span><br><span>+++ b/tests/tbf/TbfTest.err</span><br><span>@@ -3153,7 +3153,7 @@</span><br><span> - Skipping TS 7, because not enabled</span><br><span> - Possible DL/UL slots: (TS=0)"..CCCC.."(TS=7)</span><br><span> Rx=4 Tx=4 Sum Rx+Tx=5, Tta=2 Ttb=1, Tra=2 Trb=1, Type=1</span><br><span style="color: hsl(0, 100%, 40%);">-- Selected DL slots: (TS=0)"..DDDD.."(TS=7), multi</span><br><span style="color: hsl(120, 100%, 40%);">+Selected DL slots: (TS=0)"..DDDD.."(TS=7), multi</span><br><span> [DL] algo B <multi> (suggested TRX: 0): using 4 slots</span><br><span> - Reserved DL/UL slots: (TS=0)"..DDCD.."(TS=7)</span><br><span> - Assigning DL TS 2</span><br><span>@@ -3192,7 +3192,7 @@</span><br><span> - Skipping TS 7, because not enabled</span><br><span> - Possible DL/UL slots: (TS=0)"..CCCC.."(TS=7)</span><br><span> Rx=4 Tx=4 Sum Rx+Tx=5, Tta=2 Ttb=1, Tra=2 Trb=1, Type=1</span><br><span style="color: hsl(0, 100%, 40%);">-- Selected DL slots: (TS=0)"..DDDD.."(TS=7), multi</span><br><span style="color: hsl(120, 100%, 40%);">+Selected DL slots: (TS=0)"..DDDD.."(TS=7), multi</span><br><span> [DL] algo B <multi> (suggested TRX: 0): using 4 slots</span><br><span> - Reserved DL/UL slots: (TS=0)"..DDCD.."(TS=7)</span><br><span> - Assigning DL TS 2</span><br><span>@@ -6013,7 +6013,7 @@</span><br><span> - Skipping TS 7, because not enabled</span><br><span> - Possible DL/UL slots: (TS=0)"..CCCC.."(TS=7)</span><br><span> Rx=4 Tx=3 Sum Rx+Tx=5, Tta=3 Ttb=1, Tra=2 Trb=1, Type=1</span><br><span style="color: hsl(0, 100%, 40%);">-- Selected DL slots: (TS=0)"..ddDd.."(TS=7), single</span><br><span style="color: hsl(120, 100%, 40%);">+Selected DL slots: (TS=0)"..ddDd.."(TS=7), single</span><br><span> [DL] algo B <single> (suggested TRX: 0): using single slot at TS 4</span><br><span> - Reserved DL/UL slots: (TS=0)"...DC..."(TS=7)</span><br><span> - Assigning DL TS 4</span><br><span>@@ -6028,7 +6028,7 @@</span><br><span> PDCH(bts=0,trx=0,ts=4) Detaching TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL EGPRS), 0 TBFs, USFs = 00, TFIs = 00000000.</span><br><span> [DL] algo B <multi> (suggested TRX: -1): Alloc start</span><br><span> Found first unallocated TRX=0 TFI=0</span><br><span style="color: hsl(0, 100%, 40%);">-- Selected DL slots: (TS=0)"..DDDD.."(TS=7), multi</span><br><span style="color: hsl(120, 100%, 40%);">+Selected DL slots: (TS=0)"..DDDD.."(TS=7), multi</span><br><span> [DL] algo B <multi> (suggested TRX: -1): using 4 slots</span><br><span> - Assigning DL TS 2</span><br><span> PDCH(bts=0,trx=0,ts=2) Attaching TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/24186">change 24186</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/+/24186"/><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: Ia2e061da82ddce564b2d768d8ade1672c22934e2 </div>
<div style="display:none"> Gerrit-Change-Number: 24186 </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>