<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20859">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move ul_tbf allocation code to correct file<br><br>Change-Id: Ifd98abbcce49e4605c764267965903fbf9f35867<br>---<br>M src/gprs_ms.h<br>M src/tbf.cpp<br>M src/tbf.h<br>M src/tbf_ul.cpp<br>M src/tbf_ul.h<br>5 files changed, 170 insertions(+), 167 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/59/20859/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_ms.h b/src/gprs_ms.h</span><br><span>index 0a1dda7..412a400 100644</span><br><span>--- a/src/gprs_ms.h</span><br><span>+++ b/src/gprs_ms.h</span><br><span>@@ -25,6 +25,7 @@</span><br><span> #include "cxx_linuxlist.h"</span><br><span> #include "llc.h"</span><br><span> #include "tbf.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "tbf_ul.h"</span><br><span> #include "tbf_dl.h"</span><br><span> #include "pcu_l1_if.h"</span><br><span> </span><br><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index 305a549..b2aad0c 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -57,7 +57,7 @@</span><br><span> </span><br><span> extern void *tall_pcu_ctx;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static unsigned int next_tbf_ctr_group_id = 0; /* Incrementing group id */</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned int next_tbf_ctr_group_id = 0; /* Incrementing group id */</span><br><span> </span><br><span> static void tbf_timer_cb(void *_tbf);</span><br><span> </span><br><span>@@ -128,26 +128,7 @@</span><br><span> { "egprs:downlink:mcs9", "MCS9 " },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct rate_ctr_desc tbf_ul_gprs_ctr_description[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { "gprs:uplink:cs1", "CS1 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "gprs:uplink:cs2", "CS2 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "gprs:uplink:cs3", "CS3 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "gprs:uplink: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_ul_egprs_ctr_description[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:uplink:mcs1", "MCS1 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:uplink:mcs2", "MCS2 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:uplink:mcs3", "MCS3 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:uplink:mcs4", "MCS4 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:uplink:mcs5", "MCS5 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:uplink:mcs6", "MCS6 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:uplink:mcs7", "MCS7 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:uplink:mcs8", "MCS8 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs:uplink:mcs9", "MCS9 " },</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_ctrg_desc = {</span><br><span style="color: hsl(120, 100%, 40%);">+const struct rate_ctr_group_desc tbf_ctrg_desc = {</span><br><span> "pcu:tbf",</span><br><span> "TBF Statistics",</span><br><span> OSMO_STATS_CLASS_SUBSCRIBER,</span><br><span>@@ -171,22 +152,6 @@</span><br><span> tbf_dl_egprs_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_ul_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_ul_gprs_ctr_description),</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_ul_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_ul_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_ul_egprs_ctr_description),</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_ul_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>@@ -407,29 +372,6 @@</span><br><span> ms()->confirm_tlli(tlli);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-gprs_rlcmac_ul_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t tlli)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_ul_tbf *tbf;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* FIXME: Copy and paste with tbf_new_dl_assignment */</span><br><span style="color: hsl(0, 100%, 40%);">- /* create new TBF, use same TRX as DL TBF */</span><br><span style="color: hsl(0, 100%, 40%);">- /* use multislot class of downlink TBF */</span><br><span style="color: hsl(0, 100%, 40%);">- tbf = tbf_alloc_ul_tbf(bts, ms, use_trx, false);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!tbf) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DTBF, LOGL_NOTICE, "No PDCH resource\n");</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: send reject */</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%);">- tbf->m_contention_resolution_done = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- TBF_SET_ASS_ON(tbf, GPRS_RLCMAC_FLAG_PACCH, false);</span><br><span style="color: hsl(0, 100%, 40%);">- T_START(tbf, T3169, 3169, "allocation (UL-TBF)", true);</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->update_ms(tlli, GPRS_RLCMAC_UL_TBF);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(tbf->ms());</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_unlink_pdch(struct gprs_rlcmac_tbf *tbf)</span><br><span> {</span><br><span> int ts;</span><br><span>@@ -952,62 +894,6 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int ul_tbf_dtor(struct gprs_rlcmac_ul_tbf *tbf)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->~gprs_rlcmac_ul_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_ul_tbf *tbf_alloc_ul_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_ul_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%);">- 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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DTBF, LOGL_DEBUG, "********** UL-TBF starts here **********\n");</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DTBF, LOGL_INFO, "Allocating UL 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_ul_tbf);</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%);">- talloc_set_destructor(tbf, ul_tbf_dtor);</span><br><span style="color: hsl(0, 100%, 40%);">- new (tbf) gprs_rlcmac_ul_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%);">-</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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->m_ul_egprs_ctrs = rate_ctr_group_alloc(tbf,</span><br><span style="color: hsl(0, 100%, 40%);">- &tbf_ul_egprs_ctrg_desc, tbf->m_ctrs->idx);</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->m_ul_gprs_ctrs = rate_ctr_group_alloc(tbf,</span><br><span style="color: hsl(0, 100%, 40%);">- &tbf_ul_gprs_ctrg_desc, tbf->m_ctrs->idx);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!tbf->m_ul_egprs_ctrs || !tbf->m_ul_gprs_ctrs) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTBF(tbf, LOGL_ERROR, "Couldn't allocate TBF UL 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%);">- llist_add(&tbf->list(), &bts->bts->ul_tbfs());</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->bts->do_rate_ctr_inc(CTR_TBF_UL_ALLOCATED);</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 int dl_tbf_dtor(struct gprs_rlcmac_dl_tbf *tbf)</span><br><span> {</span><br><span> tbf->~gprs_rlcmac_dl_tbf();</span><br><span>@@ -1472,45 +1358,3 @@</span><br><span> {</span><br><span> return ts == control_ts;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_rlcmac_ul_tbf *handle_tbf_reject(struct gprs_rlcmac_bts *bts,</span><br><span style="color: hsl(0, 100%, 40%);">- GprsMs *ms, uint32_t tlli, uint8_t trx_no, uint8_t ts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_ul_tbf *ul_tbf = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_trx *trx = &bts->trx[trx_no];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ms)</span><br><span style="color: hsl(0, 100%, 40%);">- ms = bts->bts->ms_alloc(0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- ms->set_tlli(tlli);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf = talloc(tall_pcu_ctx, struct gprs_rlcmac_ul_tbf);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ul_tbf)</span><br><span style="color: hsl(0, 100%, 40%);">- return ul_tbf;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_set_destructor(ul_tbf, ul_tbf_dtor);</span><br><span style="color: hsl(0, 100%, 40%);">- new (ul_tbf) gprs_rlcmac_ul_tbf(bts->bts, ms);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add(&ul_tbf->list(), &bts->bts->ul_tbfs());</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf->bts->do_rate_ctr_inc(CTR_TBF_UL_ALLOCATED);</span><br><span style="color: hsl(0, 100%, 40%);">- TBF_SET_ASS_ON(ul_tbf, GPRS_RLCMAC_FLAG_PACCH, false);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ms->attach_tbf(ul_tbf);</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf->update_ms(tlli, GPRS_RLCMAC_UL_TBF);</span><br><span style="color: hsl(0, 100%, 40%);">- TBF_SET_ASS_STATE_UL(ul_tbf, GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ);</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf->control_ts = ts;</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf->trx = trx;</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf->m_ctrs = rate_ctr_group_alloc(ul_tbf, &tbf_ctrg_desc, next_tbf_ctr_group_id++);</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf->m_ul_egprs_ctrs = rate_ctr_group_alloc(ul_tbf,</span><br><span style="color: hsl(0, 100%, 40%);">- &tbf_ul_egprs_ctrg_desc,</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf->m_ctrs->idx);</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf->m_ul_gprs_ctrs = rate_ctr_group_alloc(ul_tbf,</span><br><span style="color: hsl(0, 100%, 40%);">- &tbf_ul_gprs_ctrg_desc,</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf->m_ctrs->idx);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ul_tbf->m_ctrs || !ul_tbf->m_ul_egprs_ctrs || !ul_tbf->m_ul_gprs_ctrs) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTBF(ul_tbf, LOGL_ERROR, "Cound not allocate TBF UL rate counters\n");</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(ul_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%);">- return ul_tbf;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/tbf.h b/src/tbf.h</span><br><span>index 2a3dfbd..65654ea 100644</span><br><span>--- a/src/tbf.h</span><br><span>+++ b/src/tbf.h</span><br><span>@@ -124,6 +124,9 @@</span><br><span> TBF_CTR_EGPRS_DL_MCS9,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct rate_ctr_group_desc tbf_ctrg_desc;</span><br><span style="color: hsl(120, 100%, 40%);">+extern unsigned int next_tbf_ctr_group_id;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define LOGPTBF(tbf, level, fmt, args...) LOGP(DTBF, level, "%s " fmt, tbf_name(tbf), ## args)</span><br><span> </span><br><span> enum tbf_timers {</span><br><span>@@ -345,19 +348,10 @@</span><br><span> mutable char m_name_buf[60];</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_rlcmac_ul_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts, GprsMs *ms,</span><br><span style="color: hsl(0, 100%, 40%);">- int8_t use_trx, uint32_t tlli);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_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> 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> </span><br><span> void tbf_free(struct gprs_rlcmac_tbf *tbf);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_rlcmac_ul_tbf *handle_tbf_reject(struct gprs_rlcmac_bts *bts,</span><br><span style="color: hsl(0, 100%, 40%);">- GprsMs *ms, uint32_t tlli, uint8_t trx_no, uint8_t ts_no);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf);</span><br><span> </span><br><span> inline bool gprs_rlcmac_tbf::state_is(enum gprs_rlcmac_tbf_state rhs) const</span><br><span>diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp</span><br><span>index ed14670..4d8588c 100644</span><br><span>--- a/src/tbf_ul.cpp</span><br><span>+++ b/src/tbf_ul.cpp</span><br><span>@@ -39,6 +39,7 @@</span><br><span> #include <osmocom/core/bitvec.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/utils.h></span><br><span> #include <osmocom/gprs/gprs_bssgp_bss.h></span><br><span> #include <osmocom/gprs/protocol/gsm_08_18.h></span><br><span>@@ -54,6 +55,163 @@</span><br><span> </span><br><span> extern void *tall_pcu_ctx;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const struct rate_ctr_desc tbf_ul_gprs_ctr_description[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { "gprs:uplink:cs1", "CS1 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "gprs:uplink:cs2", "CS2 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "gprs:uplink:cs3", "CS3 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "gprs:uplink: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_ul_egprs_ctr_description[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink:mcs1", "MCS1 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink:mcs2", "MCS2 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink:mcs3", "MCS3 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink:mcs4", "MCS4 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink:mcs5", "MCS5 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink:mcs6", "MCS6 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink:mcs7", "MCS7 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink:mcs8", "MCS8 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink: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_ul_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_ul_gprs_ctr_description),</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_ul_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_ul_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_ul_egprs_ctr_description),</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_ul_egprs_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 int ul_tbf_dtor(struct gprs_rlcmac_ul_tbf *tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->~gprs_rlcmac_ul_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_ul_tbf *tbf_alloc_ul_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_ul_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%);">+ 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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DTBF, LOGL_DEBUG, "********** UL-TBF starts here **********\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DTBF, LOGL_INFO, "Allocating UL 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_ul_tbf);</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%);">+ talloc_set_destructor(tbf, ul_tbf_dtor);</span><br><span style="color: hsl(120, 100%, 40%);">+ new (tbf) gprs_rlcmac_ul_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%);">+</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->m_ul_egprs_ctrs = rate_ctr_group_alloc(tbf,</span><br><span style="color: hsl(120, 100%, 40%);">+ &tbf_ul_egprs_ctrg_desc, tbf->m_ctrs->idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->m_ul_gprs_ctrs = rate_ctr_group_alloc(tbf,</span><br><span style="color: hsl(120, 100%, 40%);">+ &tbf_ul_gprs_ctrg_desc, tbf->m_ctrs->idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!tbf->m_ul_egprs_ctrs || !tbf->m_ul_gprs_ctrs) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTBF(tbf, LOGL_ERROR, "Couldn't allocate TBF UL 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%);">+ llist_add(&tbf->list(), &bts->bts->ul_tbfs());</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->bts->do_rate_ctr_inc(CTR_TBF_UL_ALLOCATED);</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 style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+gprs_rlcmac_ul_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t tlli)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_ul_tbf *tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* FIXME: Copy and paste with tbf_new_dl_assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* create new TBF, use same TRX as DL TBF */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* use multislot class of downlink TBF */</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf = tbf_alloc_ul_tbf(bts, ms, use_trx, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!tbf) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DTBF, LOGL_NOTICE, "No PDCH resource\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: send reject */</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%);">+ tbf->m_contention_resolution_done = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ TBF_SET_ASS_ON(tbf, GPRS_RLCMAC_FLAG_PACCH, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ T_START(tbf, T3169, 3169, "allocation (UL-TBF)", true);</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->update_ms(tlli, GPRS_RLCMAC_UL_TBF);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(tbf->ms());</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 style="color: hsl(120, 100%, 40%);">+struct gprs_rlcmac_ul_tbf *handle_tbf_reject(struct gprs_rlcmac_bts *bts,</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsMs *ms, uint32_t tlli, uint8_t trx_no, uint8_t ts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_ul_tbf *ul_tbf = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_trx *trx = &bts->trx[trx_no];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ms)</span><br><span style="color: hsl(120, 100%, 40%);">+ ms = bts->bts->ms_alloc(0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms->set_tlli(tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf = talloc(tall_pcu_ctx, struct gprs_rlcmac_ul_tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ul_tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+ return ul_tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_set_destructor(ul_tbf, ul_tbf_dtor);</span><br><span style="color: hsl(120, 100%, 40%);">+ new (ul_tbf) gprs_rlcmac_ul_tbf(bts->bts, ms);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add(&ul_tbf->list(), &bts->bts->ul_tbfs());</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf->bts->do_rate_ctr_inc(CTR_TBF_UL_ALLOCATED);</span><br><span style="color: hsl(120, 100%, 40%);">+ TBF_SET_ASS_ON(ul_tbf, GPRS_RLCMAC_FLAG_PACCH, false);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ms->attach_tbf(ul_tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf->update_ms(tlli, GPRS_RLCMAC_UL_TBF);</span><br><span style="color: hsl(120, 100%, 40%);">+ TBF_SET_ASS_STATE_UL(ul_tbf, GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ);</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf->control_ts = ts;</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf->trx = trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf->m_ctrs = rate_ctr_group_alloc(ul_tbf, &tbf_ctrg_desc, next_tbf_ctr_group_id++);</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf->m_ul_egprs_ctrs = rate_ctr_group_alloc(ul_tbf,</span><br><span style="color: hsl(120, 100%, 40%);">+ &tbf_ul_egprs_ctrg_desc,</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf->m_ctrs->idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf->m_ul_gprs_ctrs = rate_ctr_group_alloc(ul_tbf,</span><br><span style="color: hsl(120, 100%, 40%);">+ &tbf_ul_gprs_ctrg_desc,</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf->m_ctrs->idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ul_tbf->m_ctrs || !ul_tbf->m_ul_egprs_ctrs || !ul_tbf->m_ul_gprs_ctrs) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTBF(ul_tbf, LOGL_ERROR, "Cound not allocate TBF UL rate counters\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(ul_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%);">+ return ul_tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> gprs_rlcmac_ul_tbf::gprs_rlcmac_ul_tbf(BTS *bts_, GprsMs *ms) :</span><br><span> gprs_rlcmac_tbf(bts_, ms, GPRS_RLCMAC_UL_TBF),</span><br><span> m_rx_counter(0),</span><br><span>diff --git a/src/tbf_ul.h b/src/tbf_ul.h</span><br><span>index 606551c..9ccdf62 100644</span><br><span>--- a/src/tbf_ul.h</span><br><span>+++ b/src/tbf_ul.h</span><br><span>@@ -130,4 +130,10 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, bool single_slot);</span><br><span style="color: hsl(120, 100%, 40%);">+struct gprs_rlcmac_ul_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts, GprsMs *ms,</span><br><span style="color: hsl(120, 100%, 40%);">+ int8_t use_trx, uint32_t tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+struct gprs_rlcmac_ul_tbf *handle_tbf_reject(struct gprs_rlcmac_bts *bts,</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsMs *ms, uint32_t tlli, uint8_t trx_no, uint8_t ts_no);</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/+/20859">change 20859</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/+/20859"/><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: Ifd98abbcce49e4605c764267965903fbf9f35867 </div>
<div style="display:none"> Gerrit-Change-Number: 20859 </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>