<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/18857">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  fixeria: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">scheduler: Early return in _sched_dequeue_prim() and clarify FN cases<br><br>We should always expect the msgb queue to be ordered by FN, so there's<br>no use in continue traversing the queue after we found a later primitive<br>than the one at current time, since next onews will be even more in the<br>future.<br><br>Change-Id: If57fc3d89a74e6cbc79fce80dae7bf4f77e9364d<br>---<br>M src/common/scheduler.c<br>1 file changed, 4 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index e1e7c95..86978eb 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -666,7 +666,7 @@</span><br><span>                  goto wrong_type;</span><br><span>             }</span><br><span>            prim_fn = ((l1sap_fn + GSM_HYPERFRAME - fn) % GSM_HYPERFRAME);</span><br><span style="color: hsl(0, 100%, 40%);">-          if (prim_fn > 100) {</span><br><span style="color: hsl(120, 100%, 40%);">+               if (prim_fn > 100) { /* l1sap_fn < fn */</span><br><span>                       LOGL1S(DL1P, LOGL_NOTICE, l1t, tn, chan, fn,</span><br><span>                              "Prim %u is out of range (%u vs exp %u), or channel %s with "</span><br><span>                              "type %s is already disabled. If this happens in "</span><br><span>@@ -679,9 +679,10 @@</span><br><span>                     msgb_free(msg);</span><br><span>                      continue;</span><br><span>            }</span><br><span style="color: hsl(0, 100%, 40%);">-               if (prim_fn > 0)</span><br><span style="color: hsl(0, 100%, 40%);">-                     continue;</span><br><span style="color: hsl(120, 100%, 40%);">+             if (prim_fn > 0) /* l1sap_fn > fn */</span><br><span style="color: hsl(120, 100%, 40%);">+                    return NULL;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+              /* l1sap_fn == fn */</span><br><span>                 goto found_msg;</span><br><span>      }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18857">change 18857</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-bts/+/18857"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If57fc3d89a74e6cbc79fce80dae7bf4f77e9364d </div>
<div style="display:none"> Gerrit-Change-Number: 18857 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </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>