Add new PDCH UL Controller, drop SBAllocator class
Right now we handle different types of UL allocations in different
classes like PollAllocator and SBAllocator, and they usually don't take
into account the other one in most cases. Furthermore, those objects are
usually per-BTS object, instead of per PDCH object.
This is a first step towards having a unified per-PDCH controller which
takes care of controlling what is scheduled and hence expected on the
uplink. Each PDCH has a UL Controller which keeps track of all reserved
uplink frame, be it SB, RRBP poll or USF assigned, all under the same
API.
As a first step, only the SBA part is fully implemented and used (being
it the easiest part to replace); TBF poll+usf will come in follow-up
patches later on. As a result, the SBAllocator per-BTS class dissappears
but some of its code is refactored/reused to provide more features to the
gprs_rlcmac_sba object, which is also further integrated into the new UL
Controller.
Related: OS#5020
Change-Id: I84b24beea4a1aa2c1528f41435f77bd16df2b947
diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp
index d921cbe..f7524c9 100644
--- a/tests/tbf/TbfTest.cpp
+++ b/tests/tbf/TbfTest.cpp
@@ -1793,7 +1793,7 @@
*/
rc = bts_handle_rach(bts, 0x70, rach_fn, qta);
- OSMO_ASSERT(rc == -EINVAL);
+ OSMO_ASSERT(rc == -EBUSY);
TALLOC_FREE(the_pcu);
fprintf(stderr, "=== end %s ===\n", __func__);
diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err
index f483625..2f370d4 100644
--- a/tests/tbf/TbfTest.err
+++ b/tests/tbf/TbfTest.err
@@ -6232,7 +6232,7 @@
MS requests Uplink resource on CCCH/RACH: ra=0x70 (8 bit) Fn=2654167 qta=31
MS requests single block allocation
No PDCH available.
-No PDCH resource for single block allocation: rc=-22
+No PDCH resource for single block allocation
Tx Immediate Assignment Reject on AGCH
=== end test_immediate_assign_rej_single_block ===
=== start test_tbf_egprs_two_phase_puan ===