<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25493">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">abis: Drop internal OML msg queue<br><br>There's no real use for this queue. If the link is gone, it makes no<br>sense to keep old messages. Instead, BTS should generate new messages<br>sharing current state when link becomes established (it actually does<br>so already).<br><br>Change-Id: Iecd3c7cb96f5fff3b4c7e04c74e031df0f7a6987<br>---<br>M include/osmo-bts/bts.h<br>M src/common/abis.c<br>M src/common/bts.c<br>3 files changed, 6 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/93/25493/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h</span><br><span>index 6e0e47b..d3cb6bf 100644</span><br><span>--- a/include/osmo-bts/bts.h</span><br><span>+++ b/include/osmo-bts/bts.h</span><br><span>@@ -302,7 +302,6 @@</span><br><span> </span><br><span> struct paging_state *paging_state;</span><br><span> struct llist_head bsc_oml_hosts;</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head oml_queue;</span><br><span> unsigned int rtp_jitter_buf_ms;</span><br><span> bool rtp_jitter_adaptive;</span><br><span> </span><br><span>diff --git a/src/common/abis.c b/src/common/abis.c</span><br><span>index 31a3505..8e713d2 100644</span><br><span>--- a/src/common/abis.c</span><br><span>+++ b/src/common/abis.c</span><br><span>@@ -104,19 +104,6 @@</span><br><span> memset(&bts->oml_conn_established_timestamp, 0, sizeof(bts->oml_conn_established_timestamp));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void drain_oml_queue(struct gsm_bts *bts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg, *msg2;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry_safe(msg, msg2, &bts->oml_queue, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* osmo-bts uses msg->trx internally, but libosmo-abis uses</span><br><span style="color: hsl(0, 100%, 40%);">- * the signalling link at msg->dst */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(&msg->list);</span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = bts->oml_link;</span><br><span style="color: hsl(0, 100%, 40%);">- abis_sendmsg(msg);</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> static int pick_next_bsc(struct osmo_fsm_inst *fi)</span><br><span> {</span><br><span> struct abis_link_fsm_priv *priv = fi->priv;</span><br><span>@@ -208,7 +195,6 @@</span><br><span> </span><br><span> static void abis_link_connected_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- drain_oml_queue(g_bts);</span><br><span> bts_link_estab(g_bts);</span><br><span> }</span><br><span> </span><br><span>@@ -324,14 +310,14 @@</span><br><span> struct gsm_bts *bts = msg->trx->bts;</span><br><span> </span><br><span> if (!bts->oml_link) {</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add_tail(&msg->list, &bts->oml_queue);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DABIS, LOGL_INFO, "Drop Tx OML msg, OML link is down\n");</span><br><span> return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- /* osmo-bts uses msg->trx internally, but libosmo-abis uses</span><br><span style="color: hsl(0, 100%, 40%);">- * the signalling link at msg->dst */</span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = bts->oml_link;</span><br><span style="color: hsl(0, 100%, 40%);">- return abis_sendmsg(msg);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* osmo-bts uses msg->trx internally, but libosmo-abis uses</span><br><span style="color: hsl(120, 100%, 40%);">+ * the signalling link at msg->dst */</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = bts->oml_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ return abis_sendmsg(msg);</span><br><span> }</span><br><span> </span><br><span> int abis_bts_rsl_sendmsg(struct msgb *msg)</span><br><span>diff --git a/src/common/bts.c b/src/common/bts.c</span><br><span>index 05584aa..67e6736 100644</span><br><span>--- a/src/common/bts.c</span><br><span>+++ b/src/common/bts.c</span><br><span>@@ -407,7 +407,6 @@</span><br><span> bts->smscb_queue_tgt_len = 2;</span><br><span> bts->smscb_queue_hyst = 2;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&bts->oml_queue);</span><br><span> INIT_LLIST_HEAD(&bts->bsc_oml_hosts);</span><br><span> </span><br><span> /* register DTX DL FSM */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25493">change 25493</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/+/25493"/><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: Iecd3c7cb96f5fff3b4c7e04c74e031df0f7a6987 </div>
<div style="display:none"> Gerrit-Change-Number: 25493 </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-MessageType: newchange </div>