<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22360">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
dexter: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Get rid of singleton gprs_bssgp_pcu_current_bctx()<br><br>Access it from existing pointers instead.<br><br>Change-Id: I77455da5221090ebea142ecd49d5dba0065bfc5c<br>---<br>M src/gprs_bssgp_pcu.c<br>M src/gprs_bssgp_pcu.h<br>M src/pcu_l1_if.cpp<br>M src/tbf_dl.cpp<br>M src/tbf_ul.cpp<br>5 files changed, 4 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c</span><br><span>index 956fb66..c5cc39d 100644</span><br><span>--- a/src/gprs_bssgp_pcu.c</span><br><span>+++ b/src/gprs_bssgp_pcu.c</span><br><span>@@ -515,7 +515,7 @@</span><br><span> if (!TLVP_PRESENT(bp->tp, BSSGP_IE_BVCI))</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (gprs_bssgp_pcu_current_bctx()->bvci != bp->bvci) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (the_pcu->bssgp.bctx->bvci != bp->bvci) {</span><br><span> LOGP(DPCU, LOGL_NOTICE,</span><br><span> "Received BSSGP STATUS message for an unknown BVCI (%d), "</span><br><span> "ignored\n",</span><br><span>@@ -1181,11 +1181,6 @@</span><br><span> bts->nse = NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct bssgp_bvc_ctx *gprs_bssgp_pcu_current_bctx(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return the_pcu->bssgp.bctx;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void gprs_bssgp_update_frames_sent()</span><br><span> {</span><br><span> the_pcu->bssgp.queue_frames_sent += 1;</span><br><span>diff --git a/src/gprs_bssgp_pcu.h b/src/gprs_bssgp_pcu.h</span><br><span>index df22541..4b0e0aa 100644</span><br><span>--- a/src/gprs_bssgp_pcu.h</span><br><span>+++ b/src/gprs_bssgp_pcu.h</span><br><span>@@ -78,7 +78,6 @@</span><br><span> };</span><br><span> </span><br><span> int gprs_gp_send_cb(void *ctx, struct msgb *msg);</span><br><span style="color: hsl(0, 100%, 40%);">-struct bssgp_bvc_ctx *gprs_bssgp_pcu_current_bctx(void);</span><br><span> int gprs_ns_prim_cb(struct osmo_prim_hdr *oph, void *ctx);</span><br><span> void gprs_bssgp_update_queue_delay(const struct timespec *tv_recv,</span><br><span> const struct timespec *tv_now);</span><br><span>diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp</span><br><span>index 8ae74d5..d7590e1 100644</span><br><span>--- a/src/pcu_l1_if.cpp</span><br><span>+++ b/src/pcu_l1_if.cpp</span><br><span>@@ -782,7 +782,7 @@</span><br><span> </span><br><span> static int pcu_rx_susp_req(struct gprs_rlcmac_bts *bts, struct gsm_pcu_if_susp_req *susp_req)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct bssgp_bvc_ctx *bctx = gprs_bssgp_pcu_current_bctx();</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bssgp_bvc_ctx *bctx = bts->pcu->bssgp.bctx;</span><br><span> GprsMs *ms;</span><br><span> struct gprs_rlcmac_dl_tbf *dl_tbf;</span><br><span> struct gprs_rlcmac_ul_tbf *ul_tbf;</span><br><span>diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp</span><br><span>index 87c897f..de43349 100644</span><br><span>--- a/src/tbf_dl.cpp</span><br><span>+++ b/src/tbf_dl.cpp</span><br><span>@@ -641,7 +641,7 @@</span><br><span> return;</span><br><span> </span><br><span> /* dequeue next LLC frame, if any */</span><br><span style="color: hsl(0, 100%, 40%);">- msg = llc_dequeue(gprs_bssgp_pcu_current_bctx());</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = llc_dequeue(bts->pcu->bssgp.bctx);</span><br><span> if (!msg)</span><br><span> return;</span><br><span> </span><br><span>diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp</span><br><span>index 0c59a50..a5fc376 100644</span><br><span>--- a/src/tbf_ul.cpp</span><br><span>+++ b/src/tbf_ul.cpp</span><br><span>@@ -560,7 +560,7 @@</span><br><span> uint8_t qos_profile[3];</span><br><span> struct msgb *llc_pdu;</span><br><span> unsigned msg_len = NS_HDR_LEN + BSSGP_HDR_LEN + llc_frame_length(&m_llc);</span><br><span style="color: hsl(0, 100%, 40%);">- struct bssgp_bvc_ctx *bctx = gprs_bssgp_pcu_current_bctx();</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bssgp_bvc_ctx *bctx = bts->pcu->bssgp.bctx;</span><br><span> </span><br><span> LOGP(DBSSGP, LOGL_INFO, "LLC [PCU -> SGSN] %s len=%d\n", tbf_name(this), llc_frame_length(&m_llc));</span><br><span> if (!bctx) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22360">change 22360</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-pcu/+/22360"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I77455da5221090ebea142ecd49d5dba0065bfc5c </div>
<div style="display:none"> Gerrit-Change-Number: 22360 </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: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>