Commit b4021566 authored by Wang Tsu-Han's avatar Wang Tsu-Han

fixes for printing single thread fep timing measurment

parent a34dc257
...@@ -794,11 +794,11 @@ int ulsch_decoding_data(PHY_VARS_eNB *eNB,int UE_id,int harq_pid,int llr8_flag) ...@@ -794,11 +794,11 @@ int ulsch_decoding_data(PHY_VARS_eNB *eNB,int UE_id,int harq_pid,int llr8_flag)
int ulsch_decoding_data_all(PHY_VARS_eNB *eNB,int UE_id,int harq_pid,int llr8_flag) int ulsch_decoding_data_all(PHY_VARS_eNB *eNB,int UE_id,int harq_pid,int llr8_flag)
{ {
int ret = 0; int ret = 0;
/*if(codingw) if(codingw)
{ {
ret = ulsch_decoding_data_2thread(eNB,UE_id,harq_pid,llr8_flag); ret = ulsch_decoding_data_2thread(eNB,UE_id,harq_pid,llr8_flag);
} }
else*/ else
{ {
ret = ulsch_decoding_data(eNB,UE_id,harq_pid,llr8_flag); ret = ulsch_decoding_data(eNB,UE_id,harq_pid,llr8_flag);
} }
......
...@@ -251,7 +251,6 @@ void feptx_ofdm(RU_t *ru) { ...@@ -251,7 +251,6 @@ void feptx_ofdm(RU_t *ru) {
// int CC_id = ru->proc.CC_id; // int CC_id = ru->proc.CC_id;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_OFDM , 1 ); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_OFDM , 1 );
slot_offset_F = 0; slot_offset_F = 0;
slot_offset = subframe*fp->samples_per_tti; slot_offset = subframe*fp->samples_per_tti;
......
...@@ -1432,12 +1432,11 @@ int setup_RU_buffers(RU_t *ru) { ...@@ -1432,12 +1432,11 @@ int setup_RU_buffers(RU_t *ru) {
static void* ru_stats_thread(void* param) { static void* ru_stats_thread(void* param) {
RU_t *ru = (RU_t*)param; RU_t *ru = (RU_t*)param;
wait_sync("ru_stats_thread"); wait_sync("ru_stats_thread");
while (!oai_exit) { while (!oai_exit) {
sleep(1); sleep(1);
if (opp_enabled == 1 && fepw) { if (opp_enabled) {
if (ru->feprx) print_meas(&ru->ofdm_demod_stats,"feprx",NULL,NULL); if (ru->feprx) print_meas(&ru->ofdm_demod_stats,"feprx",NULL,NULL);
if (ru->feptx_ofdm) print_meas(&ru->ofdm_mod_stats,"feptx_ofdm",NULL,NULL); if (ru->feptx_ofdm) print_meas(&ru->ofdm_mod_stats,"feptx_ofdm",NULL,NULL);
if (ru->fh_north_asynch_in) print_meas(&ru->rx_fhaul,"rx_fhaul",NULL,NULL); if (ru->fh_north_asynch_in) print_meas(&ru->rx_fhaul,"rx_fhaul",NULL,NULL);
...@@ -1908,8 +1907,8 @@ void init_RU_proc(RU_t *ru) { ...@@ -1908,8 +1907,8 @@ void init_RU_proc(RU_t *ru) {
} }
if (get_nprocs()> 2 && fepw) { if (get_nprocs()> 2 && fepw) {
if (ru->feprx) init_fep_thread(ru,NULL); init_fep_thread(ru,NULL);
if (ru->feptx_ofdm) init_feptx_thread(ru,NULL); init_feptx_thread(ru,NULL);
} }
if (opp_enabled == 1) pthread_create(&ru->ru_stats_thread,NULL,ru_stats_thread,(void*)ru); if (opp_enabled == 1) pthread_create(&ru->ru_stats_thread,NULL,ru_stats_thread,(void*)ru);
...@@ -1921,15 +1920,11 @@ void kill_RU_proc(int inst) ...@@ -1921,15 +1920,11 @@ void kill_RU_proc(int inst)
RU_proc_t *proc = &ru->proc; RU_proc_t *proc = &ru->proc;
if (get_nprocs() > 2 && fepw) { if (get_nprocs() > 2 && fepw) {
if (ru->feprx) {
LOG_D(PHY, "killing FEP thread\n"); LOG_D(PHY, "killing FEP thread\n");
kill_fep_thread(ru); kill_fep_thread(ru);
}
if (ru->feptx_ofdm){
LOG_D(PHY, "killing FEP TX thread\n"); LOG_D(PHY, "killing FEP TX thread\n");
kill_feptx_thread(ru); kill_feptx_thread(ru);
} }
}
pthread_mutex_lock(&proc->mutex_FH); pthread_mutex_lock(&proc->mutex_FH);
proc->instance_cnt_FH = 0; proc->instance_cnt_FH = 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