<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25541">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_sched_clean_ts: Clean VAMOS shadow TS too<br><br>trx_sched_init_ts does it properly, but apparently it was forgotten to<br>do the same upon clean up.<br><br>Change-Id: Ice751870a46548af42b14846b8482335f636a84a<br>---<br>M src/common/scheduler.c<br>1 file changed, 29 insertions(+), 20 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/41/25541/1</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 6e1e4fb..0826eda 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -653,34 +653,43 @@</span><br><span>         }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void trx_sched_clean_ts(struct gsm_bts_trx_ts *ts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+      struct l1sched_ts *l1ts = ts->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+        unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+     msgb_queue_flush(&l1ts->dl_prims);</span><br><span style="color: hsl(120, 100%, 40%);">+     rate_ctr_group_free(l1ts->ctrs);</span><br><span style="color: hsl(120, 100%, 40%);">+   l1ts->ctrs = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < _TRX_CHAN_MAX; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+              struct l1sched_chan_state *chan_state;</span><br><span style="color: hsl(120, 100%, 40%);">+                chan_state = &l1ts->chan_state[i];</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%);">+     /* clear lchan channel states */</span><br><span style="color: hsl(120, 100%, 40%);">+      for (i = 0; i < ARRAY_SIZE(ts->lchan); i++)</span><br><span style="color: hsl(120, 100%, 40%);">+             lchan_set_state(&ts->lchan[i], LCHAN_S_NONE);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void trx_sched_clean(struct gsm_bts_trx *trx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int tn, i;</span><br><span style="color: hsl(120, 100%, 40%);">+   unsigned int tn;</span><br><span> </span><br><span>         LOGPTRX(trx, DL1C, LOGL_DEBUG, "Clean scheduler structures\n");</span><br><span> </span><br><span>        for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) {</span><br><span>                 struct gsm_bts_trx_ts *ts = &trx->ts[tn];</span><br><span style="color: hsl(0, 100%, 40%);">-                struct l1sched_ts *l1ts = ts->priv;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-              msgb_queue_flush(&l1ts->dl_prims);</span><br><span style="color: hsl(0, 100%, 40%);">-               rate_ctr_group_free(l1ts->ctrs);</span><br><span style="color: hsl(0, 100%, 40%);">-             l1ts->ctrs = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-           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 (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(0, 100%, 40%);">-               }</span><br><span style="color: hsl(0, 100%, 40%);">-               /* clear lchan channel states */</span><br><span style="color: hsl(0, 100%, 40%);">-                for (i = 0; i < ARRAY_SIZE(ts->lchan); i++)</span><br><span style="color: hsl(0, 100%, 40%);">-                       lchan_set_state(&ts->lchan[i], LCHAN_S_NONE);</span><br><span style="color: hsl(120, 100%, 40%);">+          /* Clean primary and shadow timeslots */</span><br><span style="color: hsl(120, 100%, 40%);">+              trx_sched_clean_ts(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+               trx_sched_clean_ts(ts->vamos.peer);</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/+/25541">change 25541</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/+/25541"/><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: Ice751870a46548af42b14846b8482335f636a84a </div>
<div style="display:none"> Gerrit-Change-Number: 25541 </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>