This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25493 ) Change subject: abis: Drop internal OML msg queue ...................................................................... abis: Drop internal OML msg queue There's no real use for this queue. If the link is gone, it makes no sense to keep old messages. Instead, BTS should generate new messages sharing current state when link becomes established (it actually does so already). Change-Id: Iecd3c7cb96f5fff3b4c7e04c74e031df0f7a6987 --- M include/osmo-bts/bts.h M src/common/abis.c M src/common/bts.c 3 files changed, 6 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 6e0e47b..d3cb6bf 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -302,7 +302,6 @@ struct paging_state *paging_state; struct llist_head bsc_oml_hosts; - struct llist_head oml_queue; unsigned int rtp_jitter_buf_ms; bool rtp_jitter_adaptive; diff --git a/src/common/abis.c b/src/common/abis.c index 31a3505..8e713d2 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -104,19 +104,6 @@ memset(&bts->oml_conn_established_timestamp, 0, sizeof(bts->oml_conn_established_timestamp)); } -static void drain_oml_queue(struct gsm_bts *bts) -{ - struct msgb *msg, *msg2; - - llist_for_each_entry_safe(msg, msg2, &bts->oml_queue, list) { - /* osmo-bts uses msg->trx internally, but libosmo-abis uses - * the signalling link at msg->dst */ - llist_del(&msg->list); - msg->dst = bts->oml_link; - abis_sendmsg(msg); - } -} - static int pick_next_bsc(struct osmo_fsm_inst *fi) { struct abis_link_fsm_priv *priv = fi->priv; @@ -208,7 +195,6 @@ static void abis_link_connected_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { - drain_oml_queue(g_bts); bts_link_estab(g_bts); } @@ -324,14 +310,14 @@ struct gsm_bts *bts = msg->trx->bts; if (!bts->oml_link) { - llist_add_tail(&msg->list, &bts->oml_queue); + LOGP(DABIS, LOGL_INFO, "Drop Tx OML msg, OML link is down\n"); return 0; - } else { - /* osmo-bts uses msg->trx internally, but libosmo-abis uses - * the signalling link at msg->dst */ - msg->dst = bts->oml_link; - return abis_sendmsg(msg); } + + /* osmo-bts uses msg->trx internally, but libosmo-abis uses + * the signalling link at msg->dst */ + msg->dst = bts->oml_link; + return abis_sendmsg(msg); } int abis_bts_rsl_sendmsg(struct msgb *msg) diff --git a/src/common/bts.c b/src/common/bts.c index 05584aa..67e6736 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -407,7 +407,6 @@ bts->smscb_queue_tgt_len = 2; bts->smscb_queue_hyst = 2; - INIT_LLIST_HEAD(&bts->oml_queue); INIT_LLIST_HEAD(&bts->bsc_oml_hosts); /* register DTX DL FSM */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iecd3c7cb96f5fff3b4c7e04c74e031df0f7a6987 Gerrit-Change-Number: 25493 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de> Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210922/bf48ff90/attachment.htm>