<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25105">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tbf_dl: Clarify requirements for DL ACK/NACK<br><br>Method is renamed since it clearly relates to getting DL ACK/NACK, no<br>CTRL ACK.<br><br>use same methods in both scheduler and internal use since they are<br>expectd to be run in the same code path by the scheduler. This way we<br>make sure the same conditions apply and it's clearer when looking at<br>the code.<br><br>Change-Id: Ib0e9b9547f5292b95064bab2dc182fdf659f0518<br>---<br>M src/gprs_rlcmac_sched.cpp<br>M src/tbf_dl.cpp<br>M src/tbf_dl.h<br>3 files changed, 11 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp</span><br><span>index d73e55d..ed81981 100644</span><br><span>--- a/src/gprs_rlcmac_sched.cpp</span><br><span>+++ b/src/gprs_rlcmac_sched.cpp</span><br><span>@@ -239,7 +239,7 @@</span><br><span> int age_thresh1 = msecs_to_frames(200);</span><br><span> int age_thresh2 = msecs_to_frames(OSMO_MIN(msecs_t3190/2, dl_tbf_idle_msec));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (tbf->is_control_ts(ts) && tbf->need_control_ts())</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tbf->is_control_ts(ts) && tbf->need_poll_for_dl_ack_nack())</span><br><span> return DL_PRIO_CONTROL;</span><br><span> </span><br><span> if (tbf->is_control_ts(ts) && age > age_thresh2 && age_thresh2 > 0)</span><br><span>diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp</span><br><span>index bed7a08..34c5630 100644</span><br><span>--- a/src/tbf_dl.cpp</span><br><span>+++ b/src/tbf_dl.cpp</span><br><span>@@ -779,7 +779,6 @@</span><br><span> uint8_t *msg_data;</span><br><span> struct msgb *dl_msg;</span><br><span> unsigned msg_len;</span><br><span style="color: hsl(0, 100%, 40%);">- bool need_poll;</span><br><span> /* TODO: support MCS-7 - MCS-9, where data_block_idx can be 1 */</span><br><span> uint8_t data_block_idx = 0;</span><br><span> unsigned int rrbp;</span><br><span>@@ -940,23 +939,20 @@</span><br><span> if (m_last_dl_poll_fn < 0)</span><br><span> m_last_dl_poll_fn = fn;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- need_poll = state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* poll after POLL_ACK_AFTER_FRAMES frames, or when final block is tx.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- if (m_tx_counter >= POLL_ACK_AFTER_FRAMES || m_dl_ack_requested ||</span><br><span style="color: hsl(0, 100%, 40%);">- need_poll) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* poll after POLL_ACK_AFTER_FRAMES frames, or when final block is tx or</span><br><span style="color: hsl(120, 100%, 40%);">+ * when last polled DL ACK/NACK was lost. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (need_poll_for_dl_ack_nack()) {</span><br><span> if (m_dl_ack_requested) {</span><br><span> LOGPTBFDL(this, LOGL_DEBUG,</span><br><span> "Scheduling Ack/Nack polling, because it was requested explicitly "</span><br><span> "(e.g. first final block sent).\n");</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (need_poll) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK)) {</span><br><span> LOGPTBFDL(this, LOGL_DEBUG,</span><br><span> "Scheduling Ack/Nack polling, because polling timed out.\n");</span><br><span> } else {</span><br><span> LOGPTBFDL(this, LOGL_DEBUG,</span><br><span> "Scheduling Ack/Nack polling, because %d blocks sent.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- POLL_ACK_AFTER_FRAMES);</span><br><span style="color: hsl(120, 100%, 40%);">+ POLL_ACK_AFTER_FRAMES);</span><br><span> }</span><br><span> </span><br><span> rc = check_polling(fn, ts, &new_poll_fn, &rrbp);</span><br><span>@@ -1211,8 +1207,11 @@</span><br><span> m_dl_ack_requested = true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bool gprs_rlcmac_dl_tbf::need_control_ts() const</span><br><span style="color: hsl(120, 100%, 40%);">+/* Does this DL TBF require to poll the MS for DL ACK/NACK? */</span><br><span style="color: hsl(120, 100%, 40%);">+bool gprs_rlcmac_dl_tbf::need_poll_for_dl_ack_nack() const</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* poll after POLL_ACK_AFTER_FRAMES frames, or when final block is tx or</span><br><span style="color: hsl(120, 100%, 40%);">+ * when last polled DL ACK/NACK was lost. */</span><br><span> return state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK) ||</span><br><span> m_tx_counter >= POLL_ACK_AFTER_FRAMES ||</span><br><span> m_dl_ack_requested;</span><br><span>diff --git a/src/tbf_dl.h b/src/tbf_dl.h</span><br><span>index ad1469a..27b6a2c 100644</span><br><span>--- a/src/tbf_dl.h</span><br><span>+++ b/src/tbf_dl.h</span><br><span>@@ -53,7 +53,7 @@</span><br><span> void trigger_ass(struct gprs_rlcmac_tbf *old_tbf);</span><br><span> </span><br><span> void request_dl_ack();</span><br><span style="color: hsl(0, 100%, 40%);">- bool need_control_ts() const;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool need_poll_for_dl_ack_nack() const;</span><br><span> bool have_data() const;</span><br><span> int frames_since_last_poll(unsigned fn) const;</span><br><span> int frames_since_last_drain(unsigned fn) const;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25105">change 25105</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/+/25105"/><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: Ib0e9b9547f5292b95064bab2dc182fdf659f0518 </div>
<div style="display:none"> Gerrit-Change-Number: 25105 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>