<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/21743">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_rlcmac_sched: Use helper structure to store several tbf pointer params<br><br>The resulting code is cleaner since it becomes clear the relation<br>between all those pointers, which are set in one function and used in<br>another one, passed through the caller of the former two.<br><br>Moreover, if more tbf candidates are to be added for other type of<br>actions, having them in a struct is much easier since only one pointer<br>is passed.<br><br>Change-Id: I55482aa5af7be5a176a7b4879a672ad37e618020<br>---<br>M src/gprs_rlcmac_sched.cpp<br>1 file changed, 41 insertions(+), 41 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/43/21743/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp</span><br><span>index 84a5970..6505425 100644</span><br><span>--- a/src/gprs_rlcmac_sched.cpp</span><br><span>+++ b/src/gprs_rlcmac_sched.cpp</span><br><span>@@ -34,12 +34,16 @@</span><br><span> #include <osmocom/core/gsmtap.h></span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct tbf_sched_candidates {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_tbf *poll;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_tbf *ul_ass;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_tbf *dl_ass;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_ul_tbf *ul_ack;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static uint32_t sched_poll(BTS *bts,</span><br><span> uint8_t trx, uint8_t ts, uint32_t fn, uint8_t block_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_tbf **poll_tbf,</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_tbf **ul_ass_tbf,</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_tbf **dl_ass_tbf,</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_ul_tbf **ul_ack_tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct tbf_sched_candidates *tbf_cand)</span><br><span> {</span><br><span> struct gprs_rlcmac_ul_tbf *ul_tbf;</span><br><span> struct gprs_rlcmac_dl_tbf *dl_tbf;</span><br><span>@@ -59,14 +63,14 @@</span><br><span> continue;</span><br><span> /* polling for next uplink block */</span><br><span> if (ul_tbf->poll_scheduled() && ul_tbf->poll_fn == poll_fn)</span><br><span style="color: hsl(0, 100%, 40%);">- *poll_tbf = ul_tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_cand->poll = ul_tbf;</span><br><span> if (ul_tbf->ul_ack_state_is(GPRS_RLCMAC_UL_ACK_SEND_ACK))</span><br><span style="color: hsl(0, 100%, 40%);">- *ul_ack_tbf = ul_tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_cand->ul_ack = ul_tbf;</span><br><span> if (ul_tbf->dl_ass_state_is(GPRS_RLCMAC_DL_ASS_SEND_ASS))</span><br><span style="color: hsl(0, 100%, 40%);">- *dl_ass_tbf = ul_tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_cand->dl_ass = ul_tbf;</span><br><span> if (ul_tbf->ul_ass_state_is(GPRS_RLCMAC_UL_ASS_SEND_ASS)</span><br><span> || ul_tbf->ul_ass_state_is(GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ))</span><br><span style="color: hsl(0, 100%, 40%);">- *ul_ass_tbf = ul_tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_cand->ul_ass = ul_tbf;</span><br><span> /* FIXME: Is this supposed to be fair? The last TBF for each wins? Maybe use llist_add_tail and skip once we have all</span><br><span> states? */</span><br><span> }</span><br><span>@@ -78,12 +82,12 @@</span><br><span> continue;</span><br><span> /* polling for next uplink block */</span><br><span> if (dl_tbf->poll_scheduled() && dl_tbf->poll_fn == poll_fn)</span><br><span style="color: hsl(0, 100%, 40%);">- *poll_tbf = dl_tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_cand->poll = dl_tbf;</span><br><span> if (dl_tbf->dl_ass_state_is(GPRS_RLCMAC_DL_ASS_SEND_ASS))</span><br><span style="color: hsl(0, 100%, 40%);">- *dl_ass_tbf = dl_tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_cand->dl_ass = dl_tbf;</span><br><span> if (dl_tbf->ul_ass_state_is(GPRS_RLCMAC_UL_ASS_SEND_ASS)</span><br><span> || dl_tbf->ul_ass_state_is(GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ))</span><br><span style="color: hsl(0, 100%, 40%);">- *ul_ass_tbf = dl_tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_cand->ul_ass = dl_tbf;</span><br><span> }</span><br><span> </span><br><span> return poll_fn;</span><br><span>@@ -156,16 +160,16 @@</span><br><span> static struct msgb *sched_select_ctrl_msg(</span><br><span> uint8_t trx, uint8_t ts, uint32_t fn,</span><br><span> uint8_t block_nr, struct gprs_rlcmac_pdch *pdch,</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_tbf *ul_ass_tbf,</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_tbf *dl_ass_tbf,</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_ul_tbf *ul_ack_tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct tbf_sched_candidates *tbfs)</span><br><span> {</span><br><span> struct msgb *msg = NULL;</span><br><span> struct gprs_rlcmac_tbf *tbf = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_tbf *next_list[3] = { ul_ass_tbf, dl_ass_tbf, ul_ack_tbf };</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_tbf *next_list[3] = { tbfs->ul_ass,</span><br><span style="color: hsl(120, 100%, 40%);">+ tbfs->dl_ass,</span><br><span style="color: hsl(120, 100%, 40%);">+ tbfs->ul_ack };</span><br><span> </span><br><span> /* Send Packet Application Information first (ETWS primary notifications) */</span><br><span style="color: hsl(0, 100%, 40%);">- msg = sched_app_info(dl_ass_tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = sched_app_info(tbfs->dl_ass);</span><br><span> </span><br><span> if (!msg) {</span><br><span> for (size_t i = 0; i < ARRAY_SIZE(next_list); ++i) {</span><br><span>@@ -178,18 +182,19 @@</span><br><span> * because they may kill the TBF when the CONTROL ACK is</span><br><span> * received, thus preventing the others from being processed.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- if (tbf == ul_ass_tbf && tbf->ul_ass_state_is(GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ))</span><br><span style="color: hsl(0, 100%, 40%);">- msg = ul_ass_tbf->create_packet_access_reject();</span><br><span style="color: hsl(0, 100%, 40%);">- else if (tbf == ul_ass_tbf && tbf->direction ==</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tbf == tbfs->ul_ass && tbf->ul_ass_state_is(GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ))</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = tbfs->ul_ass->create_packet_access_reject();</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (tbf == tbfs->ul_ass && tbf->direction ==</span><br><span> GPRS_RLCMAC_DL_TBF)</span><br><span> if (tbf->ul_ass_state_is(GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ))</span><br><span style="color: hsl(0, 100%, 40%);">- msg = ul_ass_tbf->create_packet_access_reject();</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = tbfs->ul_ass->create_packet_access_reject();</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- msg = ul_ass_tbf->create_ul_ass(fn, ts);</span><br><span style="color: hsl(0, 100%, 40%);">- else if (tbf == dl_ass_tbf && tbf->direction == GPRS_RLCMAC_UL_TBF)</span><br><span style="color: hsl(0, 100%, 40%);">- msg = dl_ass_tbf->create_dl_ass(fn, ts);</span><br><span style="color: hsl(0, 100%, 40%);">- else if (tbf == ul_ack_tbf)</span><br><span style="color: hsl(0, 100%, 40%);">- msg = ul_ack_tbf->create_ul_ack(fn, ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = tbfs->ul_ass->create_ul_ass(fn, ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (tbf == tbfs->dl_ass && tbf->direction == GPRS_RLCMAC_UL_TBF)</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = tbfs->dl_ass->create_dl_ass(fn, ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (tbf == tbfs->ul_ack)</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = tbfs->ul_ack->create_ul_ack(fn, ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* else: if tbf/ms is pending to send tx_neigbhourData or tx_CellchangeContinue, send it */</span><br><span> </span><br><span> if (!msg) {</span><br><span> tbf = NULL;</span><br><span>@@ -208,12 +213,12 @@</span><br><span> * MS will kill the current TBF, only one of them can be</span><br><span> * non-NULL</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- if (dl_ass_tbf) {</span><br><span style="color: hsl(0, 100%, 40%);">- tbf = dl_ass_tbf;</span><br><span style="color: hsl(0, 100%, 40%);">- msg = dl_ass_tbf->create_dl_ass(fn, ts);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (ul_ass_tbf) {</span><br><span style="color: hsl(0, 100%, 40%);">- tbf = ul_ass_tbf;</span><br><span style="color: hsl(0, 100%, 40%);">- msg = ul_ass_tbf->create_ul_ass(fn, ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tbfs->dl_ass) {</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf = tbfs->dl_ass;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = tbfs->dl_ass->create_dl_ass(fn, ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (tbfs->ul_ass) {</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf = tbfs->ul_ass;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = tbfs->ul_ass->create_ul_ass(fn, ts);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -397,10 +402,8 @@</span><br><span> uint32_t fn, uint8_t block_nr)</span><br><span> {</span><br><span> struct gprs_rlcmac_pdch *pdch;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_tbf *poll_tbf = NULL, *dl_ass_tbf = NULL,</span><br><span style="color: hsl(0, 100%, 40%);">- *ul_ass_tbf = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct tbf_sched_candidates tbf_cand = {0};</span><br><span> struct gprs_rlcmac_ul_tbf *usf_tbf;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_ul_tbf *ul_ack_tbf = NULL;</span><br><span> uint8_t usf;</span><br><span> struct msgb *msg = NULL;</span><br><span> uint32_t poll_fn, sba_fn;</span><br><span>@@ -437,15 +440,13 @@</span><br><span> req_mcs_kind = EGPRS; /* all kinds are fine */</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- poll_fn = sched_poll(bts->bts, trx, ts, fn, block_nr, &poll_tbf, &ul_ass_tbf,</span><br><span style="color: hsl(0, 100%, 40%);">- &dl_ass_tbf, &ul_ack_tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+ poll_fn = sched_poll(bts->bts, trx, ts, fn, block_nr, &tbf_cand);</span><br><span> /* check uplink resource for polling */</span><br><span style="color: hsl(0, 100%, 40%);">- if (poll_tbf) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tbf_cand.poll) {</span><br><span> LOGP(DRLCMACSCHED, LOGL_DEBUG, "Received RTS for PDCH: TRX=%d "</span><br><span> "TS=%d FN=%d block_nr=%d scheduling free USF for "</span><br><span> "polling at FN=%d of %s\n", trx, ts, fn,</span><br><span style="color: hsl(0, 100%, 40%);">- block_nr, poll_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_name(poll_tbf));</span><br><span style="color: hsl(120, 100%, 40%);">+ block_nr, poll_fn, tbf_name(tbf_cand.poll));</span><br><span> usf = USF_UNUSED;</span><br><span> /* else. check for sba */</span><br><span> } else if ((sba_fn = bts->bts->sba()->sched(trx, ts, fn, block_nr) != 0xffffffff)) {</span><br><span>@@ -471,8 +472,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Prio 1: select control message */</span><br><span style="color: hsl(0, 100%, 40%);">- if ((msg = sched_select_ctrl_msg(trx, ts, fn, block_nr, pdch, ul_ass_tbf,</span><br><span style="color: hsl(0, 100%, 40%);">- dl_ass_tbf, ul_ack_tbf))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((msg = sched_select_ctrl_msg(trx, ts, fn, block_nr, pdch, &tbf_cand))) {</span><br><span> gsmtap_cat = PCU_GSMTAP_C_DL_CTRL;</span><br><span> }</span><br><span> /* Prio 2: select data message for downlink */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/21743">change 21743</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/+/21743"/><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: I55482aa5af7be5a176a7b4879a672ad37e618020 </div>
<div style="display:none"> Gerrit-Change-Number: 21743 </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>