radisys
/
osmo-pcu
forked from cellular-infrastructure/osmo-pcu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix several calls to LOGPAL 

In those cases since a string pointer was passed, it always printed
"single" instead of whatever really was being used, since the string
pointer was not NULL.

Change-Id: Idab7d18e8f519e10fc3df4007634661c46f9256d
This commit is contained in:
Pau Espin 2020-10-23 17:11:00 +02:00
parent 8353d97904
commit a611b4f6a0
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gprs_rlcmac_ts_alloc.cpp
View File

@ -363,7 +363,7 @@ int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, GprsMs *ms_, struct gprs_rlcm
trx_no = find_trx(bts, ms, use_trx);
if (trx_no < 0) {
LOGPAL(tbf, "A", single ? "single" : "multi", use_trx, LOGL_NOTICE,
LOGPAL(tbf, "A", single, use_trx, LOGL_NOTICE,
"failed to find a usable TRX (TFI exhausted)\n");
return trx_no;
}
@ -392,13 +392,13 @@ int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, GprsMs *ms_, struct gprs_rlcm
&tfi, &usf);
if (tbf->direction == GPRS_RLCMAC_UL_TBF && usf < 0) {
LOGPAL(tbf, "A", single ? "single" : "multi", use_trx, LOGL_NOTICE,
LOGPAL(tbf, "A", single, use_trx, LOGL_NOTICE,
"failed to allocate a TS, no USF available\n");
return -EBUSY;
}
if (ts < 0) {
LOGPAL(tbf, "A", single ? "single" : "multi", use_trx, LOGL_NOTICE,
LOGPAL(tbf, "A", single, use_trx, LOGL_NOTICE,
"failed to allocate a TS, no TFI available\n");
return -EBUSY;
}

48
tests/alloc/AllocTest.err
View File

@ -193,7 +193,7 @@ TBF(TFI=31 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 3
TBF(TFI=31 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 08
No TFI available (suggested TRX: 0).
Allocating DL TBF: MS_CLASS=0/0
[DL] algo A <single> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
[DL] algo A <multi> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=RELEASING) free
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=RELEASING) free
TBF(TFI=1 TLLI=0x00000000 DIR=DL STATE=RELEASING) free
@ -305,7 +305,7 @@ Allocating UL TBF: MS_CLASS=0/0
TBF(TFI=6 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 3
TBF(TFI=6 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 00
Allocating UL TBF: MS_CLASS=0/0
[UL] algo A <single> (suggested TRX: -1): failed to allocate a TS, no USF available
[UL] algo A <multi> (suggested TRX: -1): failed to allocate a TS, no USF available
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) free
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) free
TBF(TFI=1 TLLI=0x00000000 DIR=UL STATE=NULL) free
@ -713,7 +713,7 @@ TBF(TFI=31 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 4
TBF(TFI=31 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
No TFI available (suggested TRX: 0).
Allocating DL TBF: MS_CLASS=0/0
[DL] algo A <single> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
[DL] algo A <multi> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=RELEASING) free
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=RELEASING) free
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=RELEASING) free
@ -931,7 +931,7 @@ Allocating UL TBF: MS_CLASS=0/0
TBF(TFI=6 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 4
TBF(TFI=6 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 10, dl_slots = 00
Allocating UL TBF: MS_CLASS=0/0
[UL] algo A <single> (suggested TRX: -1): failed to allocate a TS, no USF available
[UL] algo A <multi> (suggested TRX: -1): failed to allocate a TS, no USF available
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) free
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) free
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) free
@ -189959,7 +189959,7 @@ Allocating DL TBF: MS_CLASS=1/0
TBF(TFI=6 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 7
TBF(TFI=6 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
Allocating UL TBF: MS_CLASS=1/0
[UL] algo A <single> (suggested TRX: -1): failed to allocate a TS, no USF available
[UL] algo A <multi> (suggested TRX: -1): failed to allocate a TS, no USF available
Allocating UL TBF: MS_CLASS=10/0
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 5
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 00
@ -190961,7 +190961,7 @@ TBF(TFI=4 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 3
TBF(TFI=4 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 08
No TFI available (suggested TRX: 0).
Allocating UL TBF: MS_CLASS=36/0
[UL] algo A <single> (suggested TRX: -1): failed to allocate a TS, no USF available
[UL] algo A <multi> (suggested TRX: -1): failed to allocate a TS, no USF available
Allocating DL TBF: MS_CLASS=1/0
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 3
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 08
@ -191176,7 +191176,7 @@ Allocating DL TBF: MS_CLASS=1/0
TBF(TFI=7 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 3
TBF(TFI=7 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 08
Allocating UL TBF: MS_CLASS=1/0
[UL] algo A <single> (suggested TRX: 0): failed to allocate a TS, no USF available
[UL] algo A <multi> (suggested TRX: 0): failed to allocate a TS, no USF available
TBF(TFI=7 TLLI=0x00000000 DIR=DL STATE=RELEASING) free
Allocating DL TBF: MS_CLASS=10/0
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 5
@ -191573,7 +191573,7 @@ No TFI available (suggested TRX: -1).
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 7
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
Allocating UL TBF: MS_CLASS=10/0
[UL] algo A <single> (suggested TRX: 0): failed to allocate a TS, no USF available
[UL] algo A <multi> (suggested TRX: 0): failed to allocate a TS, no USF available
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=RELEASING) free
Allocating UL TBF: MS_CLASS=1/0
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 3
@ -192701,7 +192701,7 @@ TBF(TFI=31 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 80,
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) free
No TFI available (suggested TRX: 0).
Allocating UL TBF: MS_CLASS=1/0
[UL] algo A <single> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
[UL] algo A <multi> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
Allocating UL TBF: MS_CLASS=10/0
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 5
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 00
@ -193666,7 +193666,7 @@ TBF(TFI=30 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 40,
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) free
No TFI available (suggested TRX: 0).
Allocating UL TBF: MS_CLASS=10/0
[UL] algo A <single> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
[UL] algo A <multi> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
Allocating DL TBF: MS_CLASS=1/0
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 3
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 08
@ -193916,7 +193916,7 @@ Allocating DL TBF: MS_CLASS=1/0
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 3
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 08
Allocating UL TBF: MS_CLASS=1/0
[UL] algo A <single> (suggested TRX: 0): failed to allocate a TS, no USF available
[UL] algo A <multi> (suggested TRX: 0): failed to allocate a TS, no USF available
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=RELEASING) free
Allocating DL TBF: MS_CLASS=10/0
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 5
@ -194411,7 +194411,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 40,
Allocating UL TBF: MS_CLASS=10/0
No TFI available (suggested TRX: 0).
[UL] algo B <multi> (suggested TRX: 0): failed to allocate a TFI
[UL] algo A <single> (suggested TRX: 0): failed to allocate a TS, no USF available
[UL] algo A <multi> (suggested TRX: 0): failed to allocate a TS, no USF available
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=RELEASING) free
Allocating UL TBF: MS_CLASS=1/0
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 3
@ -194519,7 +194519,7 @@ Allocating UL TBF: MS_CLASS=1/0
TBF(TFI=6 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 7
TBF(TFI=6 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
Allocating UL TBF: MS_CLASS=1/0
[UL] algo A <single> (suggested TRX: -1): failed to allocate a TS, no USF available
[UL] algo A <multi> (suggested TRX: -1): failed to allocate a TS, no USF available
Allocating UL TBF: MS_CLASS=10/0
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 5
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 00
@ -194738,7 +194738,7 @@ No TFI available (suggested TRX: 0).
Allocating UL TBF: MS_CLASS=10/0
No TFI available (suggested TRX: -1).
[UL] algo B <multi> (suggested TRX: -1): failed to allocate a TFI
[UL] algo A <single> (suggested TRX: -1): failed to allocate a TS, no USF available
[UL] algo A <multi> (suggested TRX: -1): failed to allocate a TS, no USF available
Allocating DL TBF: MS_CLASS=1/0
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 3
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 08
@ -195225,7 +195225,7 @@ TBF(TFI=31 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 7
TBF(TFI=31 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
No TFI available (suggested TRX: 0).
Allocating DL TBF: MS_CLASS=1/0
[DL] algo A <single> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
[DL] algo A <multi> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
Allocating DL TBF: MS_CLASS=10/0
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 5
TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 78
@ -195702,7 +195702,7 @@ TBF(TFI=31 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 7
TBF(TFI=31 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
No TFI available (suggested TRX: 0).
Allocating DL TBF: MS_CLASS=10/0
[DL] algo A <single> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
[DL] algo A <multi> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
Allocating UL TBF: MS_CLASS=1/0
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 3
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 00
@ -196829,7 +196829,7 @@ TBF(TFI=31 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 80,
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) free
No TFI available (suggested TRX: 0).
Allocating UL TBF: MS_CLASS=23/0
[UL] algo A <single> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
[UL] algo A <multi> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
Allocated 160 TBFs (previously -1)
Allocating UL TBF: MS_CLASS=1/0
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 3
@ -196937,7 +196937,7 @@ Allocating UL TBF: MS_CLASS=35/0
TBF(TFI=6 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 7
TBF(TFI=6 TLLI=0xc0000022 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
Allocating UL TBF: MS_CLASS=36/0
[UL] algo A <single> (suggested TRX: 0): failed to allocate a TS, no USF available
[UL] algo A <multi> (suggested TRX: 0): failed to allocate a TS, no USF available
Allocated 35 TBFs (previously 160)
TBF(TFI=0 TLLI=0xc0000000 DIR=UL STATE=NULL) free
Allocating UL TBF: MS_CLASS=1/0
@ -198415,7 +198415,7 @@ TBF(TFI=31 TLLI=0xc000009f DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 80,
TBF(TFI=0 TLLI=0xc000009f DIR=UL STATE=NULL) free
No TFI available (suggested TRX: 0).
Allocating UL TBF: MS_CLASS=23/0
[UL] algo A <single> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
[UL] algo A <multi> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
Allocated 160 TBFs (previously 160)
TBF(TFI=0 TLLI=0xc0000000 DIR=DL STATE=RELEASING) free
Allocating DL TBF: MS_CLASS=1/0
@ -199218,7 +199218,7 @@ TBF(TFI=31 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 7
TBF(TFI=31 TLLI=0xc000009f DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
No TFI available (suggested TRX: 0).
Allocating DL TBF: MS_CLASS=23/0
[DL] algo A <single> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
[DL] algo A <multi> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
Allocated 160 TBFs (previously 160)
Allocating UL TBF: MS_CLASS=1/0
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 3
@ -200696,7 +200696,7 @@ TBF(TFI=27 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 40,
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) free
No TFI available (suggested TRX: 0).
Allocating UL TBF: MS_CLASS=44/0
[UL] algo A <single> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
[UL] algo A <multi> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
Allocated 89 TBFs (previously -1)
Allocating UL TBF: MS_CLASS=1/0
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 3
@ -200771,7 +200771,7 @@ Allocating UL TBF: MS_CLASS=24/0
TBF(TFI=6 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 4
TBF(TFI=6 TLLI=0xc0000017 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 10, dl_slots = 00
Allocating UL TBF: MS_CLASS=25/0
[UL] algo A <single> (suggested TRX: 0): failed to allocate a TS, no USF available
[UL] algo A <multi> (suggested TRX: 0): failed to allocate a TS, no USF available
Allocated 24 TBFs (previously 89)
TBF(TFI=0 TLLI=0xc0000000 DIR=UL STATE=NULL) free
Allocating UL TBF: MS_CLASS=1/0
@ -202026,7 +202026,7 @@ TBF(TFI=31 TLLI=0x00000000 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 80,
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) free
No TFI available (suggested TRX: 0).
Allocating UL TBF: MS_CLASS=23/0
[UL] algo A <single> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
[UL] algo A <multi> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
Allocated 160 TBFs (previously 89)
TBF(TFI=0 TLLI=0xc0000000 DIR=DL STATE=RELEASING) free
Allocating DL TBF: MS_CLASS=1/0
@ -202829,7 +202829,7 @@ TBF(TFI=31 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 7
TBF(TFI=31 TLLI=0xc000009f DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
No TFI available (suggested TRX: 0).
Allocating DL TBF: MS_CLASS=23/0
[DL] algo A <single> (suggested TRX: -1): failed to find a usable TRX (TFI exhausted)
[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

2
tests/tbf/TbfTest.err
View File

@ -7919,7 +7919,7 @@ Allocating UL TBF: MS_CLASS=11/11
- Skipping TS 5, because not enabled
- Skipping TS 6, because not enabled
- Skipping TS 7, because no USF available
[UL] algo A <single> (suggested TRX: 0): failed to allocate a TS, no USF available
[UL] algo A <multi> (suggested TRX: 0): failed to allocate a TS, no USF available
No PDCH resource
TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) changes state from NULL to ASSIGN
Attaching TBF to MS object, TLLI = 0xffeeddcc, TBF = TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN)