From 86b6f05d19c8559b99d548730e54c1a4bfb7beba Mon Sep 17 00:00:00 2001 From: Jacob Erlbeck Date: Fri, 27 Nov 2015 15:17:34 +0100 Subject: edge: Support EGPRS multislot class handling in tbf_alloc Add an egprs_ms_class argument to the allocation functions and set/pass it where necessary. Sponsored-by: On-Waves ehf --- tests/alloc/AllocTest.cpp | 36 +++++++++++++++++++----------------- tests/tbf/TbfTest.cpp | 6 +++--- tests/tbf/TbfTest.err | 20 ++++++++++---------- 3 files changed, 32 insertions(+), 30 deletions(-) (limited to 'tests') diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index 4b532246..d338b786 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -39,12 +39,14 @@ int16_t spoof_mnc = 0, spoof_mcc = 0; static gprs_rlcmac_tbf *tbf_alloc(struct gprs_rlcmac_bts *bts, GprsMs *ms, gprs_rlcmac_tbf_direction dir, uint8_t use_trx, - uint8_t ms_class, uint8_t single_slot) + uint8_t ms_class, uint8_t egprs_ms_class, uint8_t single_slot) { if (dir == GPRS_RLCMAC_UL_TBF) - return tbf_alloc_ul_tbf(bts, ms, use_trx, ms_class, single_slot); + return tbf_alloc_ul_tbf(bts, ms, use_trx, + ms_class, egprs_ms_class, single_slot); else - return tbf_alloc_dl_tbf(bts, ms, use_trx, ms_class, single_slot); + return tbf_alloc_dl_tbf(bts, ms, use_trx, + ms_class, egprs_ms_class, single_slot); } static void check_tfi_usage(BTS *the_bts) @@ -131,7 +133,7 @@ static void test_alloc_a(gprs_rlcmac_tbf_direction dir, * least this part is working okay. */ for (i = 0; i < (int)ARRAY_SIZE(tbfs); ++i) { - tbfs[i] = tbf_alloc(bts, NULL, dir, -1, 0, 0); + tbfs[i] = tbf_alloc(bts, NULL, dir, -1, 0, 0, 0); if (tbfs[i] == NULL) break; @@ -148,7 +150,7 @@ static void test_alloc_a(gprs_rlcmac_tbf_direction dir, if (tbfs[i]) tbf_free(tbfs[i]); - tbfs[tfi] = tbf_alloc(bts, NULL, dir, -1, 0, 0); + tbfs[tfi] = tbf_alloc(bts, NULL, dir, -1, 0, 0, 0); OSMO_ASSERT(tbfs[tfi]); tbf_free(tbfs[tfi]); } @@ -200,7 +202,7 @@ static void test_alloc_b(int ms_class) trx->pdch[6].enable(); trx->pdch[7].enable(); - ul_tbf = tbf_alloc_ul_tbf(bts, NULL, -1, ms_class, 1); + ul_tbf = tbf_alloc_ul_tbf(bts, NULL, -1, ms_class, 0, 1); OSMO_ASSERT(ul_tbf); OSMO_ASSERT(ul_tbf->ms()); OSMO_ASSERT(ul_tbf->ms()->current_trx()); @@ -208,7 +210,7 @@ static void test_alloc_b(int ms_class) dump_assignment(ul_tbf, "UL"); /* assume final ack has not been sent */ - dl_tbf = tbf_alloc_dl_tbf(bts, ul_tbf->ms(), trx_no, ms_class, 0); + dl_tbf = tbf_alloc_dl_tbf(bts, ul_tbf->ms(), trx_no, ms_class, 0, 0); OSMO_ASSERT(dl_tbf); dump_assignment(dl_tbf, "DL"); @@ -242,7 +244,7 @@ static void test_alloc_b(int ms_class) trx->pdch[6].enable(); trx->pdch[7].enable(); - dl_tbf = tbf_alloc_dl_tbf(bts, NULL, -1, ms_class, 1); + dl_tbf = tbf_alloc_dl_tbf(bts, NULL, -1, ms_class, 0, 1); dl_tbf->update_ms(0x23, GPRS_RLCMAC_DL_TBF); OSMO_ASSERT(dl_tbf); OSMO_ASSERT(dl_tbf->ms()); @@ -250,7 +252,7 @@ static void test_alloc_b(int ms_class) trx_no = dl_tbf->ms()->current_trx()->trx_no; dump_assignment(dl_tbf, "DL"); - ul_tbf = tbf_alloc_ul_tbf(bts, dl_tbf->ms(), trx_no, ms_class, 0); + ul_tbf = tbf_alloc_ul_tbf(bts, dl_tbf->ms(), trx_no, ms_class, 0, 0); ul_tbf->update_ms(0x23, GPRS_RLCMAC_UL_TBF); ul_tbf->m_contention_resolution_done = 1; OSMO_ASSERT(ul_tbf); @@ -292,7 +294,7 @@ static void test_alloc_b(int ms_class) tfi = the_bts.tfi_find_free(GPRS_RLCMAC_UL_TBF, &trx_no, -1); OSMO_ASSERT(tfi >= 0); - ul_tbf = tbf_alloc_ul_tbf(bts, NULL, .1, ms_class, 0); + ul_tbf = tbf_alloc_ul_tbf(bts, NULL, .1, ms_class, 0, 0); OSMO_ASSERT(ul_tbf); OSMO_ASSERT(ul_tbf->ms()); OSMO_ASSERT(ul_tbf->ms()->current_trx()); @@ -300,7 +302,7 @@ static void test_alloc_b(int ms_class) dump_assignment(ul_tbf, "UL"); /* assume final ack has not been sent */ - dl_tbf = tbf_alloc_dl_tbf(bts, ul_tbf->ms(), trx_no, ms_class, 0); + dl_tbf = tbf_alloc_dl_tbf(bts, ul_tbf->ms(), trx_no, ms_class, 0, 0); OSMO_ASSERT(dl_tbf); dump_assignment(dl_tbf, "DL"); @@ -355,14 +357,14 @@ static void test_alloc_b(bool ts0, bool ts1, bool ts2, bool ts3, bool ts4, bool ENABLE_PDCH(6, ts6, trx); ENABLE_PDCH(7, ts7, trx); - ul_tbf = tbf_alloc_ul_tbf(bts, NULL, -1, ms_class, 1); + ul_tbf = tbf_alloc_ul_tbf(bts, NULL, -1, ms_class, 0, 1); OSMO_ASSERT(ul_tbf->ms()); OSMO_ASSERT(ul_tbf->ms()->current_trx()); trx_no = ul_tbf->ms()->current_trx()->trx_no; OSMO_ASSERT(ul_tbf); /* assume final ack has not been sent */ - dl_tbf = tbf_alloc_dl_tbf(bts, ul_tbf->ms(), trx_no, ms_class, 0); + dl_tbf = tbf_alloc_dl_tbf(bts, ul_tbf->ms(), trx_no, ms_class, 0, 0); OSMO_ASSERT(dl_tbf); /* verify that both are on the same ts */ @@ -399,14 +401,14 @@ static void test_alloc_b(bool ts0, bool ts1, bool ts2, bool ts3, bool ts4, bool ENABLE_PDCH(6, ts6, trx); ENABLE_PDCH(7, ts7, trx); - dl_tbf = tbf_alloc_dl_tbf(bts, NULL, -1, ms_class, 1); + dl_tbf = tbf_alloc_dl_tbf(bts, NULL, -1, ms_class, 0, 1); OSMO_ASSERT(dl_tbf); OSMO_ASSERT(dl_tbf->ms()); OSMO_ASSERT(dl_tbf->ms()->current_trx()); trx_no = dl_tbf->ms()->current_trx()->trx_no; dl_tbf->update_ms(0x23, GPRS_RLCMAC_DL_TBF); - ul_tbf = tbf_alloc_ul_tbf(bts, dl_tbf->ms(), trx_no, ms_class, 0); + ul_tbf = tbf_alloc_ul_tbf(bts, dl_tbf->ms(), trx_no, ms_class, 0, 0); OSMO_ASSERT(ul_tbf); ul_tbf->update_ms(0x23, GPRS_RLCMAC_UL_TBF); ul_tbf->m_contention_resolution_done = 1; @@ -495,7 +497,7 @@ static GprsMs *alloc_tbfs(BTS *the_bts, GprsMs *ms, unsigned ms_class, case TEST_MODE_UL_AND_DL: if (ms && ms->ul_tbf()) tbf_free(ms->ul_tbf()); - tbf = tbf_alloc_ul_tbf(bts, ms, trx_no, ms_class, 0); + tbf = tbf_alloc_ul_tbf(bts, ms, trx_no, ms_class, 0, 0); if (tbf == NULL) return NULL; break; @@ -504,7 +506,7 @@ static GprsMs *alloc_tbfs(BTS *the_bts, GprsMs *ms, unsigned ms_class, case TEST_MODE_DL_AND_UL: if (ms && ms->dl_tbf()) tbf_free(ms->dl_tbf()); - tbf = tbf_alloc_dl_tbf(bts, ms, trx_no, ms_class, 0); + tbf = tbf_alloc_dl_tbf(bts, ms, trx_no, ms_class, 0, 0); if (tbf == NULL) return NULL; } diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 92679bcf..5ec93573 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -90,14 +90,14 @@ static void test_tbf_tlli_update() */ gprs_rlcmac_tbf *dl_tbf = tbf_alloc_dl_tbf(the_bts.bts_data(), NULL, - 0, 0, 0); + 0, 0, 0, 0); OSMO_ASSERT(dl_tbf != NULL); dl_tbf->update_ms(0x2342, GPRS_RLCMAC_DL_TBF); dl_tbf->set_ta(4); gprs_rlcmac_tbf *ul_tbf = tbf_alloc_ul_tbf(the_bts.bts_data(), dl_tbf->ms(), - 0, 0, 0); + 0, 0, 0, 0); OSMO_ASSERT(ul_tbf != NULL); ul_tbf->update_ms(0x2342, GPRS_RLCMAC_UL_TBF); @@ -174,7 +174,7 @@ static gprs_rlcmac_dl_tbf *create_dl_tbf(BTS *the_bts, uint8_t ms_class, tfi = the_bts->tfi_find_free(GPRS_RLCMAC_DL_TBF, &trx_no, -1); OSMO_ASSERT(tfi >= 0); - dl_tbf = tbf_alloc_dl_tbf(bts, NULL, trx_no, ms_class, 1); + dl_tbf = tbf_alloc_dl_tbf(bts, NULL, trx_no, ms_class, 0, 1); check_tbf(dl_tbf); /* "Establish" the DL TBF */ diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 2869ffd0..77366b9c 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -17,7 +17,7 @@ Allocated TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL): trx = 0, ul_slots = 04, The MS object cannot fully confirm an unexpected TLLI: 0x00002342, partly confirmed Modifying MS object, TLLI = 0x00002342, TA 0 -> 4 ********** TBF starts here ********** -Allocating UL TBF: MS_CLASS=0 +Allocating UL TBF: MS_CLASS=0/0 Slot Allocation (Algorithm A) for class 0 - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -1371,7 +1371,7 @@ Searching for first unallocated TFI: TRX=0 Found TFI=0. MS requests UL TBF on RACH, so we provide one: ********** TBF starts here ********** -Allocating UL TBF: MS_CLASS=0 +Allocating UL TBF: MS_CLASS=0/0 Creating MS object, TLLI = 0x00000000 Slot Allocation (Algorithm A) for class 0 - Skipping TS 0, because not enabled @@ -1449,7 +1449,7 @@ Searching for first unallocated TFI: TRX=0 ------------------------- RX : Uplink Control Block ------------------------- MS requests UL TBF in packet resource request of single block, so we provide one: ********** TBF starts here ********** -Allocating UL TBF: MS_CLASS=1 +Allocating UL TBF: MS_CLASS=1/0 Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 Slot Allocation (Algorithm A) for class 1 @@ -1526,7 +1526,7 @@ Searching for first unallocated TFI: TRX=0 ------------------------- RX : Uplink Control Block ------------------------- MS requests UL TBF in packet resource request of single block, so we provide one: ********** TBF starts here ********** -Allocating UL TBF: MS_CLASS=1 +Allocating UL TBF: MS_CLASS=1/0 Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 Slot Allocation (Algorithm A) for class 1 @@ -1647,7 +1647,7 @@ TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) poll timeout for FN=2654292 (cu ------------------------- RX : Uplink Control Block ------------------------- MS requests UL TBF in packet resource request of single block, so we provide one: ********** TBF starts here ********** -Allocating UL TBF: MS_CLASS=1 +Allocating UL TBF: MS_CLASS=1/0 Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 Slot Allocation (Algorithm A) for class 1 @@ -1711,7 +1711,7 @@ Searching for first unallocated TFI: TRX=0 ------------------------- RX : Uplink Control Block ------------------------- MS requests UL TBF in packet resource request of single block, so we provide one: ********** TBF starts here ********** -Allocating UL TBF: MS_CLASS=1 +Allocating UL TBF: MS_CLASS=1/0 Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 Slot Allocation (Algorithm A) for class 1 @@ -1799,7 +1799,7 @@ TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) changes state from ASSIGN to WAIT TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=WAIT RELEASE) restarting timer 3193 while old timer 0 pending MS requests UL TBF in packet resource request of single block, so we provide one: ********** TBF starts here ********** -Allocating UL TBF: MS_CLASS=1 +Allocating UL TBF: MS_CLASS=1/0 Slot Allocation (Algorithm A) for class 1 - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -1868,7 +1868,7 @@ Searching for first unallocated TFI: TRX=0 ------------------------- RX : Uplink Control Block ------------------------- MS requests UL TBF in packet resource request of single block, so we provide one: ********** TBF starts here ********** -Allocating UL TBF: MS_CLASS=1 +Allocating UL TBF: MS_CLASS=1/0 Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 Slot Allocation (Algorithm A) for class 1 @@ -1945,7 +1945,7 @@ Searching for first unallocated TFI: TRX=0 Found TFI=0. MS requests UL TBF on RACH, so we provide one: ********** TBF starts here ********** -Allocating UL TBF: MS_CLASS=0 +Allocating UL TBF: MS_CLASS=0/0 Creating MS object, TLLI = 0x00000000 Slot Allocation (Algorithm A) for class 0 - Skipping TS 0, because not enabled @@ -2005,7 +2005,7 @@ Searching for first unallocated TFI: TRX=0 ------------------------- RX : Uplink Control Block ------------------------- MS requests UL TBF in packet resource request of single block, so we provide one: ********** TBF starts here ********** -Allocating UL TBF: MS_CLASS=1 +Allocating UL TBF: MS_CLASS=1/0 Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 Slot Allocation (Algorithm A) for class 1 -- cgit v1.2.3