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

bugfix: deactive slice_counter

Browse Source 
slice_counter had a wrong condition, not scheduling in DLSCH if the number of
slices is greater than one
This commit is contained in:
Robert Schmidt
2018-09-03 18:10:28 +02:00
parent 048c4d29a2
commit 568bf8ae35
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+7 -7
View File
@@ -415,7 +415,7 @@ schedule_dlsch(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP, in
sli->tot_pct_dl = 0; sli->tot_pct_dl = 0;
sli->avg_pct_dl = 1.0 / sli->n_dl; sli->avg_pct_dl = 1.0 / sli->n_dl;
sli->slice_counter = sli->n_dl; //sli->slice_counter = sli->n_dl;
// reset the slice percentage for inactive slices // reset the slice percentage for inactive slices
for (i = sli->n_dl; i < MAX_NUM_SLICES; i++) { for (i = sli->n_dl; i < MAX_NUM_SLICES; i++) {
@@ -727,13 +727,13 @@ schedule_ue_spec(module_id_t module_idP, slice_id_t slice_idP,
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_PREPROCESSOR, VCD_FUNCTION_OUT); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_PREPROCESSOR, VCD_FUNCTION_OUT);
RC.mac[module_idP]->slice_info.slice_counter--; //RC.mac[module_idP]->slice_info.slice_counter--;
// Do the multiplexing and actual allocation only when all slices have been pre-processed. // Do the multiplexing and actual allocation only when all slices have been pre-processed.
if (RC.mac[module_idP]->slice_info.slice_counter > 0) { //if (RC.mac[module_idP]->slice_info.slice_counter > 0) {
stop_meas(&eNB->schedule_dlsch); //stop_meas(&eNB->schedule_dlsch);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_SCHEDULE_DLSCH, VCD_FUNCTION_OUT); //VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_SCHEDULE_DLSCH, VCD_FUNCTION_OUT);
return; //return;
} //}
if (RC.mac[module_idP]->slice_info.interslice_share_active) { if (RC.mac[module_idP]->slice_info.interslice_share_active) {
dlsch_scheduler_interslice_multiplexing(module_idP, frameP, subframeP); dlsch_scheduler_interslice_multiplexing(module_idP, frameP, subframeP);
openair2/LAYER2/MAC/mac.h
+1 -1
View File
@@ -1230,7 +1230,7 @@ typedef struct {
typedef struct { typedef struct {
/// counter used to indicate when all slices have pre-allocated UEs /// counter used to indicate when all slices have pre-allocated UEs
int slice_counter; //int slice_counter;
/// indicates whether remaining RBs after first intra-slice allocation will /// indicates whether remaining RBs after first intra-slice allocation will
/// be allocated to UEs of the same slice /// be allocated to UEs of the same slice