Merge remote-tracking branch 'origin/mac-e2-ci' into integration_2025_w46 (!3752)
[MAC] Add UL total/used aggregated MAC stats; [E2 agent] Properly calculate used UE PRBs in KPM; [CI] Simplify and improve the Undeploy_Object() and implement Stop_Object() - Create common dlul_mac_stats_t struct for both DL and UL total/used aggregated PRBs - Use correct unit [%] for RRU.PrbTotDl and RRU.PrbTotUl , instead of [PRBs] - Use correct unit [Mb] for DRB.PdcpSduVolumeDL and DRB.PdcpSduVolumeUL [kb] - Implement Stop_Object() (docker compose stop = SIGTERM) - Simplify the Undeploy_Object() function - Improve the logging for Deploy/Undeploy_Object() functions - OAI-FlexRIC CI: properly stop all the containers (one by one or a subgroup of running containers), and rename oai-flexric to nearRT-RIC container
This commit is contained in:
@@ -2455,6 +2455,7 @@ void post_process_ulsch(gNB_MAC_INST *nr_mac, post_process_pusch_t *pusch, NR_UE
|
||||
}
|
||||
UE->mac_stats.ul.current_bytes = sched_pusch->tb_size;
|
||||
UE->mac_stats.ul.current_rbs = sched_pusch->rbSize;
|
||||
nr_mac->mac_stats.ul.used_prb_aggregate += sched_pusch->rbSize;
|
||||
sched_ctrl->last_ul_frame = sched_pusch->frame;
|
||||
sched_ctrl->last_ul_slot = sched_pusch->slot;
|
||||
|
||||
@@ -2697,6 +2698,7 @@ static void nr_ulsch_preprocessor(gNB_MAC_INST *nr_mac, post_process_pusch_t *pp
|
||||
int tda = seq_arr_dist(&nr_mac->ul_tda, seq_arr_front(&nr_mac->ul_tda), tda_info);
|
||||
AssertFatal(tda >= 0 && tda < 16, "illegal TDA index %d\n", tda);
|
||||
|
||||
nr_mac->mac_stats.ul.total_prb_aggregate += bw;
|
||||
int len[num_beams];
|
||||
for (int i = 0; i < num_beams; i++)
|
||||
len[i] = rb_len;
|
||||
|
||||
Reference in New Issue
Block a user