Fix for problems that L2sim finishes in case of multiple UEs and UE L2sim keeps wating for a signal.
This commit is contained in:
Regular → Executable
+33
-2
@@ -852,7 +852,7 @@ printf("~~~~~~~~~~~~~~~~~~~~successfully get the parallel config[%d], worker con
|
|||||||
|
|
||||||
|
|
||||||
printf("Running with %d UE instances\n",NB_UE_INST);
|
printf("Running with %d UE instances\n",NB_UE_INST);
|
||||||
if (NB_UE_INST > 1 && simL1flag != 1) {
|
if (NB_UE_INST > 1 && simL1flag != 1 && nfapi_mode != 3) {
|
||||||
printf("Running with more than 1 UE instance and simL1 is not active, this will result in undefined behaviour for now, exiting.\n");
|
printf("Running with more than 1 UE instance and simL1 is not active, this will result in undefined behaviour for now, exiting.\n");
|
||||||
abort();
|
abort();
|
||||||
}
|
}
|
||||||
@@ -971,6 +971,8 @@ printf("~~~~~~~~~~~~~~~~~~~~successfully get the parallel config[%d], worker con
|
|||||||
RCConfig_sim();
|
RCConfig_sim();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// source code written in below moved to later to avoid keeping waiting for nfapi_sync_cond in wait_nfapi_init.
|
||||||
|
/*
|
||||||
// start the main UE threads
|
// start the main UE threads
|
||||||
int eMBMS_active = 0;
|
int eMBMS_active = 0;
|
||||||
|
|
||||||
@@ -1001,7 +1003,7 @@ printf("~~~~~~~~~~~~~~~~~~~~successfully get the parallel config[%d], worker con
|
|||||||
PHY_vars_UE_g[0][CC_id]->rf_map.chain=CC_id+chain_offset;
|
PHY_vars_UE_g[0][CC_id]->rf_map.chain=CC_id+chain_offset;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
cpuf=get_cpu_freq_GHz();
|
cpuf=get_cpu_freq_GHz();
|
||||||
|
|
||||||
@@ -1090,7 +1092,36 @@ printf("~~~~~~~~~~~~~~~~~~~~successfully get the parallel config[%d], worker con
|
|||||||
}
|
}
|
||||||
printf("NFAPI MODE:%s\n", nfapi_mode_str);
|
printf("NFAPI MODE:%s\n", nfapi_mode_str);
|
||||||
|
|
||||||
|
// start the main UE threads
|
||||||
|
int eMBMS_active = 0;
|
||||||
|
|
||||||
|
if (nfapi_mode==3) // UE-STUB-PNF
|
||||||
|
{
|
||||||
|
config_sync_var=0;
|
||||||
|
wait_nfapi_init("main?");
|
||||||
|
//Panos: Temporarily we will be using single set of threads for multiple UEs.
|
||||||
|
//init_UE_stub(1,eMBMS_active,uecap_xer_in,emul_iface);
|
||||||
|
init_UE_stub_single_thread(NB_UE_INST,eMBMS_active,uecap_xer_in,emul_iface);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
init_UE(NB_UE_INST,eMBMS_active,uecap_xer_in,0,phy_test,UE_scan,UE_scan_carrier,mode,(int)rx_gain[0][0],tx_max_power[0],
|
||||||
|
frame_parms[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (phy_test==0) {
|
||||||
|
printf("Filling UE band info\n");
|
||||||
|
fill_ue_band_info();
|
||||||
|
dl_phy_sync_success (0, 0, 0, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (nfapi_mode!=3){
|
||||||
|
number_of_cards = 1;
|
||||||
|
for(CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
|
||||||
|
PHY_vars_UE_g[0][CC_id]->rf_map.card=0;
|
||||||
|
PHY_vars_UE_g[0][CC_id]->rf_map.chain=CC_id+chain_offset;
|
||||||
|
}
|
||||||
|
}
|
||||||
// connect the TX/RX buffers
|
// connect the TX/RX buffers
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user