* Change the Linux Sched policy to SCHED_DEADLINE for the kernel version > 3.14
* Add MAC/RRC wireshark interface to LTE softmodem * Add OTG support to the eNB App, and some cleanup git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6115 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Navid Nikaein
+78
-69
@@ -565,8 +565,7 @@ void *l2l1_task(void *args_p) {
|
||||
start_meas(&oaisim_stats);
|
||||
for (frame = 0; (l2l1_state != L2L1_TERMINATED) && (frame < oai_emulation.info.n_frames); frame++) {
|
||||
|
||||
start_meas(&oaisim_stats_f);
|
||||
|
||||
|
||||
#if defined(ENABLE_ITTI)
|
||||
do {
|
||||
// Checks if a message has been sent to L2L1 task
|
||||
@@ -660,7 +659,9 @@ void *l2l1_task(void *args_p) {
|
||||
update_ocm ();
|
||||
|
||||
for (slot = 0; slot < 20; slot++) {
|
||||
|
||||
if (slot%2==0)
|
||||
start_meas(&oaisim_stats_f);
|
||||
|
||||
wait_for_slot_isr ();
|
||||
|
||||
#if defined(ENABLE_ITTI)
|
||||
@@ -977,7 +978,8 @@ void *l2l1_task(void *args_p) {
|
||||
}
|
||||
*/
|
||||
} // if Channel_Flag==0
|
||||
|
||||
if (slot%2==1)
|
||||
stop_meas(&oaisim_stats_f);
|
||||
}//end of slot
|
||||
|
||||
if ((frame >= 10) && (frame <= 11) && (abstraction_flag == 0)
|
||||
@@ -1028,8 +1030,9 @@ void *l2l1_task(void *args_p) {
|
||||
smbv_frame_cnt++;
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
stop_meas(&oaisim_stats_f);
|
||||
|
||||
//end of frame
|
||||
|
||||
stop_meas(&oaisim_stats);
|
||||
@@ -1267,75 +1270,81 @@ void *l2l1_task(void *args_p) {
|
||||
reset_meas(&UE_pdcp_stats[UE_id].pdcp_ip);
|
||||
reset_meas(&UE_pdcp_stats[UE_id].ip_pdcp);
|
||||
|
||||
for (eNB_id=0; eNB_id<NB_eNB_INST; eNB_id++) {
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->phy_proc);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->phy_proc_rx);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->phy_proc_tx);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->rx_prach);
|
||||
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ofdm_mod_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->dlsch_encoding_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->dlsch_modulation_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->dlsch_scrambling_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->dlsch_rate_matching_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->dlsch_turbo_encoding_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->dlsch_interleaving_stats);
|
||||
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ofdm_demod_stats);
|
||||
//reset_meas(&PHY_vars_eNB_g[eNB_id]->rx_dft_stats);
|
||||
//reset_meas(&PHY_vars_eNB_g[eNB_id]->ulsch_channel_estimation_stats);
|
||||
//reset_meas(&PHY_vars_eNB_g[eNB_id]->ulsch_freq_offset_estimation_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_decoding_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_demodulation_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_rate_unmatching_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_turbo_decoding_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_deinterleaving_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_demultiplexing_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_llr_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_tc_init_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_tc_alpha_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_tc_beta_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_tc_gamma_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_tc_ext_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_tc_intl1_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_tc_intl2_stats);
|
||||
|
||||
reset_meas(&eNB2UE[eNB_id][UE_id][0]->random_channel);
|
||||
reset_meas(&eNB2UE[eNB_id][UE_id][0]->interp_time);
|
||||
reset_meas(&eNB2UE[eNB_id][UE_id][0]->interp_freq);
|
||||
reset_meas(&eNB2UE[eNB_id][UE_id][0]->convolution);
|
||||
reset_meas(&UE2eNB[UE_id][eNB_id][0]->random_channel);
|
||||
reset_meas(&UE2eNB[UE_id][eNB_id][0]->interp_time);
|
||||
reset_meas(&UE2eNB[UE_id][eNB_id][0]->interp_freq);
|
||||
reset_meas(&UE2eNB[UE_id][eNB_id][0]->convolution);
|
||||
/*
|
||||
* L2 functions
|
||||
*/
|
||||
// eNB MAC
|
||||
reset_meas(&eNB_mac_inst[eNB_id].eNB_scheduler); // total
|
||||
reset_meas(&eNB_mac_inst[eNB_id].schedule_si); // only schedule + tx
|
||||
reset_meas(&eNB_mac_inst[eNB_id].schedule_ra); // only ra
|
||||
reset_meas(&eNB_mac_inst[eNB_id].schedule_ulsch); // onlu ulsch
|
||||
reset_meas(&eNB_mac_inst[eNB_id].fill_DLSCH_dci);// only dci
|
||||
reset_meas(&eNB_mac_inst[eNB_id].schedule_dlsch_preprocessor); // include rlc_data_req + MAC header gen
|
||||
reset_meas(&eNB_mac_inst[eNB_id].schedule_dlsch); // include rlc_data_req + MAC header gen + pre-processor
|
||||
reset_meas(&eNB_mac_inst[eNB_id].schedule_mch); // only embms
|
||||
reset_meas(&eNB_mac_inst[eNB_id].rx_ulsch_sdu); // include rlc_data_ind + mac header parser
|
||||
|
||||
reset_meas(&eNB_pdcp_stats[eNB_id].pdcp_run);
|
||||
reset_meas(&eNB_pdcp_stats[eNB_id].data_req);
|
||||
reset_meas(&eNB_pdcp_stats[eNB_id].data_ind);
|
||||
reset_meas(&eNB_pdcp_stats[eNB_id].apply_security);
|
||||
reset_meas(&eNB_pdcp_stats[eNB_id].validate_security);
|
||||
reset_meas(&eNB_pdcp_stats[eNB_id].pdcp_ip);
|
||||
reset_meas(&eNB_pdcp_stats[eNB_id].ip_pdcp);
|
||||
|
||||
}
|
||||
for (eNB_id=0; eNB_id<NB_eNB_INST; eNB_id++) {
|
||||
|
||||
for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
|
||||
reset_meas(&eNB2UE[eNB_id][UE_id][0]->random_channel);
|
||||
reset_meas(&eNB2UE[eNB_id][UE_id][0]->interp_time);
|
||||
reset_meas(&eNB2UE[eNB_id][UE_id][0]->interp_freq);
|
||||
reset_meas(&eNB2UE[eNB_id][UE_id][0]->convolution);
|
||||
reset_meas(&UE2eNB[UE_id][eNB_id][0]->random_channel);
|
||||
reset_meas(&UE2eNB[UE_id][eNB_id][0]->interp_time);
|
||||
reset_meas(&UE2eNB[UE_id][eNB_id][0]->interp_freq);
|
||||
reset_meas(&UE2eNB[UE_id][eNB_id][0]->convolution);
|
||||
}
|
||||
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->phy_proc);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->phy_proc_rx);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->phy_proc_tx);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->rx_prach);
|
||||
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ofdm_mod_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->dlsch_encoding_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->dlsch_modulation_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->dlsch_scrambling_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->dlsch_rate_matching_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->dlsch_turbo_encoding_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->dlsch_interleaving_stats);
|
||||
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ofdm_demod_stats);
|
||||
//reset_meas(&PHY_vars_eNB_g[eNB_id]->rx_dft_stats);
|
||||
//reset_meas(&PHY_vars_eNB_g[eNB_id]->ulsch_channel_estimation_stats);
|
||||
//reset_meas(&PHY_vars_eNB_g[eNB_id]->ulsch_freq_offset_estimation_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_decoding_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_demodulation_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_rate_unmatching_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_turbo_decoding_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_deinterleaving_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_demultiplexing_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_llr_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_tc_init_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_tc_alpha_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_tc_beta_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_tc_gamma_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_tc_ext_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_tc_intl1_stats);
|
||||
reset_meas(&PHY_vars_eNB_g[eNB_id][0]->ulsch_tc_intl2_stats);
|
||||
|
||||
/*
|
||||
* L2 functions
|
||||
*/
|
||||
// eNB MAC
|
||||
reset_meas(&eNB_mac_inst[eNB_id].eNB_scheduler); // total
|
||||
reset_meas(&eNB_mac_inst[eNB_id].schedule_si); // only schedule + tx
|
||||
reset_meas(&eNB_mac_inst[eNB_id].schedule_ra); // only ra
|
||||
reset_meas(&eNB_mac_inst[eNB_id].schedule_ulsch); // onlu ulsch
|
||||
reset_meas(&eNB_mac_inst[eNB_id].fill_DLSCH_dci);// only dci
|
||||
reset_meas(&eNB_mac_inst[eNB_id].schedule_dlsch_preprocessor); // include rlc_data_req + MAC header gen
|
||||
reset_meas(&eNB_mac_inst[eNB_id].schedule_dlsch); // include rlc_data_req + MAC header gen + pre-processor
|
||||
reset_meas(&eNB_mac_inst[eNB_id].schedule_mch); // only embms
|
||||
reset_meas(&eNB_mac_inst[eNB_id].rx_ulsch_sdu); // include rlc_data_ind + mac header parser
|
||||
|
||||
reset_meas(&eNB_pdcp_stats[eNB_id].pdcp_run);
|
||||
reset_meas(&eNB_pdcp_stats[eNB_id].data_req);
|
||||
reset_meas(&eNB_pdcp_stats[eNB_id].data_ind);
|
||||
reset_meas(&eNB_pdcp_stats[eNB_id].apply_security);
|
||||
reset_meas(&eNB_pdcp_stats[eNB_id].validate_security);
|
||||
reset_meas(&eNB_pdcp_stats[eNB_id].pdcp_ip);
|
||||
reset_meas(&eNB_pdcp_stats[eNB_id].ip_pdcp);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
void print_opp_meas(void){
|
||||
uint8_t eNB_id=0,UE_id=0;
|
||||
void print_opp_meas(void){
|
||||
|
||||
uint8_t eNB_id=0,UE_id=0;
|
||||
|
||||
print_meas(&oaisim_stats,"[OAI][total_exec_time]", &oaisim_stats,&oaisim_stats);
|
||||
print_meas(&oaisim_stats_f,"[OAI][SF_exec_time]", &oaisim_stats,&oaisim_stats_f);
|
||||
|
||||
Reference in New Issue
Block a user