<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20697">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">scheduler: reduce nesting in trx_sched_set_lchan()<br><br>Change-Id: I476dabb059325058a4327bb96430ce6ade199580<br>---<br>M src/common/scheduler.c<br>1 file changed, 30 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index 9af67c8..3dc4db5 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -979,36 +979,38 @@</span><br><span> </span><br><span> /* look for all matching chan_nr/link_id */</span><br><span> for (i = 0; i < _TRX_CHAN_MAX; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct l1sched_chan_state *chan_state;</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state = &l1ts->chan_state[i];</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx_chan_desc[i].chan_nr == (chan_nr & RSL_CHAN_NR_MASK)</span><br><span style="color: hsl(0, 100%, 40%);">- && trx_chan_desc[i].link_id == link_id) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- if (chan_state->active == active)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1C, LOGL_NOTICE, "%s %s on trx=%d ts=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- (active) ? "Activating" : "Deactivating",</span><br><span style="color: hsl(0, 100%, 40%);">- trx_chan_desc[i].name, l1t->trx->nr, tn);</span><br><span style="color: hsl(0, 100%, 40%);">- /* free burst memory, to cleanly start with burst 0 */</span><br><span style="color: hsl(0, 100%, 40%);">- if (chan_state->dl_bursts) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(chan_state->dl_bursts);</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->dl_bursts = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (chan_state->ul_bursts) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(chan_state->ul_bursts);</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->ul_bursts = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ struct l1sched_chan_state *chan_state = &l1ts->chan_state[i];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (active)</span><br><span style="color: hsl(0, 100%, 40%);">- memset(chan_state, 0, sizeof(*chan_state));</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->ho_rach_detect = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->active = active;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx_chan_desc[i].chan_nr != (chan_nr & RSL_CHAN_NR_MASK))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx_chan_desc[i].link_id != link_id)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (active) {</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->lchan = get_lchan_by_chan_nr(l1t->trx, chan_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(chan_state->lchan != NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (chan_state->active == active)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1C, LOGL_NOTICE, "%s %s on trx=%d ts=%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ (active) ? "Activating" : "Deactivating",</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_chan_desc[i].name, l1t->trx->nr, tn);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* free burst memory, to cleanly start with burst 0 */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (chan_state->dl_bursts) {</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(chan_state->dl_bursts);</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_state->dl_bursts = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (chan_state->ul_bursts) {</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(chan_state->ul_bursts);</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_state->ul_bursts = 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%);">+ if (active)</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(chan_state, 0, sizeof(*chan_state));</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_state->ho_rach_detect = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_state->active = active;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (active) {</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_state->lchan = get_lchan_by_chan_nr(l1t->trx, chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(chan_state->lchan != NULL);</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/c/osmo-bts/+/20697">change 20697</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/+/20697"/><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: I476dabb059325058a4327bb96430ce6ade199580 </div>
<div style="display:none"> Gerrit-Change-Number: 20697 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>