<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20860">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move dl_tbf allocation code to correct file<br><br>Change-Id: I50d41b1c6f244edcfb78646d0fac4e47c2e3e561<br>---<br>M src/tbf.cpp<br>M src/tbf.h<br>M src/tbf_dl.cpp<br>M src/tbf_dl.h<br>4 files changed, 116 insertions(+), 111 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/60/20860/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index b2aad0c..2fbf5bf 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -109,25 +109,6 @@</span><br><span> { "rlc:nacked", "RLC Nacked " },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct rate_ctr_desc tbf_dl_gprs_ctr_description[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { "gprs:downlink:cs1", "CS1 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "gprs:downlink:cs2", "CS2 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "gprs:downlink:cs3", "CS3 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "gprs:downlink:cs4", "CS4 " },</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%);">-static const struct rate_ctr_desc tbf_dl_egprs_ctr_description[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:downlink:mcs1", "MCS1 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:downlink:mcs2", "MCS2 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:downlink:mcs3", "MCS3 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:downlink:mcs4", "MCS4 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:downlink:mcs5", "MCS5 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:downlink:mcs6", "MCS6 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:downlink:mcs7", "MCS7 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:downlink:mcs8", "MCS8 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:downlink:mcs9", "MCS9 " },</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> const struct rate_ctr_group_desc tbf_ctrg_desc = {</span><br><span> "pcu:tbf",</span><br><span> "TBF Statistics",</span><br><span>@@ -136,22 +117,6 @@</span><br><span> tbf_ctr_description,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct rate_ctr_group_desc tbf_dl_gprs_ctrg_desc = {</span><br><span style="color: hsl(0, 100%, 40%);">- "tbf:gprs",</span><br><span style="color: hsl(0, 100%, 40%);">- "Data Blocks",</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STATS_CLASS_SUBSCRIBER,</span><br><span style="color: hsl(0, 100%, 40%);">- ARRAY_SIZE(tbf_dl_gprs_ctr_description),</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_dl_gprs_ctr_description,</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%);">-static const struct rate_ctr_group_desc tbf_dl_egprs_ctrg_desc = {</span><br><span style="color: hsl(0, 100%, 40%);">- "tbf:egprs",</span><br><span style="color: hsl(0, 100%, 40%);">- "Data Blocks",</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STATS_CLASS_SUBSCRIBER,</span><br><span style="color: hsl(0, 100%, 40%);">- ARRAY_SIZE(tbf_dl_egprs_ctr_description),</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_dl_egprs_ctr_description,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static void setup_egprs_mode(gprs_rlcmac_bts *bts, GprsMs *ms)</span><br><span> {</span><br><span> if (mcs_is_edge_gmsk(mcs_get_egprs_by_num(bts->max_mcs_ul)) &&</span><br><span>@@ -894,80 +859,6 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int dl_tbf_dtor(struct gprs_rlcmac_dl_tbf *tbf)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->~gprs_rlcmac_dl_tbf();</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</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%);">-struct gprs_rlcmac_dl_tbf *tbf_alloc_dl_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, bool single_slot)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_dl_tbf *tbf;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(ms != NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ms->egprs_ms_class() == 0 && bts->egprs_enabled) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ms->ms_class() > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DTBF, LOGL_NOTICE, "Not accepting non-EGPRS phone in EGPRS-only mode\n");</span><br><span style="color: hsl(0, 100%, 40%);">- bts->bts->do_rate_ctr_inc(CTR_TBF_FAILED_EGPRS_ONLY);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- ms->set_egprs_ms_class(1);</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%);">- LOGP(DTBF, LOGL_DEBUG, "********** DL-TBF starts here **********\n");</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DTBF, LOGL_INFO, "Allocating DL TBF: MS_CLASS=%d/%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ms->ms_class(), ms->egprs_ms_class());</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- tbf = talloc(tall_pcu_ctx, struct gprs_rlcmac_dl_tbf);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!tbf)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_set_destructor(tbf, dl_tbf_dtor);</span><br><span style="color: hsl(0, 100%, 40%);">- new (tbf) gprs_rlcmac_dl_tbf(bts->bts, ms);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = tbf->setup(use_trx, single_slot);</span><br><span style="color: hsl(0, 100%, 40%);">- /* if no resource */</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(tbf);</span><br><span style="color: hsl(0, 100%, 40%);">- return 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%);">- if (tbf->is_egprs_enabled()) {</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->set_window_size();</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->m_dl_egprs_ctrs = rate_ctr_group_alloc(tbf,</span><br><span style="color: hsl(0, 100%, 40%);">- &tbf_dl_egprs_ctrg_desc,</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->m_ctrs->idx);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!tbf->m_dl_egprs_ctrs) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTBF(tbf, LOGL_ERROR, "Couldn't allocate EGPRS DL counters\n");</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(tbf);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->m_dl_gprs_ctrs = rate_ctr_group_alloc(tbf,</span><br><span style="color: hsl(0, 100%, 40%);">- &tbf_dl_gprs_ctrg_desc,</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->m_ctrs->idx);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!tbf->m_dl_gprs_ctrs) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTBF(tbf, LOGL_ERROR, "Couldn't allocate GPRS DL counters\n");</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(tbf);</span><br><span style="color: hsl(0, 100%, 40%);">- return 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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add(&tbf->list(), &bts->bts->dl_tbfs());</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->bts->do_rate_ctr_inc(CTR_TBF_DL_ALLOCATED);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->m_last_dl_poll_fn = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->m_last_dl_drained_fn = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_clock_gettime(CLOCK_MONOTONIC, &tbf->m_bw.dl_bw_tv);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_clock_gettime(CLOCK_MONOTONIC, &tbf->m_bw.dl_loss_tv);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return tbf;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static void tbf_timer_cb(void *_tbf)</span><br><span> {</span><br><span> struct gprs_rlcmac_tbf *tbf = (struct gprs_rlcmac_tbf *)_tbf;</span><br><span>diff --git a/src/tbf.h b/src/tbf.h</span><br><span>index 65654ea..08d0d1d 100644</span><br><span>--- a/src/tbf.h</span><br><span>+++ b/src/tbf.h</span><br><span>@@ -348,8 +348,6 @@</span><br><span> mutable char m_name_buf[60];</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_rlcmac_dl_tbf *tbf_alloc_dl_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, bool single_slot);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void tbf_free(struct gprs_rlcmac_tbf *tbf);</span><br><span> </span><br><span> int tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf);</span><br><span>diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp</span><br><span>index 0d692cc..b41c161 100644</span><br><span>--- a/src/tbf_dl.cpp</span><br><span>+++ b/src/tbf_dl.cpp</span><br><span>@@ -43,6 +43,7 @@</span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> #include <osmocom/core/logging.h></span><br><span> #include <osmocom/core/rate_ctr.h></span><br><span style="color: hsl(120, 100%, 40%);">+ #include <osmocom/core/stats.h></span><br><span> #include <osmocom/core/timer.h></span><br><span> #include <osmocom/core/utils.h></span><br><span> #include <osmocom/gsm/gsm_utils.h></span><br><span>@@ -56,6 +57,43 @@</span><br><span> /* After sending these frames, we poll for ack/nack. */</span><br><span> #define POLL_ACK_AFTER_FRAMES 20</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+extern void *tall_pcu_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct rate_ctr_desc tbf_dl_gprs_ctr_description[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { "gprs:downlink:cs1", "CS1 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "gprs:downlink:cs2", "CS2 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "gprs:downlink:cs3", "CS3 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "gprs:downlink:cs4", "CS4 " },</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%);">+static const struct rate_ctr_desc tbf_dl_egprs_ctr_description[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs1", "MCS1 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs2", "MCS2 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs3", "MCS3 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs4", "MCS4 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs5", "MCS5 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs6", "MCS6 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs7", "MCS7 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs8", "MCS8 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs9", "MCS9 " },</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%);">+static const struct rate_ctr_group_desc tbf_dl_gprs_ctrg_desc = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "tbf:gprs",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Data Blocks",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STATS_CLASS_SUBSCRIBER,</span><br><span style="color: hsl(120, 100%, 40%);">+ ARRAY_SIZE(tbf_dl_gprs_ctr_description),</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_dl_gprs_ctr_description,</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%);">+static const struct rate_ctr_group_desc tbf_dl_egprs_ctrg_desc = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "tbf:egprs",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Data Blocks",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STATS_CLASS_SUBSCRIBER,</span><br><span style="color: hsl(120, 100%, 40%);">+ ARRAY_SIZE(tbf_dl_egprs_ctr_description),</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_dl_egprs_ctr_description,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static inline void tbf_update_ms_class(struct gprs_rlcmac_tbf *tbf,</span><br><span> const uint8_t ms_class)</span><br><span> {</span><br><span>@@ -85,6 +123,80 @@</span><br><span> timespecclear(&dl_loss_tv);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int dl_tbf_dtor(struct gprs_rlcmac_dl_tbf *tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->~gprs_rlcmac_dl_tbf();</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</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%);">+struct gprs_rlcmac_dl_tbf *tbf_alloc_dl_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, bool single_slot)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_dl_tbf *tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(ms != NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ms->egprs_ms_class() == 0 && bts->egprs_enabled) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ms->ms_class() > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DTBF, LOGL_NOTICE, "Not accepting non-EGPRS phone in EGPRS-only mode\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->bts->do_rate_ctr_inc(CTR_TBF_FAILED_EGPRS_ONLY);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ ms->set_egprs_ms_class(1);</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%);">+ LOGP(DTBF, LOGL_DEBUG, "********** DL-TBF starts here **********\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DTBF, LOGL_INFO, "Allocating DL TBF: MS_CLASS=%d/%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ms->ms_class(), ms->egprs_ms_class());</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf = talloc(tall_pcu_ctx, struct gprs_rlcmac_dl_tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_set_destructor(tbf, dl_tbf_dtor);</span><br><span style="color: hsl(120, 100%, 40%);">+ new (tbf) gprs_rlcmac_dl_tbf(bts->bts, ms);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = tbf->setup(use_trx, single_slot);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* if no resource */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 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 (tbf->is_egprs_enabled()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->set_window_size();</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->m_dl_egprs_ctrs = rate_ctr_group_alloc(tbf,</span><br><span style="color: hsl(120, 100%, 40%);">+ &tbf_dl_egprs_ctrg_desc,</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->m_ctrs->idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!tbf->m_dl_egprs_ctrs) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTBF(tbf, LOGL_ERROR, "Couldn't allocate EGPRS DL counters\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->m_dl_gprs_ctrs = rate_ctr_group_alloc(tbf,</span><br><span style="color: hsl(120, 100%, 40%);">+ &tbf_dl_gprs_ctrg_desc,</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->m_ctrs->idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!tbf->m_dl_gprs_ctrs) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTBF(tbf, LOGL_ERROR, "Couldn't allocate GPRS DL counters\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add(&tbf->list(), &bts->bts->dl_tbfs());</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->bts->do_rate_ctr_inc(CTR_TBF_DL_ALLOCATED);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->m_last_dl_poll_fn = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->m_last_dl_drained_fn = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_clock_gettime(CLOCK_MONOTONIC, &tbf->m_bw.dl_bw_tv);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_clock_gettime(CLOCK_MONOTONIC, &tbf->m_bw.dl_loss_tv);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> gprs_rlcmac_dl_tbf::gprs_rlcmac_dl_tbf(BTS *bts_, GprsMs *ms) :</span><br><span> gprs_rlcmac_tbf(bts_, ms, GPRS_RLCMAC_DL_TBF),</span><br><span> m_tx_counter(0),</span><br><span>diff --git a/src/tbf_dl.h b/src/tbf_dl.h</span><br><span>index 9da942f..caa439a 100644</span><br><span>--- a/src/tbf_dl.h</span><br><span>+++ b/src/tbf_dl.h</span><br><span>@@ -149,4 +149,8 @@</span><br><span> else</span><br><span> return NULL;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct gprs_rlcmac_dl_tbf *tbf_alloc_dl_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms,</span><br><span style="color: hsl(120, 100%, 40%);">+ int8_t use_trx, bool single_slot);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #endif</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20860">change 20860</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/+/20860"/><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: I50d41b1c6f244edcfb78646d0fac4e47c2e3e561 </div>
<div style="display:none"> Gerrit-Change-Number: 20860 </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>