Skip to content

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

Remove statistics from nr_generate_dlsch_pdu()

parent 4ecb236d
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 12 deletions
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
View file @ eb263af3
...@@ -81,8 +81,6 @@ int nr_generate_dlsch_pdu(module_id_t module_idP, ...@@ -81,8 +81,6 @@ int nr_generate_dlsch_pdu(module_id_t module_idP,
//NR_CellGroupConfig_t *config = UE_info->secondaryCellGroup[UE_id]; //NR_CellGroupConfig_t *config = UE_info->secondaryCellGroup[UE_id];
ue_sched_ctl = &(UE_info->UE_sched_ctrl[UE_id]); ue_sched_ctl = &(UE_info->UE_sched_ctrl[UE_id]);
NR_mac_stats_t *mac_stats = &(UE_info->mac_stats[UE_id]);
// 1) Compute MAC CE and related subheaders // 1) Compute MAC CE and related subheaders
// DRX command subheader (MAC CE size 0) // DRX command subheader (MAC CE size 0)
...@@ -333,8 +331,6 @@ int nr_generate_dlsch_pdu(module_id_t module_idP, ...@@ -333,8 +331,6 @@ int nr_generate_dlsch_pdu(module_id_t module_idP,
memcpy((void *) mac_pdu_ptr, (void *) dlsch_buffer_ptr, sdu_lengths[i]); memcpy((void *) mac_pdu_ptr, (void *) dlsch_buffer_ptr, sdu_lengths[i]);
dlsch_buffer_ptr += sdu_lengths[i]; dlsch_buffer_ptr += sdu_lengths[i];
mac_pdu_ptr += sdu_lengths[i]; mac_pdu_ptr += sdu_lengths[i];
mac_stats->lc_bytes_tx[sdu_lcids[i]] += sdu_lengths[i];
} }
// 4) Compute final offset for padding // 4) Compute final offset for padding
...@@ -757,12 +753,8 @@ void nr_schedule_ue_spec(module_id_t module_id, ...@@ -757,12 +753,8 @@ void nr_schedule_ue_spec(module_id_t module_id,
num_sdus +=1; num_sdus +=1;
} }
// there is at least one SDU or TA command UE_info->mac_stats[UE_id].dlsch_total_bytes += TBS;
// if (num_sdus > 0 ){ UE_info->mac_stats[UE_id].lc_bytes_tx[lcid] += sdu_length_total;
if (ta_len + sdu_length_total + header_length_total == 0) {
// There is no data from RLC or MAC header, so don't schedule
return;
}
// Check if there is data from RLC or CE // Check if there is data from RLC or CE
const int post_padding = TBS >= 2 + header_length_total + sdu_length_total + ta_len; const int post_padding = TBS >= 2 + header_length_total + sdu_length_total + ta_len;
...@@ -801,8 +793,6 @@ void nr_schedule_ue_spec(module_id_t module_id, ...@@ -801,8 +793,6 @@ void nr_schedule_ue_spec(module_id_t module_id,
gNB_mac->TX_req[CC_id].SFN = frame; gNB_mac->TX_req[CC_id].SFN = frame;
gNB_mac->TX_req[CC_id].Slot = slot; gNB_mac->TX_req[CC_id].Slot = slot;
UE_info->mac_stats[UE_id].dlsch_total_bytes += TBS;
retInfo->rbSize = sched_ctrl->rbSize; retInfo->rbSize = sched_ctrl->rbSize;
retInfo->time_domain_allocation = sched_ctrl->time_domain_allocation; retInfo->time_domain_allocation = sched_ctrl->time_domain_allocation;
retInfo->mcsTableIdx = sched_ctrl->mcsTableIdx; retInfo->mcsTableIdx = sched_ctrl->mcsTableIdx;
......
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
View file @ eb263af3
...@@ -725,6 +725,8 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP, ...@@ -725,6 +725,8 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
} }
UE_info->mac_stats[UE_id].lc_bytes_tx[lcid] += sdu_length_total;
// there is at least one SDU or TA command // there is at least one SDU or TA command
// if (num_sdus > 0 ){ // if (num_sdus > 0 ){
if (ta_len + sdu_length_total + header_length_total > 0) { if (ta_len + sdu_length_total + header_length_total > 0) {
......
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