<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/26531">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-trx: use l1ts as talloc context for burst buffers<br><br>Before a massive refactoring of the scheduler structures [1] it was<br>impossible to have a clean hierarchy, in which the burst buffers<br>get allocated as children of their parent timeslot structures.<br><br>This change makes it easier to read talloc reports and simplifies<br>memory management, offloading free()ing of the burst bufferes to<br>talloc.<br><br>Change-Id: Idb1ceaf83c433d2d0eb84d77c2187a00a657905c<br>Related: [1] I7c4379e43a25e9d858d582a99bf6c4b65c9af481<br>---<br>M src/common/scheduler.c<br>M src/osmo-bts-trx/sched_lchan_pdtch.c<br>M src/osmo-bts-trx/sched_lchan_tchf.c<br>M src/osmo-bts-trx/sched_lchan_tchh.c<br>M src/osmo-bts-trx/sched_lchan_xcch.c<br>5 files changed, 10 insertions(+), 23 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/31/26531/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 d8048b5..bd33ce1 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -662,18 +662,7 @@</span><br><span> msgb_queue_flush(&l1ts->dl_prims);</span><br><span> rate_ctr_group_free(l1ts->ctrs);</span><br><span> 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(120, 100%, 40%);">+</span><br><span> /* clear lchan channel states */</span><br><span> for (i = 0; i < ARRAY_SIZE(ts->lchan); i++)</span><br><span> lchan_set_state(&ts->lchan[i], LCHAN_S_NONE);</span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c</span><br><span>index 66be116..6a2ad0d 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_pdtch.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_pdtch.c</span><br><span>@@ -58,8 +58,7 @@</span><br><span> </span><br><span> /* allocate burst memory, if not already */</span><br><span> if (!*bursts_p) {</span><br><span style="color: hsl(0, 100%, 40%);">- *bursts_p = talloc_zero_size(tall_bts_ctx,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM0503_EGPRS_BURSTS_NBITS);</span><br><span style="color: hsl(120, 100%, 40%);">+ *bursts_p = talloc_zero_size(l1ts, GSM0503_EGPRS_BURSTS_NBITS);</span><br><span> if (!*bursts_p)</span><br><span> return -ENOMEM;</span><br><span> }</span><br><span>@@ -174,8 +173,7 @@</span><br><span> </span><br><span> /* allocate burst memory, if not already */</span><br><span> if (!*bursts_p) {</span><br><span style="color: hsl(0, 100%, 40%);">- *bursts_p = talloc_zero_size(tall_bts_ctx,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM0503_EGPRS_BURSTS_NBITS);</span><br><span style="color: hsl(120, 100%, 40%);">+ *bursts_p = talloc_zero_size(l1ts, GSM0503_EGPRS_BURSTS_NBITS);</span><br><span> if (!*bursts_p)</span><br><span> return -ENOMEM;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>index 85ab321..08a58bb 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>@@ -76,7 +76,7 @@</span><br><span> </span><br><span> /* allocate burst memory, if not already */</span><br><span> if (!*bursts_p) {</span><br><span style="color: hsl(0, 100%, 40%);">- *bursts_p = talloc_zero_size(tall_bts_ctx, 928);</span><br><span style="color: hsl(120, 100%, 40%);">+ *bursts_p = talloc_zero_size(l1ts, 928);</span><br><span> if (!*bursts_p)</span><br><span> return -ENOMEM;</span><br><span> }</span><br><span>@@ -521,7 +521,7 @@</span><br><span> /* allocate burst memory, if not already,</span><br><span> * otherwise shift buffer by 4 bursts for interleaving */</span><br><span> if (!*bursts_p) {</span><br><span style="color: hsl(0, 100%, 40%);">- *bursts_p = talloc_zero_size(tall_bts_ctx, 928);</span><br><span style="color: hsl(120, 100%, 40%);">+ *bursts_p = talloc_zero_size(l1ts, 928);</span><br><span> if (!*bursts_p)</span><br><span> return -ENOMEM;</span><br><span> } else {</span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>index 366c625..51a0b90 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>@@ -83,7 +83,7 @@</span><br><span> </span><br><span> /* allocate burst memory, if not already */</span><br><span> if (!*bursts_p) {</span><br><span style="color: hsl(0, 100%, 40%);">- *bursts_p = talloc_zero_size(tall_bts_ctx, 696);</span><br><span style="color: hsl(120, 100%, 40%);">+ *bursts_p = talloc_zero_size(l1ts, 696);</span><br><span> if (!*bursts_p)</span><br><span> return -ENOMEM;</span><br><span> }</span><br><span>@@ -417,7 +417,7 @@</span><br><span> /* allocate burst memory, if not already,</span><br><span> * otherwise shift buffer by 2 bursts for interleaving */</span><br><span> if (!*bursts_p) {</span><br><span style="color: hsl(0, 100%, 40%);">- *bursts_p = talloc_zero_size(tall_bts_ctx, 696);</span><br><span style="color: hsl(120, 100%, 40%);">+ *bursts_p = talloc_zero_size(l1ts, 696);</span><br><span> if (!*bursts_p)</span><br><span> return -ENOMEM;</span><br><span> } else {</span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_xcch.c b/src/osmo-bts-trx/sched_lchan_xcch.c</span><br><span>index e8f46c1..6a65574 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_xcch.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_xcch.c</span><br><span>@@ -71,7 +71,7 @@</span><br><span> </span><br><span> /* allocate burst memory, if not already */</span><br><span> if (!*bursts_p) {</span><br><span style="color: hsl(0, 100%, 40%);">- *bursts_p = talloc_zero_size(tall_bts_ctx, 464);</span><br><span style="color: hsl(120, 100%, 40%);">+ *bursts_p = talloc_zero_size(l1ts, 464);</span><br><span> if (!*bursts_p)</span><br><span> return -ENOMEM;</span><br><span> }</span><br><span>@@ -79,7 +79,7 @@</span><br><span> /* UL-SACCH requires additional memory to keep a copy of each previous</span><br><span> * burst set. */</span><br><span> if (L1SAP_IS_LINK_SACCH(trx_chan_desc[bi->chan].link_id) && !chan_state->ul_bursts_prev) {</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->ul_bursts_prev = talloc_zero_size(tall_bts_ctx, 464);</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_state->ul_bursts_prev = talloc_zero_size(l1ts, 464);</span><br><span> if (!chan_state->ul_bursts_prev)</span><br><span> return -ENOMEM;</span><br><span> }</span><br><span>@@ -224,7 +224,7 @@</span><br><span> </span><br><span> /* allocate burst memory, if not already */</span><br><span> if (!*bursts_p) {</span><br><span style="color: hsl(0, 100%, 40%);">- *bursts_p = talloc_zero_size(tall_bts_ctx, 464);</span><br><span style="color: hsl(120, 100%, 40%);">+ *bursts_p = talloc_zero_size(l1ts, 464);</span><br><span> if (!*bursts_p)</span><br><span> return -ENOMEM;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/26531">change 26531</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/+/26531"/><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: Idb1ceaf83c433d2d0eb84d77c2187a00a657905c </div>
<div style="display:none"> Gerrit-Change-Number: 26531 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>