maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfixes: set max UL MCS to 20, improve sched loading message

Browse Source
This commit is contained in:
Robert Schmidt
2018-09-03 18:10:28 +02:00
parent 1d23a64ced
commit 59fc7832fa
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+2 -1
View File
@@ -465,7 +465,8 @@ schedule_dlsch(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP, in
sli->dl[i].sched_cb = dlsym(NULL, sli->dl[i].sched_name); sli->dl[i].sched_cb = dlsym(NULL, sli->dl[i].sched_name);
sli->dl[i].update_sched = 0; sli->dl[i].update_sched = 0;
sli->dl[i].update_sched_current = 0; sli->dl[i].update_sched_current = 0;
LOG_I(MAC, "update dl scheduler slice index %d ID %d\n", i, sli->dl[i].id); LOG_I(MAC, "update dl scheduler (%s) slice index %d ID %d\n",
sli->dl[i].sched_name, i, sli->dl[i].id);
} }
if (sli->tot_pct_dl <= 1.0) { // the new total RB share is within the range if (sli->tot_pct_dl <= 1.0) { // the new total RB share is within the range
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+3 -2
View File
@@ -1068,7 +1068,8 @@ schedule_ulsch(module_id_t module_idP, frame_t frameP,
//sli->tot_pct_ul_current += sli->ul[i].pct; //sli->tot_pct_ul_current += sli->ul[i].pct;
//if (sli->tot_pct_ul_current > 1) //if (sli->tot_pct_ul_current > 1)
//sli->tot_pct_ul_current = 1; //sli->tot_pct_ul_current = 1;
LOG_I(MAC,"update ul scheduler slice %d\n", i); LOG_I(MAC,"update ul scheduler (%s) slice index %d ID %d\n",
sli->ul[i].sched_name, i, sli->ul[i].id);
} }
// the new total RB share is within the range // the new total RB share is within the range
if (sli->tot_pct_ul <= 1.0){ if (sli->tot_pct_ul <= 1.0){
@@ -1097,7 +1098,7 @@ schedule_ulsch(module_id_t module_idP, frame_t frameP,
// check if the slice max MCS, and log the console // check if the slice max MCS, and log the console
if (sli->ul[i].maxmcs_current != sli->ul[i].maxmcs){ if (sli->ul[i].maxmcs_current != sli->ul[i].maxmcs){
if ((sli->ul[i].maxmcs >= 0) && (sli->ul[i].maxmcs <= 16)){ if ((sli->ul[i].maxmcs >= 0) && (sli->ul[i].maxmcs <= 20)){
LOG_I(MAC,"[eNB %d][SLICE %d][UL] frame %d subframe %d: slice MAX MCS has changed: %d-->%d\n", LOG_I(MAC,"[eNB %d][SLICE %d][UL] frame %d subframe %d: slice MAX MCS has changed: %d-->%d\n",
module_idP, sli->ul[i].id, frameP, subframeP, module_idP, sli->ul[i].id, frameP, subframeP,
sli->ul[i].maxmcs_current, sli->ul[i].maxmcs); sli->ul[i].maxmcs_current, sli->ul[i].maxmcs);