Skip to content

O
OpenXG-RAN
Commit ca1b0e2b authored by Robert Schmidt's avatar Robert Schmidt
Browse files
Options

Bugfix RR algo: if a UE cannot be allocated, skip it

parent 8aa270a7
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
openair2/LAYER2/MAC/pre_processor.c
View file @ ca1b0e2b
...@@ -212,11 +212,12 @@ int rr_dl_run(module_id_t Mod_id, ...@@ -212,11 +212,12 @@ int rr_dl_run(module_id_t Mod_id,
cur_UE = &UE_sched.head; cur_UE = &UE_sched.head;
while (*cur_UE >= 0 && max_num_ue > 0) { while (*cur_UE >= 0 && max_num_ue > 0) {
const int UE_id = *cur_UE; const int UE_id = *cur_UE;
cur_UE = &UE_sched.next[UE_id]; // go to next
const uint8_t cqi = UE_info->UE_sched_ctrl[UE_id].dl_cqi[CC_id]; const uint8_t cqi = UE_info->UE_sched_ctrl[UE_id].dl_cqi[CC_id];
const int idx = CCE_try_allocate_dlsch(Mod_id, CC_id, subframe, UE_id, cqi); const int idx = CCE_try_allocate_dlsch(Mod_id, CC_id, subframe, UE_id, cqi);
if (idx < 0) { if (idx < 0) {
LOG_D(MAC, "cannot allocate CCE for UE %d, skipping\n", UE_id); LOG_D(MAC, "cannot allocate CCE for UE %d, skipping\n", UE_id);
// SKIP this UE in the list by marking the next as the current
*cur_UE = UE_sched.next[UE_id];
continue; continue;
} }
UE_info->UE_sched_ctrl[UE_id].pre_dci_dl_pdu_idx = idx; UE_info->UE_sched_ctrl[UE_id].pre_dci_dl_pdu_idx = idx;
...@@ -225,6 +226,7 @@ int rr_dl_run(module_id_t Mod_id, ...@@ -225,6 +226,7 @@ int rr_dl_run(module_id_t Mod_id,
const uint32_t B = UE_info->UE_template[CC_id][UE_id].dl_buffer_total; const uint32_t B = UE_info->UE_template[CC_id][UE_id].dl_buffer_total;
rb_required[UE_id] = find_nb_rb_DL(mcs, B, n_rbg_sched * RBGsize, RBGsize); rb_required[UE_id] = find_nb_rb_DL(mcs, B, n_rbg_sched * RBGsize, RBGsize);
max_num_ue--; max_num_ue--;
cur_UE = &UE_sched.next[UE_id]; // go to next
} }
*cur_UE = -1; // not all UEs might be allocated, mark end *cur_UE = -1; // not all UEs might be allocated, mark end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment