Split PCU global PCU object from BTS object
Currently the BTS object (and gprs_rlcmac_bts struct) are used to hold
both PCU global fields and BTS specific fields, all mangled together.
The BTS is even accessed in lots of places by means of a singleton.
This patch introduces a new struct gprs_pcu object aimed at holding all
global state, and several fields are already moved from BTS to it. The
new object can be accessed as global variable "the_pcu", reusing and
including an already exisitng "the_pcu" global variable only used for
bssgp related purposes so far.
This is only a first step towards having a complete split global pcu and
BTS, some fields are still kept in BTS and will be moved over follow-up
smaller patches in the future (since this patch is already quite big).
So far, the code still only supports one BTS, which can be accessed
using the_pcu->bts. In the future that field will be replaced with a
list, and the BTS singletons will be removed.
The cur_fn output changes in TbfTest are actually a side effect fix,
since the singleton main_bts() now points internally to the_pcu->bts,
hence the same we allocate and assign in the test. Beforehand, "the_bts"
was allocated in the stack while main_bts() still returned an unrelated
singleton BTS object instance.
Related: OS#4935
Change-Id: I88e3c6471b80245ce3798223f1a61190f14aa840
diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp
index 8fa76dd..c5ce730 100644
--- a/tests/edge/EdgeTest.cpp
+++ b/tests/edge/EdgeTest.cpp
@@ -1157,7 +1157,7 @@
gprs_rlcmac_trx *trx;
bts = the_bts->bts_data();
- bts->alloc_algorithm = alloc_algorithm_a;
+ the_pcu->alloc_algorithm = alloc_algorithm_a;
bts->initial_cs_dl = cs;
bts->initial_cs_ul = cs;
trx = &bts->trx[0];
@@ -1254,7 +1254,7 @@
static void uplink_header_type2_test(void)
{
- BTS the_bts;
+ BTS the_bts(the_pcu);
int ts_no = 7;
uint32_t fn = 2654218;
uint16_t qta = 31;
@@ -1371,7 +1371,7 @@
void uplink_header_type1_test(void)
{
- BTS the_bts;
+ BTS the_bts(the_pcu);
int ts_no = 7;
uint32_t fn = 2654218;
uint16_t qta = 31;
@@ -1398,6 +1398,8 @@
log_set_use_color(osmo_stderr_target, 0);
log_set_print_filename(osmo_stderr_target, 0);
+ the_pcu = gprs_pcu_alloc(tall_pcu_ctx);
+
vty_init(&pcu_vty_info);
pcu_vty_init();
@@ -1412,6 +1414,8 @@
if (getenv("TALLOC_REPORT_FULL"))
talloc_report_full(tall_pcu_ctx, stderr);
+
+ talloc_free(the_pcu);
return EXIT_SUCCESS;
}