diff --git a/executables/nr-ru.c b/executables/nr-ru.c index d21afd869a05cb5e78ce5d20e64c04f78a5b3c69..eae005d41eb182c6a8a27a91ebc454225c098819 100644 --- a/executables/nr-ru.c +++ b/executables/nr-ru.c @@ -1208,16 +1208,17 @@ static void *ru_thread_tx( void *param ) { int i = 0; int ret; + + wait_on_condition(&proc->mutex_FH1,&proc->cond_FH1,&proc->instance_cnt_FH1,"ru_thread_tx"); + printf( "ru_thread_tx ready\n"); + if(ru->rfdevice.uhd_set_thread_priority != NULL) { + LOG_I(PHY,"set ru_thread_tx uhd priority \n"); ru->rfdevice.uhd_set_thread_priority(); - LOG_I(PHY,"set ru_thread_tx uhd priority"); } - wait_on_condition(&proc->mutex_FH1,&proc->cond_FH1,&proc->instance_cnt_FH1,"ru_thread_tx"); - printf( "ru_thread_tx ready\n"); - while (!oai_exit) { if (oai_exit) break; diff --git a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp index 03f89cf612839e7076cf3b7b94e13b823c233e4f..ec62047e6cc462b3db5fcb27c0e818a18be75deb 100644 --- a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp +++ b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp @@ -909,7 +909,8 @@ int trx_usrp_reset_stats(openair0_device *device) { /*! \brief Set uhd priority */ -void uhd_set_thread_priority(void) { +static void uhd_set_thread_priority(void) { + //std::cout << "~~~~~~~~~~priority setting for USRP" << std::endl; uhd::set_thread_priority_safe(1.0); } @@ -1368,6 +1369,7 @@ extern "C" { device->trx_set_freq_func = trx_usrp_set_freq; device->trx_set_gains_func = trx_usrp_set_gains; device->openair0_cfg = openair0_cfg; + device->uhd_set_thread_priority = uhd_set_thread_priority; s->sample_rate = openair0_cfg[0].sample_rate; // TODO: diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf index 8b896fc58ac9adfeb545bd940a2a04f3c0787965..26f6eddf520ddfe20290c99adf2304a86654c103 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf @@ -262,7 +262,7 @@ RUs = ( THREAD_STRUCT = ( { #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT" - parallel_config = "PARALLEL_SINGLE_THREAD"; + parallel_config = "PARALLEL_RU_L1_TRX_SPLIT"; #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE" worker_config = "WORKER_DISABLE"; }