<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9172">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">jibuf: Fix out-of-order seq queue around syncpoints<br><br>Fixes: OS#3262<br><br>Change-Id: Ib8c61dbe6261cf73d6efcd7873e23b7656117556<br>---<br>M src/jibuf.c<br>M tests/jibuf/jibuf_test.c<br>M tests/jibuf/jibuf_test.ok<br>3 files changed, 36 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/72/9172/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/jibuf.c b/src/jibuf.c</span><br><span>index 45019ae..2632a57 100644</span><br><span>--- a/src/jibuf.c</span><br><span>+++ b/src/jibuf.c</span><br><span>@@ -119,6 +119,35 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void enqueue_pkt(struct osmo_jibuf *jb, struct msgb *msg, bool is_syncpoint)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *cur;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct timeval *msg_ts;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!is_syncpoint) {</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add_sorted(msg, &jb->msg_list);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* syncpoints change the reference timings, and as such they can provoke</span><br><span style="color: hsl(120, 100%, 40%);">+ out of order enqueuing of this packet and its followups with regards</span><br><span style="color: hsl(120, 100%, 40%);">+ to the already stored packets which may be scheduled for later times.</span><br><span style="color: hsl(120, 100%, 40%);">+ We thus need to adapt dequeue time for the already stored pkts to be</span><br><span style="color: hsl(120, 100%, 40%);">+ dequeued before the syncpoint pkt. See OS#3262 for related scenarios.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_ts = msgb_scheduled_ts(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(cur, &jb->msg_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct timeval *cur_ts = msgb_scheduled_ts(cur);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (timercmp(msg_ts, cur_ts, <))</span><br><span style="color: hsl(120, 100%, 40%);">+ *cur_ts = *msg_ts;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* syncpoint goes always to the end since we moved all older packets</span><br><span style="color: hsl(120, 100%, 40%);">+ before it */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add_tail(&msg->list, &jb->msg_list);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static bool msg_get_marker(struct msgb *msg)</span><br><span> {</span><br><span> /* TODO: make it more generic as a callback so that different types of</span><br><span>@@ -314,11 +343,13 @@</span><br><span> {</span><br><span> int rel_delay, delay;</span><br><span> struct timeval delay_ts, sched_ts;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool is_syncpoint;</span><br><span> </span><br><span> clock_gettime_timeval(CLOCK_MONOTONIC, &jb->last_enqueue_time);</span><br><span> </span><br><span> /* Check if it's time to sync, ie. start of talkspurt */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!jb->started || msg_is_syncpoint(jb, msg)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ is_syncpoint = !jb->started || msg_is_syncpoint(jb, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (is_syncpoint) {</span><br><span> jb->started = true;</span><br><span> msg_set_as_reference(jb, msg);</span><br><span> rel_delay = 0;</span><br><span>@@ -365,8 +396,7 @@</span><br><span> jbcb->ts = sched_ts;</span><br><span> jbcb->old_cb = old_cb;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- llist_add_sorted(msg, &jb->msg_list);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ enqueue_pkt(jb, msg, is_syncpoint);</span><br><span> </span><br><span> /* See if updating the timer is needed: */</span><br><span> if (!osmo_timer_pending(&jb->timer) ||</span><br><span>diff --git a/tests/jibuf/jibuf_test.c b/tests/jibuf/jibuf_test.c</span><br><span>index 7993a65..ba1bb01 100644</span><br><span>--- a/tests/jibuf/jibuf_test.c</span><br><span>+++ b/tests/jibuf/jibuf_test.c</span><br><span>@@ -673,8 +673,7 @@</span><br><span> clock_override_add(0, min_delay*1000);</span><br><span> osmo_select_main(0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* This assert shows that packets are queued out of order in this case:*/</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(!osmo_jibuf_empty(jb));</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(osmo_jibuf_empty(jb));</span><br><span> </span><br><span> osmo_jibuf_delete(jb);</span><br><span> }</span><br><span>diff --git a/tests/jibuf/jibuf_test.ok b/tests/jibuf/jibuf_test.ok</span><br><span>index 6bf52fb..b92f73c 100644</span><br><span>--- a/tests/jibuf/jibuf_test.ok</span><br><span>+++ b/tests/jibuf/jibuf_test.ok</span><br><span>@@ -383,10 +383,10 @@</span><br><span> sys={0.140000}, mono={0.140000}: dequeue: seq=34 ts=720 INTERMEDIATE</span><br><span> sys={0.140000}, mono={0.140000}: dequeue: seq=35 ts=880 INTERMEDIATE</span><br><span> sys={0.140000}, mono={0.140000}: dequeue: seq=36 ts=1040 INTERMEDIATE</span><br><span style="color: hsl(0, 100%, 40%);">-sys={0.140000}, mono={0.140000}: dequeue: seq=39 ts=1520 INTERMEDIATE</span><br><span> sys={0.140000}, mono={0.140000}: dequeue: seq=37 ts=1200 INTERMEDIATE</span><br><span style="color: hsl(0, 100%, 40%);">-sys={0.140000}, mono={0.140000}: dequeue: seq=40 ts=1680 LATEST</span><br><span> sys={0.140000}, mono={0.140000}: dequeue: seq=38 ts=1360 INTERMEDIATE</span><br><span style="color: hsl(120, 100%, 40%);">+sys={0.140000}, mono={0.140000}: dequeue: seq=39 ts=1520 INTERMEDIATE</span><br><span style="color: hsl(120, 100%, 40%);">+sys={0.140000}, mono={0.140000}: dequeue: seq=40 ts=1680 LATEST</span><br><span> ===test_rtp_out_of_sync(1600, 5, 800, 1)===</span><br><span> sys={0.000000}, mono={0.000000}: clock_override_set</span><br><span> sys={0.000000}, mono={0.000000}: enqueue 1st packet (seq=33, ts=560)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9172">change 9172</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/9172"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-netif </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ib8c61dbe6261cf73d6efcd7873e23b7656117556 </div>
<div style="display:none"> Gerrit-Change-Number: 9172 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>