Commit 310359c6 authored by Wang Tsu-Han's avatar Wang Tsu-Han

adding log for priority setting and using pipeline structure

parent a2bf9dc9
...@@ -1209,15 +1209,16 @@ static void *ru_thread_tx( void *param ) { ...@@ -1209,15 +1209,16 @@ static void *ru_thread_tx( void *param ) {
int ret; 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) if(ru->rfdevice.uhd_set_thread_priority != NULL)
{ {
LOG_I(PHY,"set ru_thread_tx uhd priority \n");
ru->rfdevice.uhd_set_thread_priority(); 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) { while (!oai_exit) {
if (oai_exit) break; if (oai_exit) break;
......
...@@ -909,7 +909,8 @@ int trx_usrp_reset_stats(openair0_device *device) { ...@@ -909,7 +909,8 @@ int trx_usrp_reset_stats(openair0_device *device) {
/*! \brief Set uhd priority /*! \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); uhd::set_thread_priority_safe(1.0);
} }
...@@ -1368,6 +1369,7 @@ extern "C" { ...@@ -1368,6 +1369,7 @@ extern "C" {
device->trx_set_freq_func = trx_usrp_set_freq; device->trx_set_freq_func = trx_usrp_set_freq;
device->trx_set_gains_func = trx_usrp_set_gains; device->trx_set_gains_func = trx_usrp_set_gains;
device->openair0_cfg = openair0_cfg; device->openair0_cfg = openair0_cfg;
device->uhd_set_thread_priority = uhd_set_thread_priority;
s->sample_rate = openair0_cfg[0].sample_rate; s->sample_rate = openair0_cfg[0].sample_rate;
// TODO: // TODO:
......
...@@ -262,7 +262,7 @@ RUs = ( ...@@ -262,7 +262,7 @@ RUs = (
THREAD_STRUCT = ( THREAD_STRUCT = (
{ {
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT" #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" #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_DISABLE"; worker_config = "WORKER_DISABLE";
} }
......
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