<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/16009">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">GprsMs::update_cs_ul(): clarify the meaning of old_link_qual<br><br>Change-Id: Iad703a573621c64613b9b8c229079dc63fcaeb9e<br>---<br>M src/gprs_ms.cpp<br>M tests/tbf/TbfTest.err<br>2 files changed, 15 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_ms.cpp b/src/gprs_ms.cpp</span><br><span>index 5b35e65..8074cb4 100644</span><br><span>--- a/src/gprs_ms.cpp</span><br><span>+++ b/src/gprs_ms.cpp</span><br><span>@@ -648,8 +648,6 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- old_link_qual = meas->link_qual;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (mcs_is_gprs(m_current_cs_ul)) {</span><br><span> if (current_cs >= MAX_GPRS_CS)</span><br><span> current_cs = MAX_GPRS_CS - 1;</span><br><span>@@ -667,8 +665,12 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* To avoid rapid changes of the coding scheme, we also take</span><br><span style="color: hsl(120, 100%, 40%);">+ * the old link quality value into account (if present). */</span><br><span> if (m_l1_meas.have_link_qual)</span><br><span> old_link_qual = m_l1_meas.link_qual;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ old_link_qual = meas->link_qual;</span><br><span> </span><br><span> if (meas->link_qual < low && old_link_qual < low)</span><br><span> new_cs_ul.dec(mode());</span><br><span>@@ -679,7 +681,7 @@</span><br><span> if (m_current_cs_ul != new_cs_ul) {</span><br><span> LOGP(DRLCMACMEAS, LOGL_INFO,</span><br><span> "MS (IMSI %s): "</span><br><span style="color: hsl(0, 100%, 40%);">- "Link quality %ddB (%ddB) left window [%d, %d], "</span><br><span style="color: hsl(120, 100%, 40%);">+ "Link quality %ddB (old %ddB) left window [%d, %d], "</span><br><span> "modifying uplink CS level: %s -> %s\n",</span><br><span> imsi(), meas->link_qual, old_link_qual,</span><br><span> low, high,</span><br><span>diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err</span><br><span>index 6e638af..8ec3e80 100644</span><br><span>--- a/tests/tbf/TbfTest.err</span><br><span>+++ b/tests/tbf/TbfTest.err</span><br><span>@@ -1470,7 +1470,7 @@</span><br><span> - TRX=0 (0) TS=7 TA=7 TSC=0 TFI=0 USF=0</span><br><span> Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=FLOW) UL DATA TFI=0 received (V(Q)=0 .. V(R)=0)</span><br><span style="color: hsl(0, 100%, 40%);">-MS (IMSI ): Link quality 12dB (12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2</span><br><span style="color: hsl(120, 100%, 40%);">+MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=FLOW) restarting timer T3169 [acked (data)] with 5 sec. 0 microsec, cur_fn=0</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=FLOW) Got CS-1 RLC data block: CV=0, BSN=0, SPB=0, PI=0, E=1, TI=1, bitoffs=24</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=FLOW) BSN 0 storing in window (0..63)</span><br><span>@@ -1827,7 +1827,7 @@</span><br><span> Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete.</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS</span><br><span style="color: hsl(0, 100%, 40%);">-MS (IMSI ): Link quality 12dB (12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2</span><br><span style="color: hsl(120, 100%, 40%);">+MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH)</span><br><span> +++++++++++++++++++++++++ TX : Packet Uplink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Uplink Assignment -------------------------</span><br><span>@@ -1842,7 +1842,7 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes state from ASSIGN to FLOW</span><br><span> Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) UL DATA TFI=0 received (V(Q)=0 .. V(R)=0)</span><br><span style="color: hsl(0, 100%, 40%);">-MS (IMSI ): Link quality 12dB (12dB) left window [0, 0], modifying uplink CS level: CS-2 -> CS-3</span><br><span style="color: hsl(120, 100%, 40%);">+MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-2 -> CS-3</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) restarting timer T3169 [acked (data)] with 5 sec. 0 microsec, cur_fn=0</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) Got CS-1 RLC data block: CV=15, BSN=0, SPB=0, PI=0, E=1, TI=0, bitoffs=24</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) BSN 0 storing in window (0..63)</span><br><span>@@ -1920,7 +1920,7 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete.</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS</span><br><span style="color: hsl(0, 100%, 40%);">-MS (IMSI 0011223344): Link quality 12dB (12dB) left window [0, 0], modifying uplink CS level: CS-3 -> CS-4</span><br><span style="color: hsl(120, 100%, 40%);">+MS (IMSI 0011223344): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-3 -> CS-4</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH)</span><br><span> +++++++++++++++++++++++++ TX : Packet Uplink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Uplink Assignment -------------------------</span><br><span>@@ -1999,7 +1999,7 @@</span><br><span> Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete.</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS</span><br><span style="color: hsl(0, 100%, 40%);">-MS (IMSI ): Link quality 12dB (12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2</span><br><span style="color: hsl(120, 100%, 40%);">+MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH)</span><br><span> +++++++++++++++++++++++++ TX : Packet Uplink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Uplink Assignment -------------------------</span><br><span>@@ -2014,7 +2014,7 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes state from ASSIGN to FLOW</span><br><span> Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) UL DATA TFI=0 received (V(Q)=0 .. V(R)=0)</span><br><span style="color: hsl(0, 100%, 40%);">-MS (IMSI ): Link quality 12dB (12dB) left window [0, 0], modifying uplink CS level: CS-2 -> CS-3</span><br><span style="color: hsl(120, 100%, 40%);">+MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-2 -> CS-3</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) restarting timer T3169 [acked (data)] with 5 sec. 0 microsec, cur_fn=0</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) Got CS-1 RLC data block: CV=15, BSN=0, SPB=0, PI=0, E=1, TI=0, bitoffs=24</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) BSN 0 storing in window (0..63)</span><br><span>@@ -2085,7 +2085,7 @@</span><br><span> - TRX=0 (0) TS=7 TA=7 TSC=0 TFI=0 USF=0</span><br><span> Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=FLOW) UL DATA TFI=0 received (V(Q)=0 .. V(R)=0)</span><br><span style="color: hsl(0, 100%, 40%);">-MS (IMSI ): Link quality 12dB (12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2</span><br><span style="color: hsl(120, 100%, 40%);">+MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=FLOW) restarting timer T3169 [acked (data)] with 5 sec. 0 microsec, cur_fn=0</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=FLOW) Got CS-1 RLC data block: CV=0, BSN=0, SPB=0, PI=0, E=1, TI=1, bitoffs=24</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=FLOW) BSN 0 storing in window (0..63)</span><br><span>@@ -2150,7 +2150,7 @@</span><br><span> Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete.</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS</span><br><span style="color: hsl(0, 100%, 40%);">-MS (IMSI ): Link quality 12dB (12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2</span><br><span style="color: hsl(120, 100%, 40%);">+MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH)</span><br><span> +++++++++++++++++++++++++ TX : Packet Uplink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Uplink Assignment -------------------------</span><br><span>@@ -2165,7 +2165,7 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes state from ASSIGN to FLOW</span><br><span> Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) UL DATA TFI=0 received (V(Q)=0 .. V(R)=0)</span><br><span style="color: hsl(0, 100%, 40%);">-MS (IMSI ): Link quality 12dB (12dB) left window [0, 0], modifying uplink CS level: CS-2 -> CS-3</span><br><span style="color: hsl(120, 100%, 40%);">+MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-2 -> CS-3</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) restarting timer T3169 [acked (data)] with 5 sec. 0 microsec, cur_fn=0</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) Got CS-1 RLC data block: CV=15, BSN=0, SPB=0, PI=0, E=1, TI=0, bitoffs=24</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) BSN 0 storing in window (0..63)</span><br><span>@@ -2829,7 +2829,7 @@</span><br><span> TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=NULL) changes state from NULL to ASSIGN</span><br><span> TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) set ass. type PACCH [prev CCCH:0, PACCH:0]</span><br><span> TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) starting timer T0 [assignment (PACCH)] with 2 sec. 0 microsec, cur_fn=0</span><br><span style="color: hsl(0, 100%, 40%);">-MS (IMSI 0011223344): Link quality 12dB (12dB) left window [0, 0], modifying uplink CS level: CS-3 -> CS-4</span><br><span style="color: hsl(120, 100%, 40%);">+MS (IMSI 0011223344): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-3 -> CS-4</span><br><span> Received RTS for PDCH: TRX=0 TS=7 FN=2654400 block_nr=2 scheduling USF=0 for required uplink resource of UL TFI=0</span><br><span> TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) start Packet Downlink Assignment (PACCH)</span><br><span> +++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/16009">change 16009</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/+/16009"/><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: Iad703a573621c64613b9b8c229079dc63fcaeb9e </div>
<div style="display:none"> Gerrit-Change-Number: 16009 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>