<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10454">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/sched_prim.c: refactor prim dequeuing logic<br><br>The previous primitive dequeuing logic (especially for TCH/F<br>channels) was a bit complicated, and it could not be possible<br>to reuse the existing code parts in the upcoming implementation<br>of both TCH/H and FACCH/H channels without changing anything.<br><br>In particular, this change introduces two internal functions:<br><br> - prim_dequeue_one(), which merely dequeues a primitive<br> of a given channel type (e.g. TRXC_SDCCH4_0);<br><br> - prim_dequeue_tch(), which dequeues either a FACCH,<br> or a speech TCH primitive of a given channel<br> type (Lm or Bm).<br><br>So the logic of the TCH/F prim dequeuing function has become<br>cleaner, and the upcoming TCH/H prim dequeuing function, where<br>FACCH/H prioritization is more complex than FACCH/F, will<br>reuse the introduced functions.<br><br>Change-Id: Ib82ad2480ab1bc6b1df9576eb2bf5acbd398bf66<br>---<br>M src/host/trxcon/sched_prim.c<br>1 file changed, 82 insertions(+), 54 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/54/10454/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c</span><br><span>index 2ee06d7..4987379 100644</span><br><span>--- a/src/host/trxcon/sched_prim.c</span><br><span>+++ b/src/host/trxcon/sched_prim.c</span><br><span>@@ -128,61 +128,98 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Dequeues a primitive of a given channel type */</span><br><span style="color: hsl(120, 100%, 40%);">+static struct trx_ts_prim *prim_dequeue_one(struct llist_head *queue,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum trx_lchan_type lchan_type)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct trx_ts_prim *prim;</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%);">+ * There is no need to use the 'safe' list iteration here</span><br><span style="color: hsl(120, 100%, 40%);">+ * as an item removal is immediately followed by return.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(prim, queue, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (prim->chan == lchan_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&prim->list);</span><br><span style="color: hsl(120, 100%, 40%);">+ return prim;</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /**</span><br><span style="color: hsl(0, 100%, 40%);">- * Dequeues a TCH or FACCH frame, prioritizing the second.</span><br><span style="color: hsl(0, 100%, 40%);">- * In case if a FACCH frame is found, a TCH frame is being</span><br><span style="color: hsl(120, 100%, 40%);">+ * Dequeues either a FACCH, or a speech TCH primitive</span><br><span style="color: hsl(120, 100%, 40%);">+ * of a given channel type (Lm or Bm).</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Note: we could avoid 'lchan_type' parameter and just</span><br><span style="color: hsl(120, 100%, 40%);">+ * check the prim's channel type using CHAN_IS_TCH(),</span><br><span style="color: hsl(120, 100%, 40%);">+ * but the current approach is a bit more flexible,</span><br><span style="color: hsl(120, 100%, 40%);">+ * and allows one to have both sub-slots of TCH/H</span><br><span style="color: hsl(120, 100%, 40%);">+ * enabled on same timeslot e.g. for testing...</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * @param queue transmit queue to take a prim from</span><br><span style="color: hsl(120, 100%, 40%);">+ * @param lchan_type required channel type of a primitive,</span><br><span style="color: hsl(120, 100%, 40%);">+ * e.g. TRXC_TCHF, TRXC_TCHH_0, or TRXC_TCHH_1</span><br><span style="color: hsl(120, 100%, 40%);">+ * @param facch FACCH (true) or speech (false) prim?</span><br><span style="color: hsl(120, 100%, 40%);">+ * @return either a FACCH, or a TCH primitive if found,</span><br><span style="color: hsl(120, 100%, 40%);">+ * otherwise NULL</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static struct trx_ts_prim *prim_dequeue_tch(struct llist_head *queue,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum trx_lchan_type lchan_type, bool facch)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct trx_ts_prim *prim;</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%);">+ * There is no need to use the 'safe' list iteration here</span><br><span style="color: hsl(120, 100%, 40%);">+ * as an item removal is immediately followed by return.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(prim, queue, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (prim->chan != lchan_type)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Either FACCH, or not FACCH */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (PRIM_IS_FACCH(prim) != facch)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&prim->list);</span><br><span style="color: hsl(120, 100%, 40%);">+ return prim;</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%);">+ return NULL;</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%);">+/**</span><br><span style="color: hsl(120, 100%, 40%);">+ * Dequeues either a TCH/F, or a FACCH/F prim (preferred).</span><br><span style="color: hsl(120, 100%, 40%);">+ * If a FACCH/F prim is found, one TCH/F prim is being</span><br><span> * dropped (i.e. replaced).</span><br><span> *</span><br><span> * @param queue a transmit queue to take a prim from</span><br><span style="color: hsl(0, 100%, 40%);">- * @return a FACCH or TCH primitive, otherwise NULL</span><br><span style="color: hsl(120, 100%, 40%);">+ * @return either a FACCH/F, or a TCH/F primitive,</span><br><span style="color: hsl(120, 100%, 40%);">+ * otherwise NULL</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-static struct trx_ts_prim *sched_prim_dequeue_tch(struct llist_head *queue)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct trx_ts_prim *prim_dequeue_tch_f(struct llist_head *queue)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct trx_ts_prim *facch = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct trx_ts_prim *tch = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct trx_ts_prim *i;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct trx_ts_prim *facch;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct trx_ts_prim *tch;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Attempt to find a pair of FACCH and TCH frames */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(i, queue, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Find one FACCH frame */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!facch && PRIM_IS_FACCH(i))</span><br><span style="color: hsl(0, 100%, 40%);">- facch = i;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Attempt to find a pair of both FACCH/F and TCH/F frames */</span><br><span style="color: hsl(120, 100%, 40%);">+ facch = prim_dequeue_tch(queue, TRXC_TCHF, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ tch = prim_dequeue_tch(queue, TRXC_TCHF, false);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Find one TCH frame */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!tch && PRIM_IS_TCH(i))</span><br><span style="color: hsl(0, 100%, 40%);">- tch = i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* If both are found */</span><br><span style="color: hsl(0, 100%, 40%);">- if (facch && tch)</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Prioritize FACCH */</span><br><span style="color: hsl(0, 100%, 40%);">- if (facch && tch) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* We found a pair, dequeue both */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(&facch->list);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(&tch->list);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Drop TCH */</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(tch);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* FACCH replaces TCH */</span><br><span style="color: hsl(0, 100%, 40%);">- return facch;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (facch) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Only FACCH was found */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(&facch->list);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Prioritize FACCH/F, if found */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (facch) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* One TCH/F prim is replaced */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tch)</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(tch);</span><br><span> return facch;</span><br><span> } else if (tch) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Only TCH was found */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(&tch->list);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Only TCH/F prim was found */</span><br><span> return tch;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Nothing was found, e.g. when only SACCH frames are in queue */</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /**</span><br><span style="color: hsl(0, 100%, 40%);">- * Nothing was found,</span><br><span style="color: hsl(0, 100%, 40%);">- * e.g. only SACCH frames are in queue</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span> }</span><br><span> </span><br><span> /**</span><br><span>@@ -196,24 +233,15 @@</span><br><span> struct trx_ts_prim *sched_prim_dequeue(struct llist_head *queue,</span><br><span> enum trx_lchan_type lchan_type)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct trx_ts_prim *prim;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* There is nothing to dequeue */</span><br><span> if (llist_empty(queue))</span><br><span> return NULL;</span><br><span> </span><br><span> /* TCH requires FACCH prioritization, so handle it separately */</span><br><span> if (CHAN_IS_TCH(lchan_type))</span><br><span style="color: hsl(0, 100%, 40%);">- return sched_prim_dequeue_tch(queue);</span><br><span style="color: hsl(120, 100%, 40%);">+ return prim_dequeue_tch_f(queue);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(prim, queue, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (prim->chan == lchan_type) {</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(&prim->list);</span><br><span style="color: hsl(0, 100%, 40%);">- return prim;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return prim_dequeue_one(queue, lchan_type);</span><br><span> }</span><br><span> </span><br><span> /**</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10454">change 10454</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/10454"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ib82ad2480ab1bc6b1df9576eb2bf5acbd398bf66 </div>
<div style="display:none"> Gerrit-Change-Number: 10454 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>