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

Fix est buffer.

Browse Source
This commit is contained in:
masayuki.harada
2020-12-27 20:19:33 +09:00
parent 50146dec06
commit bbaef50932
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
-15
View File
@@ -197,10 +197,6 @@ rx_sdu(const module_id_t enb_mod_idP,
if (UE_template_ptr->scheduled_ul_bytes < 0) { if (UE_template_ptr->scheduled_ul_bytes < 0) {
UE_template_ptr->scheduled_ul_bytes = 0; UE_template_ptr->scheduled_ul_bytes = 0;
} }
UE_template_ptr->estimated_ul_buffer -= UE_template_ptr->TBS_UL[harq_pid];
if (UE_template_ptr->estimated_ul_buffer < 0) {
UE_template_ptr->estimated_ul_buffer = 0;
}
} else { // sduP == NULL => error } else { // sduP == NULL => error
UE_scheduling_control->pusch_rx_error_num[CC_idP]++; UE_scheduling_control->pusch_rx_error_num[CC_idP]++;
LOG_D(MAC, "[eNB %d][PUSCH %d] CC_id %d %d.%d ULSCH in error in round %d, ul_cqi %d, UE_id %d, RNTI %x (len %d)\n", LOG_D(MAC, "[eNB %d][PUSCH %d] CC_id %d %d.%d ULSCH in error in round %d, ul_cqi %d, UE_id %d, RNTI %x (len %d)\n",
@@ -234,10 +230,6 @@ rx_sdu(const module_id_t enb_mod_idP,
if (UE_template_ptr->scheduled_ul_bytes < 0) { if (UE_template_ptr->scheduled_ul_bytes < 0) {
UE_template_ptr->scheduled_ul_bytes = 0; UE_template_ptr->scheduled_ul_bytes = 0;
} }
UE_template_ptr->estimated_ul_buffer -= UE_template_ptr->TBS_UL[harq_pid];
if (UE_template_ptr->estimated_ul_buffer < 0) {
UE_template_ptr->estimated_ul_buffer = 0;
}
if (find_RA_id(enb_mod_idP, CC_idP, current_rnti) != -1) { if (find_RA_id(enb_mod_idP, CC_idP, current_rnti) != -1) {
cancel_ra_proc(enb_mod_idP, CC_idP, frameP, current_rnti); cancel_ra_proc(enb_mod_idP, CC_idP, frameP, current_rnti);
@@ -573,8 +565,6 @@ rx_sdu(const module_id_t enb_mod_idP,
UE_template_ptr->ul_buffer_info[LCGID1] + UE_template_ptr->ul_buffer_info[LCGID1] +
UE_template_ptr->ul_buffer_info[LCGID2] + UE_template_ptr->ul_buffer_info[LCGID2] +
UE_template_ptr->ul_buffer_info[LCGID3]; UE_template_ptr->ul_buffer_info[LCGID3];
UE_template_ptr->scheduled_ul_bytes = 0;
RC.eNB[enb_mod_idP][CC_idP]->pusch_stats_bsr[UE_id][(frameP * 10) + subframeP] = (payload_ptr[0] & 0x3f); RC.eNB[enb_mod_idP][CC_idP]->pusch_stats_bsr[UE_id][(frameP * 10) + subframeP] = (payload_ptr[0] & 0x3f);
if (UE_id == UE_info->list.head) { if (UE_id == UE_info->list.head) {
@@ -620,8 +610,6 @@ rx_sdu(const module_id_t enb_mod_idP,
UE_template_ptr->ul_buffer_info[LCGID1] + UE_template_ptr->ul_buffer_info[LCGID1] +
UE_template_ptr->ul_buffer_info[LCGID2] + UE_template_ptr->ul_buffer_info[LCGID2] +
UE_template_ptr->ul_buffer_info[LCGID3]; UE_template_ptr->ul_buffer_info[LCGID3];
UE_template_ptr->scheduled_ul_bytes = 0;
LOG_D(MAC, "[eNB %d] CC_id %d MAC CE_LCID %d: Received long BSR. Size is LCGID0 = %u LCGID1 = %u LCGID2 = %u LCGID3 = %u\n", LOG_D(MAC, "[eNB %d] CC_id %d MAC CE_LCID %d: Received long BSR. Size is LCGID0 = %u LCGID1 = %u LCGID2 = %u LCGID3 = %u\n",
enb_mod_idP, enb_mod_idP,
CC_idP, CC_idP,
@@ -829,9 +817,6 @@ rx_sdu(const module_id_t enb_mod_idP,
UE_template_ptr->ul_buffer_info[1] + UE_template_ptr->ul_buffer_info[1] +
UE_template_ptr->ul_buffer_info[2] + UE_template_ptr->ul_buffer_info[2] +
UE_template_ptr->ul_buffer_info[3]; UE_template_ptr->ul_buffer_info[3];
if (UE_template_ptr->estimated_ul_buffer == 0) {
UE_template_ptr->scheduled_ul_bytes = 0;
}
//UE_template_ptr->estimated_ul_buffer += UE_template_ptr->estimated_ul_buffer / 4; //UE_template_ptr->estimated_ul_buffer += UE_template_ptr->estimated_ul_buffer / 4;
} }