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/app_info/AppInfoTest.cpp b/tests/app_info/AppInfoTest.cpp
index 6e33538..962ead4 100644
--- a/tests/app_info/AppInfoTest.cpp
+++ b/tests/app_info/AppInfoTest.cpp
@@ -84,7 +84,7 @@
fprintf(stderr, "--- %s ---\n", __func__);
bts_data = bts->bts_data();
- bts_data->alloc_algorithm = alloc_algorithm_b;
+ the_pcu->alloc_algorithm = alloc_algorithm_b;
trx = bts_data->trx;
trx->pdch[4].enable();
@@ -157,6 +157,7 @@
BTS::main_bts()->cleanup();
/* FIXME: talloc report disabled, because bts->ms_alloc() in prepare_bts_with_two_dl_tbf_subscr() causes leak */
/* talloc_report_full(tall_pcu_ctx, stderr); */
+ talloc_free(the_pcu);
talloc_free(tall_pcu_ctx);
}
@@ -172,6 +173,9 @@
log_set_print_filename(osmo_stderr_target, 0);
log_parse_category_mask(osmo_stderr_target, "DL1IF,1:DRLCMAC,3:DRLCMACSCHED,1");
+ the_pcu = gprs_pcu_alloc(tall_pcu_ctx);
+ the_pcu->bts = bts_alloc(the_pcu);
+
test_enc_zero_len();
test_enc(&req);
test_pcu_rx_no_subscr_with_active_tbf();