This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20859 )
Change subject: Move ul_tbf allocation code to correct file
......................................................................
Move ul_tbf allocation code to correct file
Change-Id: Ifd98abbcce49e4605c764267965903fbf9f35867
---
M src/gprs_ms.h
M src/tbf.cpp
M src/tbf.h
M src/tbf_ul.cpp
M src/tbf_ul.h
5 files changed, 170 insertions(+), 167 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/59/20859/1
diff --git a/src/gprs_ms.h b/src/gprs_ms.h
index 0a1dda7..412a400 100644
--- a/src/gprs_ms.h
+++ b/src/gprs_ms.h
@@ -25,6 +25,7 @@
#include "cxx_linuxlist.h"
#include "llc.h"
#include "tbf.h"
+#include "tbf_ul.h"
#include "tbf_dl.h"
#include "pcu_l1_if.h"
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 305a549..b2aad0c 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -57,7 +57,7 @@
extern void *tall_pcu_ctx;
-static unsigned int next_tbf_ctr_group_id = 0; /* Incrementing group id */
+unsigned int next_tbf_ctr_group_id = 0; /* Incrementing group id */
static void tbf_timer_cb(void *_tbf);
@@ -128,26 +128,7 @@
{ "egprs:downlink:mcs9", "MCS9 " },
};
-static const struct rate_ctr_desc tbf_ul_gprs_ctr_description[] = {
- { "gprs:uplink:cs1", "CS1 " },
- { "gprs:uplink:cs2", "CS2 " },
- { "gprs:uplink:cs3", "CS3 " },
- { "gprs:uplink:cs4", "CS4 " },
-};
-
-static const struct rate_ctr_desc tbf_ul_egprs_ctr_description[] = {
- { "egprs:uplink:mcs1", "MCS1 " },
- { "egprs:uplink:mcs2", "MCS2 " },
- { "egprs:uplink:mcs3", "MCS3 " },
- { "egprs:uplink:mcs4", "MCS4 " },
- { "egprs:uplink:mcs5", "MCS5 " },
- { "egprs:uplink:mcs6", "MCS6 " },
- { "egprs:uplink:mcs7", "MCS7 " },
- { "egprs:uplink:mcs8", "MCS8 " },
- { "egprs:uplink:mcs9", "MCS9 " },
-};
-
-static const struct rate_ctr_group_desc tbf_ctrg_desc = {
+const struct rate_ctr_group_desc tbf_ctrg_desc = {
"pcu:tbf",
"TBF Statistics",
OSMO_STATS_CLASS_SUBSCRIBER,
@@ -171,22 +152,6 @@
tbf_dl_egprs_ctr_description,
};
-static const struct rate_ctr_group_desc tbf_ul_gprs_ctrg_desc = {
- "tbf:gprs",
- "Data Blocks",
- OSMO_STATS_CLASS_SUBSCRIBER,
- ARRAY_SIZE(tbf_ul_gprs_ctr_description),
- tbf_ul_gprs_ctr_description,
-};
-
-static const struct rate_ctr_group_desc tbf_ul_egprs_ctrg_desc = {
- "tbf:egprs",
- "Data Blocks",
- OSMO_STATS_CLASS_SUBSCRIBER,
- ARRAY_SIZE(tbf_ul_egprs_ctr_description),
- tbf_ul_egprs_ctr_description,
-};
-
static void setup_egprs_mode(gprs_rlcmac_bts *bts, GprsMs *ms)
{
if (mcs_is_edge_gmsk(mcs_get_egprs_by_num(bts->max_mcs_ul)) &&
@@ -407,29 +372,6 @@
ms()->confirm_tlli(tlli);
}
-gprs_rlcmac_ul_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx,
- uint32_t tlli)
-{
- struct gprs_rlcmac_ul_tbf *tbf;
-
-/* FIXME: Copy and paste with tbf_new_dl_assignment */
- /* create new TBF, use same TRX as DL TBF */
- /* use multislot class of downlink TBF */
- tbf = tbf_alloc_ul_tbf(bts, ms, use_trx, false);
- if (!tbf) {
- LOGP(DTBF, LOGL_NOTICE, "No PDCH resource\n");
- /* FIXME: send reject */
- return NULL;
- }
- tbf->m_contention_resolution_done = 1;
- TBF_SET_ASS_ON(tbf, GPRS_RLCMAC_FLAG_PACCH, false);
- T_START(tbf, T3169, 3169, "allocation (UL-TBF)", true);
- tbf->update_ms(tlli, GPRS_RLCMAC_UL_TBF);
- OSMO_ASSERT(tbf->ms());
-
- return tbf;
-}
-
static void tbf_unlink_pdch(struct gprs_rlcmac_tbf *tbf)
{
int ts;
@@ -952,62 +894,6 @@
return 0;
}
-static int ul_tbf_dtor(struct gprs_rlcmac_ul_tbf *tbf)
-{
- tbf->~gprs_rlcmac_ul_tbf();
- return 0;
-}
-
-struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, bool single_slot)
-{
- struct gprs_rlcmac_ul_tbf *tbf;
- int rc;
-
- OSMO_ASSERT(ms != NULL);
-
- if (ms->egprs_ms_class() == 0 && bts->egprs_enabled) {
- LOGP(DTBF, LOGL_NOTICE, "Not accepting non-EGPRS phone in EGPRS-only mode\n");
- bts->bts->do_rate_ctr_inc(CTR_TBF_FAILED_EGPRS_ONLY);
- return NULL;
- }
-
- LOGP(DTBF, LOGL_DEBUG, "********** UL-TBF starts here **********\n");
- LOGP(DTBF, LOGL_INFO, "Allocating UL TBF: MS_CLASS=%d/%d\n",
- ms->ms_class(), ms->egprs_ms_class());
-
- tbf = talloc(tall_pcu_ctx, struct gprs_rlcmac_ul_tbf);
- if (!tbf)
- return NULL;
- talloc_set_destructor(tbf, ul_tbf_dtor);
- new (tbf) gprs_rlcmac_ul_tbf(bts->bts, ms);
-
- rc = tbf->setup(use_trx, single_slot);
-
- /* if no resource */
- if (rc < 0) {
- talloc_free(tbf);
- return NULL;
- }
-
- if (tbf->is_egprs_enabled())
- tbf->set_window_size();
-
- tbf->m_ul_egprs_ctrs = rate_ctr_group_alloc(tbf,
- &tbf_ul_egprs_ctrg_desc, tbf->m_ctrs->idx);
- tbf->m_ul_gprs_ctrs = rate_ctr_group_alloc(tbf,
- &tbf_ul_gprs_ctrg_desc, tbf->m_ctrs->idx);
- if (!tbf->m_ul_egprs_ctrs || !tbf->m_ul_gprs_ctrs) {
- LOGPTBF(tbf, LOGL_ERROR, "Couldn't allocate TBF UL counters\n");
- talloc_free(tbf);
- return NULL;
- }
-
- llist_add(&tbf->list(), &bts->bts->ul_tbfs());
- tbf->bts->do_rate_ctr_inc(CTR_TBF_UL_ALLOCATED);
-
- return tbf;
-}
-
static int dl_tbf_dtor(struct gprs_rlcmac_dl_tbf *tbf)
{
tbf->~gprs_rlcmac_dl_tbf();
@@ -1472,45 +1358,3 @@
{
return ts == control_ts;
}
-
-struct gprs_rlcmac_ul_tbf *handle_tbf_reject(struct gprs_rlcmac_bts *bts,
- GprsMs *ms, uint32_t tlli, uint8_t trx_no, uint8_t ts)
-{
- struct gprs_rlcmac_ul_tbf *ul_tbf = NULL;
- struct gprs_rlcmac_trx *trx = &bts->trx[trx_no];
-
- if (!ms)
- ms = bts->bts->ms_alloc(0, 0);
- ms->set_tlli(tlli);
-
- ul_tbf = talloc(tall_pcu_ctx, struct gprs_rlcmac_ul_tbf);
- if (!ul_tbf)
- return ul_tbf;
-
- talloc_set_destructor(ul_tbf, ul_tbf_dtor);
- new (ul_tbf) gprs_rlcmac_ul_tbf(bts->bts, ms);
-
- llist_add(&ul_tbf->list(), &bts->bts->ul_tbfs());
- ul_tbf->bts->do_rate_ctr_inc(CTR_TBF_UL_ALLOCATED);
- TBF_SET_ASS_ON(ul_tbf, GPRS_RLCMAC_FLAG_PACCH, false);
-
- ms->attach_tbf(ul_tbf);
- ul_tbf->update_ms(tlli, GPRS_RLCMAC_UL_TBF);
- TBF_SET_ASS_STATE_UL(ul_tbf, GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ);
- ul_tbf->control_ts = ts;
- ul_tbf->trx = trx;
- ul_tbf->m_ctrs = rate_ctr_group_alloc(ul_tbf, &tbf_ctrg_desc, next_tbf_ctr_group_id++);
- ul_tbf->m_ul_egprs_ctrs = rate_ctr_group_alloc(ul_tbf,
- &tbf_ul_egprs_ctrg_desc,
- ul_tbf->m_ctrs->idx);
- ul_tbf->m_ul_gprs_ctrs = rate_ctr_group_alloc(ul_tbf,
- &tbf_ul_gprs_ctrg_desc,
- ul_tbf->m_ctrs->idx);
- if (!ul_tbf->m_ctrs || !ul_tbf->m_ul_egprs_ctrs || !ul_tbf->m_ul_gprs_ctrs) {
- LOGPTBF(ul_tbf, LOGL_ERROR, "Cound not allocate TBF UL rate counters\n");
- talloc_free(ul_tbf);
- return NULL;
- }
-
- return ul_tbf;
-}
diff --git a/src/tbf.h b/src/tbf.h
index 2a3dfbd..65654ea 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -124,6 +124,9 @@
TBF_CTR_EGPRS_DL_MCS9,
};
+extern const struct rate_ctr_group_desc tbf_ctrg_desc;
+extern unsigned int next_tbf_ctr_group_id;
+
#define LOGPTBF(tbf, level, fmt, args...) LOGP(DTBF, level, "%s " fmt, tbf_name(tbf), ## args)
enum tbf_timers {
@@ -345,19 +348,10 @@
mutable char m_name_buf[60];
};
-
-struct gprs_rlcmac_ul_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts, GprsMs *ms,
- int8_t use_trx, uint32_t tlli);
-
-struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, bool single_slot);
-
struct gprs_rlcmac_dl_tbf *tbf_alloc_dl_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, bool single_slot);
void tbf_free(struct gprs_rlcmac_tbf *tbf);
-struct gprs_rlcmac_ul_tbf *handle_tbf_reject(struct gprs_rlcmac_bts *bts,
- GprsMs *ms, uint32_t tlli, uint8_t trx_no, uint8_t ts_no);
-
int tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf);
inline bool gprs_rlcmac_tbf::state_is(enum gprs_rlcmac_tbf_state rhs) const
diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp
index ed14670..4d8588c 100644
--- a/src/tbf_ul.cpp
+++ b/src/tbf_ul.cpp
@@ -39,6 +39,7 @@
#include <osmocom/core/bitvec.h>
#include <osmocom/core/logging.h>
#include <osmocom/core/rate_ctr.h>
+ #include <osmocom/core/stats.h>
#include <osmocom/core/utils.h>
#include <osmocom/gprs/gprs_bssgp_bss.h>
#include <osmocom/gprs/protocol/gsm_08_18.h>
@@ -54,6 +55,163 @@
extern void *tall_pcu_ctx;
+static const struct rate_ctr_desc tbf_ul_gprs_ctr_description[] = {
+ { "gprs:uplink:cs1", "CS1 " },
+ { "gprs:uplink:cs2", "CS2 " },
+ { "gprs:uplink:cs3", "CS3 " },
+ { "gprs:uplink:cs4", "CS4 " },
+};
+
+static const struct rate_ctr_desc tbf_ul_egprs_ctr_description[] = {
+ { "egprs:uplink:mcs1", "MCS1 " },
+ { "egprs:uplink:mcs2", "MCS2 " },
+ { "egprs:uplink:mcs3", "MCS3 " },
+ { "egprs:uplink:mcs4", "MCS4 " },
+ { "egprs:uplink:mcs5", "MCS5 " },
+ { "egprs:uplink:mcs6", "MCS6 " },
+ { "egprs:uplink:mcs7", "MCS7 " },
+ { "egprs:uplink:mcs8", "MCS8 " },
+ { "egprs:uplink:mcs9", "MCS9 " },
+};
+
+static const struct rate_ctr_group_desc tbf_ul_gprs_ctrg_desc = {
+ "tbf:gprs",
+ "Data Blocks",
+ OSMO_STATS_CLASS_SUBSCRIBER,
+ ARRAY_SIZE(tbf_ul_gprs_ctr_description),
+ tbf_ul_gprs_ctr_description,
+};
+
+static const struct rate_ctr_group_desc tbf_ul_egprs_ctrg_desc = {
+ "tbf:egprs",
+ "Data Blocks",
+ OSMO_STATS_CLASS_SUBSCRIBER,
+ ARRAY_SIZE(tbf_ul_egprs_ctr_description),
+ tbf_ul_egprs_ctr_description,
+};
+
+static int ul_tbf_dtor(struct gprs_rlcmac_ul_tbf *tbf)
+{
+ tbf->~gprs_rlcmac_ul_tbf();
+ return 0;
+}
+
+struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, bool single_slot)
+{
+ struct gprs_rlcmac_ul_tbf *tbf;
+ int rc;
+
+ OSMO_ASSERT(ms != NULL);
+
+ if (ms->egprs_ms_class() == 0 && bts->egprs_enabled) {
+ LOGP(DTBF, LOGL_NOTICE, "Not accepting non-EGPRS phone in EGPRS-only mode\n");
+ bts->bts->do_rate_ctr_inc(CTR_TBF_FAILED_EGPRS_ONLY);
+ return NULL;
+ }
+
+ LOGP(DTBF, LOGL_DEBUG, "********** UL-TBF starts here **********\n");
+ LOGP(DTBF, LOGL_INFO, "Allocating UL TBF: MS_CLASS=%d/%d\n",
+ ms->ms_class(), ms->egprs_ms_class());
+
+ tbf = talloc(tall_pcu_ctx, struct gprs_rlcmac_ul_tbf);
+ if (!tbf)
+ return NULL;
+ talloc_set_destructor(tbf, ul_tbf_dtor);
+ new (tbf) gprs_rlcmac_ul_tbf(bts->bts, ms);
+
+ rc = tbf->setup(use_trx, single_slot);
+
+ /* if no resource */
+ if (rc < 0) {
+ talloc_free(tbf);
+ return NULL;
+ }
+
+ if (tbf->is_egprs_enabled())
+ tbf->set_window_size();
+
+ tbf->m_ul_egprs_ctrs = rate_ctr_group_alloc(tbf,
+ &tbf_ul_egprs_ctrg_desc, tbf->m_ctrs->idx);
+ tbf->m_ul_gprs_ctrs = rate_ctr_group_alloc(tbf,
+ &tbf_ul_gprs_ctrg_desc, tbf->m_ctrs->idx);
+ if (!tbf->m_ul_egprs_ctrs || !tbf->m_ul_gprs_ctrs) {
+ LOGPTBF(tbf, LOGL_ERROR, "Couldn't allocate TBF UL counters\n");
+ talloc_free(tbf);
+ return NULL;
+ }
+
+ llist_add(&tbf->list(), &bts->bts->ul_tbfs());
+ tbf->bts->do_rate_ctr_inc(CTR_TBF_UL_ALLOCATED);
+
+ return tbf;
+}
+
+
+gprs_rlcmac_ul_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx,
+ uint32_t tlli)
+{
+ struct gprs_rlcmac_ul_tbf *tbf;
+
+/* FIXME: Copy and paste with tbf_new_dl_assignment */
+ /* create new TBF, use same TRX as DL TBF */
+ /* use multislot class of downlink TBF */
+ tbf = tbf_alloc_ul_tbf(bts, ms, use_trx, false);
+ if (!tbf) {
+ LOGP(DTBF, LOGL_NOTICE, "No PDCH resource\n");
+ /* FIXME: send reject */
+ return NULL;
+ }
+ tbf->m_contention_resolution_done = 1;
+ TBF_SET_ASS_ON(tbf, GPRS_RLCMAC_FLAG_PACCH, false);
+ T_START(tbf, T3169, 3169, "allocation (UL-TBF)", true);
+ tbf->update_ms(tlli, GPRS_RLCMAC_UL_TBF);
+ OSMO_ASSERT(tbf->ms());
+
+ return tbf;
+}
+
+struct gprs_rlcmac_ul_tbf *handle_tbf_reject(struct gprs_rlcmac_bts *bts,
+ GprsMs *ms, uint32_t tlli, uint8_t trx_no, uint8_t ts)
+{
+ struct gprs_rlcmac_ul_tbf *ul_tbf = NULL;
+ struct gprs_rlcmac_trx *trx = &bts->trx[trx_no];
+
+ if (!ms)
+ ms = bts->bts->ms_alloc(0, 0);
+ ms->set_tlli(tlli);
+
+ ul_tbf = talloc(tall_pcu_ctx, struct gprs_rlcmac_ul_tbf);
+ if (!ul_tbf)
+ return ul_tbf;
+
+ talloc_set_destructor(ul_tbf, ul_tbf_dtor);
+ new (ul_tbf) gprs_rlcmac_ul_tbf(bts->bts, ms);
+
+ llist_add(&ul_tbf->list(), &bts->bts->ul_tbfs());
+ ul_tbf->bts->do_rate_ctr_inc(CTR_TBF_UL_ALLOCATED);
+ TBF_SET_ASS_ON(ul_tbf, GPRS_RLCMAC_FLAG_PACCH, false);
+
+ ms->attach_tbf(ul_tbf);
+ ul_tbf->update_ms(tlli, GPRS_RLCMAC_UL_TBF);
+ TBF_SET_ASS_STATE_UL(ul_tbf, GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ);
+ ul_tbf->control_ts = ts;
+ ul_tbf->trx = trx;
+ ul_tbf->m_ctrs = rate_ctr_group_alloc(ul_tbf, &tbf_ctrg_desc, next_tbf_ctr_group_id++);
+ ul_tbf->m_ul_egprs_ctrs = rate_ctr_group_alloc(ul_tbf,
+ &tbf_ul_egprs_ctrg_desc,
+ ul_tbf->m_ctrs->idx);
+ ul_tbf->m_ul_gprs_ctrs = rate_ctr_group_alloc(ul_tbf,
+ &tbf_ul_gprs_ctrg_desc,
+ ul_tbf->m_ctrs->idx);
+ if (!ul_tbf->m_ctrs || !ul_tbf->m_ul_egprs_ctrs || !ul_tbf->m_ul_gprs_ctrs) {
+ LOGPTBF(ul_tbf, LOGL_ERROR, "Cound not allocate TBF UL rate counters\n");
+ talloc_free(ul_tbf);
+ return NULL;
+ }
+
+ return ul_tbf;
+}
+
gprs_rlcmac_ul_tbf::gprs_rlcmac_ul_tbf(BTS *bts_, GprsMs *ms) :
gprs_rlcmac_tbf(bts_, ms, GPRS_RLCMAC_UL_TBF),
m_rx_counter(0),
diff --git a/src/tbf_ul.h b/src/tbf_ul.h
index 606551c..9ccdf62 100644
--- a/src/tbf_ul.h
+++ b/src/tbf_ul.h
@@ -130,4 +130,10 @@
return NULL;
}
+struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, bool single_slot);
+struct gprs_rlcmac_ul_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts, GprsMs *ms,
+ int8_t use_trx, uint32_t tlli);
+struct gprs_rlcmac_ul_tbf *handle_tbf_reject(struct gprs_rlcmac_bts *bts,
+ GprsMs *ms, uint32_t tlli, uint8_t trx_no, uint8_t ts_no);
+
#endif
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20859
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ifd98abbcce49e4605c764267965903fbf9f35867
Gerrit-Change-Number: 20859
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201023/a34453d2/attachment.htm>