<p>lynxis lazus <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15466">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tbf_dl: add comments to the scheduler<br><br>Change-Id: Ib037f9fda30472313c7a82effb1e925c6abebbe5<br>---<br>M src/tbf_dl.cpp<br>1 file changed, 13 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp</span><br><span>index a7671c9..37bd3ee 100644</span><br><span>--- a/src/tbf_dl.cpp</span><br><span>+++ b/src/tbf_dl.cpp</span><br><span>@@ -359,6 +359,7 @@</span><br><span> int data_len2, force_data_len = -1;</span><br><span> GprsCodingScheme force_cs;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* search for a nacked or resend marked bsn */</span><br><span> bsn = m_window.resend_needed();</span><br><span> </span><br><span> if (previous_bsn >= 0) {</span><br><span>@@ -369,6 +370,7 @@</span><br><span> }</span><br><span> </span><br><span> if (bsn >= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* resend an unacked bsn or resend bsn. */</span><br><span> if (previous_bsn == bsn)</span><br><span> return -1;</span><br><span> </span><br><span>@@ -397,9 +399,11 @@</span><br><span> if (m_rlc.block(bsn)->cs_init == MCS8)</span><br><span> m_rlc.block(bsn)->cs_current_trans =</span><br><span> MCS8;</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* gprs */</span><br><span> m_rlc.block(bsn)->cs_current_trans =</span><br><span> m_rlc.block(bsn)->cs_last;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> data_len2 = m_rlc.block(bsn)->len;</span><br><span> if (force_data_len > 0 && force_data_len != data_len2)</span><br><span>@@ -409,6 +413,9 @@</span><br><span> m_window.m_v_b.mark_unacked(bsn);</span><br><span> bts->rlc_resent();</span><br><span> } else if (state_is(GPRS_RLCMAC_FINISHED)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If the TBF is in finished, we already sent all packages at least once.</span><br><span style="color: hsl(120, 100%, 40%);">+ * If any packages could have been sent (because of unacked) it should have</span><br><span style="color: hsl(120, 100%, 40%);">+ * been catched up by the upper if(bsn >= 0) */</span><br><span> LOGPTBFDL(this, LOGL_DEBUG,</span><br><span> "Restarting at BSN %d, because all blocks have been transmitted.\n",</span><br><span> m_window.v_a());</span><br><span>@@ -416,6 +423,8 @@</span><br><span> if (restart_bsn_cycle())</span><br><span> return take_next_bsn(fn, previous_bsn, may_combine);</span><br><span> } else if (dl_window_stalled()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* There are no more packages to send, but the window is stalled.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Restart the bsn_cycle to resend all unacked messages */</span><br><span> LOGPTBFDL(this, LOGL_NOTICE,</span><br><span> "Restarting at BSN %d, because the window is stalled.\n",</span><br><span> m_window.v_a());</span><br><span>@@ -423,8 +432,8 @@</span><br><span> if (restart_bsn_cycle())</span><br><span> return take_next_bsn(fn, previous_bsn, may_combine);</span><br><span> } else if (have_data()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The window has space left, generate new bsn */</span><br><span> GprsCodingScheme new_cs;</span><br><span style="color: hsl(0, 100%, 40%);">- /* New blocks may be send */</span><br><span> new_cs = force_cs ? force_cs : current_cs();</span><br><span> LOGPTBFDL(this, LOGL_DEBUG,</span><br><span> "Sending new block at BSN %d, CS=%s\n",</span><br><span>@@ -432,6 +441,8 @@</span><br><span> </span><br><span> bsn = create_new_bsn(fn, new_cs);</span><br><span> } else if (bts->bts_data()->dl_tbf_preemptive_retransmission && !m_window.window_empty()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The window contains unacked packages, but not acked.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Mark unacked bsns as RESEND */</span><br><span> LOGPTBFDL(this, LOGL_DEBUG,</span><br><span> "Restarting at BSN %d, because all blocks have been transmitted (FLOW).\n",</span><br><span> m_window.v_a());</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15466">change 15466</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/+/15466"/><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: Ib037f9fda30472313c7a82effb1e925c6abebbe5 </div>
<div style="display:none"> Gerrit-Change-Number: 15466 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>