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/+/20991 ) Change subject: Move EGPRS MS mode set to gprs_ms.cpp ...................................................................... Move EGPRS MS mode set to gprs_ms.cpp Some tests were wrong (TypesTest) and required modification, since they were setting a EGPRS MS but then expecting a GPRS assignment. Change-Id: I9d3ee21c765054a36bd22352e48bde5ffca9225a --- M src/gprs_ms.cpp M src/tbf.cpp M tests/alloc/AllocTest.err M tests/app_info/AppInfoTest.err M tests/tbf/TbfTest.err M tests/types/TypesTest.cpp M tests/types/TypesTest.err 7 files changed, 77 insertions(+), 78 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/91/20991/1 diff --git a/src/gprs_ms.cpp b/src/gprs_ms.cpp index 3271a1d..efd1845 100644 --- a/src/gprs_ms.cpp +++ b/src/gprs_ms.cpp @@ -540,6 +540,17 @@ tlli(), m_egprs_ms_class, ms_class_); m_egprs_ms_class = ms_class_; + + struct gprs_rlcmac_bts *bts = m_bts->bts_data(); + if (mcs_is_edge_gmsk(mcs_get_egprs_by_num(bts->max_mcs_ul)) && + mcs_is_edge_gmsk(mcs_get_egprs_by_num(bts->max_mcs_dl)) && + mode() != EGPRS) + { + set_mode(EGPRS_GMSK); + } else { + set_mode(EGPRS); + } + LOGPMS(this, DRLCMAC, LOGL_INFO, "Enabled EGPRS, mode %s\n", mode_name(mode())); } void GprsMs::update_error_rate(gprs_rlcmac_tbf *tbf, int error_rate) diff --git a/src/tbf.cpp b/src/tbf.cpp index 4706eeb..4f685e8 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -117,18 +117,6 @@ tbf_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)) && - mcs_is_edge_gmsk(mcs_get_egprs_by_num(bts->max_mcs_dl)) && - ms->mode() != EGPRS) - { - ms->set_mode(EGPRS_GMSK); - } else { - ms->set_mode(EGPRS); - } -} - gprs_rlcmac_tbf::Meas::Meas() : rssi_sum(0), rssi_num(0) @@ -757,11 +745,8 @@ struct gprs_rlcmac_bts *bts_data = bts->bts_data(); int rc; - if (m_ms->egprs_ms_class() > 0 && bts_data->egprs_enabled) { + if (m_ms->egprs_ms_class() > 0) enable_egprs(); - setup_egprs_mode(bts_data, m_ms); - LOGPTBF(this, LOGL_INFO, "Enabled EGPRS, mode %s\n", mode_name(m_ms->mode())); - } m_created_ts = time(NULL); /* select algorithm */ diff --git a/tests/alloc/AllocTest.err b/tests/alloc/AllocTest.err index 29b305b..99481be 100644 --- a/tests/alloc/AllocTest.err +++ b/tests/alloc/AllocTest.err @@ -202832,10 +202832,10 @@ [DL] algo A <multi> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) Allocated 160 TBFs (previously 160) Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 6 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 40, dl_slots = f0 +TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Setting Control TS 6 +TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 40, dl_slots = f0 Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=1 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 5 -TBF(TFI=1 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 70 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=RELEASING) free -TBF(TFI=1 TLLI=0x00000000 DIR=DL STATE=RELEASING) free +TBF(TFI=1 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Setting Control TS 5 +TBF(TFI=1 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 20, dl_slots = 70 +TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=RELEASING EGPRS) free +TBF(TFI=1 TLLI=0x00000000 DIR=DL STATE=RELEASING EGPRS) free diff --git a/tests/app_info/AppInfoTest.err b/tests/app_info/AppInfoTest.err index 6ef5d83..50ed2e1 100644 --- a/tests/app_info/AppInfoTest.err +++ b/tests/app_info/AppInfoTest.err @@ -13,20 +13,24 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 10 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 10/11,) Enabled EGPRS, mode EGPRS [DL] algo B <multi> (suggested TRX: 0): using 4 slots -PDCH(TS 4, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL), 1 TBFs, USFs = 00, TFIs = 00000001. -PDCH(TS 5, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL), 1 TBFs, USFs = 00, TFIs = 00000001. -PDCH(TS 6, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL), 1 TBFs, USFs = 00, TFIs = 00000001. -PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL), 1 TBFs, USFs = 00, TFIs = 00000001. -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) +PDCH(TS 4, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001. +PDCH(TS 5, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001. +PDCH(TS 6, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001. +PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001. +Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) +ws(64) Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 12 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 13 +MS(TLLI=0x00000000, IMSI=, TA=220, 12/13,) Enabled EGPRS, mode EGPRS [DL] algo B <multi> (suggested TRX: 0): using 3 slots -PDCH(TS 4, TRX 0): Attaching TBF(TFI=1 TLLI=0x00000000 DIR=DL STATE=NULL), 2 TBFs, USFs = 00, TFIs = 00000003. -PDCH(TS 5, TRX 0): Attaching TBF(TFI=1 TLLI=0x00000000 DIR=DL STATE=NULL), 2 TBFs, USFs = 00, TFIs = 00000003. -PDCH(TS 6, TRX 0): Attaching TBF(TFI=1 TLLI=0x00000000 DIR=DL STATE=NULL), 2 TBFs, USFs = 00, TFIs = 00000003. -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=1 TLLI=0x00000000 DIR=DL STATE=NULL) +PDCH(TS 4, TRX 0): Attaching TBF(TFI=1 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS), 2 TBFs, USFs = 00, TFIs = 00000003. +PDCH(TS 5, TRX 0): Attaching TBF(TFI=1 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS), 2 TBFs, USFs = 00, TFIs = 00000003. +PDCH(TS 6, TRX 0): Attaching TBF(TFI=1 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS), 2 TBFs, USFs = 00, TFIs = 00000003. +Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=1 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) +ws(64) --- test_sched_app_info_ok --- Application Information Request received: type=0x00000000 len=15 diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 8691e4c..cb78104 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -3044,9 +3044,9 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 12 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 12 +MS(TLLI=0x00000000, IMSI=, TA=220, 12/12,) Enabled EGPRS, mode EGPRS ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=12/12 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo B <multi> (suggested TRX: 0): Alloc start Found first unallocated TRX=0 TFI=0 Slot Allocation (Algorithm B) for class 12 @@ -3097,9 +3097,9 @@ Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 Modifying MS object, TLLI = 0xf1223344, EGPRS MS class 0 -> 1 +MS(TLLI=0xf1223344, IMSI=, TA=7, 1/1,) Enabled EGPRS, mode EGPRS ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [UL] algo A <multi> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -3148,7 +3148,6 @@ Modifying MS object, TLLI: 0xf1223344 confirmed ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=1/1 -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <multi> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -3186,9 +3185,9 @@ Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 Modifying MS object, TLLI = 0xf1223344, EGPRS MS class 0 -> 1 +MS(TLLI=0xf1223344, IMSI=, TA=7, 1/1,) Enabled EGPRS, mode EGPRS ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [UL] algo A <multi> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -3367,7 +3366,6 @@ Modifying MS object, TLLI: 0xf1223344 confirmed ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=1/1 -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <multi> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -3396,10 +3394,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -3702,10 +3700,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -3958,10 +3956,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -4176,10 +4174,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -4362,10 +4360,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -4528,10 +4526,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -4676,10 +4674,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -4819,10 +4817,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -4951,10 +4949,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -5085,10 +5083,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -5140,10 +5138,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -5195,10 +5193,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -5250,10 +5248,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -5321,10 +5319,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -5392,10 +5390,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -5463,10 +5461,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -5536,10 +5534,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -5598,10 +5596,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -5660,10 +5658,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -5722,10 +5720,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -5802,9 +5800,9 @@ Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 Modifying MS object, TLLI = 0xf1223344, EGPRS MS class 0 -> 1 +MS(TLLI=0xf1223344, IMSI=, TA=7, 1/1,) Enabled EGPRS, mode EGPRS ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [UL] algo A <multi> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -5872,7 +5870,6 @@ Modifying MS object, TLLI: 0xf1223344 confirmed ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=1/1 -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <multi> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -5900,9 +5897,9 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo B <single> (suggested TRX: 0): Alloc start Found first unallocated TRX=0 TFI=0 Slot Allocation (Algorithm B) for class 11 @@ -5964,9 +5961,9 @@ Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 Modifying MS object, TLLI = 0xf1223344, EGPRS MS class 0 -> 1 +MS(TLLI=0xf1223344, IMSI=, TA=7, 1/1,) Enabled EGPRS, mode EGPRS ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [UL] algo A <multi> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -6028,7 +6025,6 @@ Modifying MS object, TLLI: 0xf1223344 confirmed ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=1/1 -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <multi> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -6056,10 +6052,10 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <single> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -6286,9 +6282,9 @@ Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 Modifying MS object, TLLI = 0xf1223344, EGPRS MS class 0 -> 1 +MS(TLLI=0xf1223344, IMSI=, TA=7, 1/1,) Enabled EGPRS, mode EGPRS ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [UL] algo A <multi> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -6906,7 +6902,6 @@ Modifying MS object, TLLI: 0xf1223344 confirmed ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=1/1 -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS [DL] algo A <multi> (suggested TRX: 0): Alloc start - Skipping TS 0, because not enabled - Skipping TS 1, because not enabled @@ -7679,6 +7674,7 @@ Creating MS object, TLLI = 0x00000000 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +MS(TLLI=0x00000000, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS Found first unallocated TRX=0 TFI=0 ********** DL-TBF starts here ********** Allocating DL TBF: MS_CLASS=11/11 @@ -7691,15 +7687,17 @@ - Skipping TS 6, because not enabled - Skipping TS 7, because not enabled [DL] Assign downlink TS=4 TFI=0 -PDCH(TS 4, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL), 1 TBFs, USFs = 00, TFIs = 00000001. -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 4 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 10, dl_slots = 10 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) +PDCH(TS 4, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001. +TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Setting Control TS 4 +TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10 +Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) +TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) setting EGPRS DL window size to 64, base(0) slots(1) ws_pdch(0) +ws(64) Modifying MS object, TLLI = 0x00000000, TA 220 -> 0 -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) changes DL ASS state from GPRS_RLCMAC_DL_ASS_NONE to GPRS_RLCMAC_DL_ASS_SEND_ASS -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) changes state from NULL to FLOW +TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) changes DL ASS state from GPRS_RLCMAC_DL_ASS_NONE to GPRS_RLCMAC_DL_ASS_SEND_ASS +TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL EGPRS) changes state from NULL to FLOW The MS object cannot fully confirm an unexpected TLLI: 0xffeeddcc, partly confirmed -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) appending 100 bytes +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 100 bytes packet reject: 40 84 7f f7 6e e6 41 4b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b === end test_packet_access_rej_epdan === === start test_packet_access_rej_prr === @@ -7865,6 +7863,7 @@ (no TBF) MS requests UL TBF in PACKET RESOURCE REQ of single block, but there is no resource request scheduled! Modifying MS object, TLLI = 0xffeeddcc, MS class 0 -> 11 Modifying MS object, TLLI = 0xffeeddcc, EGPRS MS class 0 -> 11 +MS(TLLI=0xffeeddcc, IMSI=, TA=220, 11/11,) Enabled EGPRS, mode EGPRS ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=11/11 [UL] algo A <multi> (suggested TRX: 0): Alloc start diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index 1c846e1..eeebc70 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -764,7 +764,7 @@ the_bts.bts_data()->alloc_algorithm = alloc_algorithm_a; the_bts.bts_data()->trx[0].pdch[2].enable(); the_bts.bts_data()->trx[0].pdch[3].enable(); - GprsMs *ms = the_bts.ms_alloc(1, 1); + GprsMs *ms = the_bts.ms_alloc(1, 0); struct gprs_rlcmac_tbf *tbf = tbf_alloc_dl_tbf(the_bts.bts_data(), ms, 0, false); static uint8_t res[] = { 0x06, @@ -789,7 +789,7 @@ the_bts.bts_data()->trx[0].pdch[4].enable(); the_bts.bts_data()->trx[0].pdch[5].enable(); - GprsMs *ms = the_bts.ms_alloc(1, 1); + GprsMs *ms = the_bts.ms_alloc(1, 0); struct gprs_rlcmac_tbf *tbf = tbf_alloc_ul_tbf(the_bts.bts_data(), ms, 0, false); static uint8_t res[] = { 0x06, 0x3f, /* Immediate Assignment Message Type */ diff --git a/tests/types/TypesTest.err b/tests/types/TypesTest.err index 92dbe06..f382a06 100644 --- a/tests/types/TypesTest.err +++ b/tests/types/TypesTest.err @@ -1,15 +1,15 @@ -Allocating DL TBF: MS_CLASS=1/1 +Allocating DL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 2 TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 04, dl_slots = 04 -Allocating UL TBF: MS_CLASS=1/1 +Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 4 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 10, dl_slots = 00 Allocating UL TBF: MS_CLASS=1/1 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 1 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 02, dl_slots = 00 +TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Setting Control TS 1 +TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 02, dl_slots = 00 +TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) ############## test_egprs_ul_ack_nack Allocating UL TBF: MS_CLASS=1/1 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Setting Control TS 4 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 00 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9d3ee21c765054a36bd22352e48bde5ffca9225a Gerrit-Change-Number: 20991 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/20201030/6931fd12/attachment.htm>