Merge remote-tracking branch 'origin/uhd_priority_set_cleanup' into develop_integration_2020_w04

executables/nr-ru.c

@@ -1250,13 +1250,6 @@ static void *ru_thread_tx( void *param ) {
   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();
-  }
-
   while (!oai_exit) {
 
     LOG_D(PHY,"ru_thread_tx: Waiting for TX processing\n");

targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c

@@ -1147,7 +1147,6 @@ int device_init(openair0_device *device,
     device->trx_set_gains_func   = trx_brf_set_gains;
     device->openair0_cfg = openair0_cfg;
     device->priv = (void *)brf;
-    device->uhd_set_thread_priority = NULL;
 
     calibrate_rf(device);
 

targets/ARCH/COMMON/common_lib.h

@@ -400,10 +400,6 @@ struct openair0_device_t {
    * \param arg pointer to capabilities or configuration
    */
   void (*configure_rru)(int idx, void *arg);
-
-  /*! \brief set UHD thread priority
-   */
-  void (*uhd_set_thread_priority)(void);
 };
 
 /* type of device init function, implemented in shared lib */

targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c

@@ -417,7 +417,6 @@ int transport_init(openair0_device *device,
     device->trx_stop_func        = trx_eth_stop;
     device->trx_set_freq_func = trx_eth_set_freq;
     device->trx_set_gains_func = trx_eth_set_gains;
-    device->uhd_set_thread_priority = NULL;
 
     if (eth->flags == ETH_RAW_MODE) {
         device->trx_write_func   = trx_eth_write_raw;

targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp

@@ -405,7 +405,6 @@ int device_init(openair0_device *device, openair0_config_t *openair0_cfg){
   device->trx_stop_func = trx_lms_stop;
   device->trx_set_freq_func = trx_lms_set_freq;
   device->trx_set_gains_func = trx_lms_set_gains;
-  device->uhd_set_thread_priority = NULL;
 
   device->openair0_cfg = openair0_cfg;
 

targets/ARCH/LMSSDR/USERSPACE/LIB/sodera_lib.cpp

@@ -706,7 +706,6 @@ int openair0_dev_init_sodera(openair0_device* device, openair0_config_t *openair
   device->trx_stop_func  = trx_sodera_stop;
   device->trx_set_freq_func = trx_sodera_set_freq;
   device->trx_set_gains_func   = trx_sodera_set_gains;
-  device->uhd_set_thread_priority = NULL;
   
   s->sample_rate   = openair0_cfg[0].sample_rate;
   s->channelscount = openair0_cfg[0].rx_num_channels;

targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp

@@ -893,15 +893,6 @@ int trx_usrp_reset_stats(openair0_device *device) {
   return(0);
 }
 
-/*! \brief Set uhd priority
- */
-static void uhd_set_thread_priority(void) {
-  uhd::set_thread_priority_safe(1.0);
-}
-
-void noop_func(void) {
-  return;
-}
 extern "C" {
   int device_init(openair0_device *device, openair0_config_t *openair0_cfg) {
     LOG_D(HW, "openair0_cfg[0].sdr_addrs == '%s'\n", openair0_cfg[0].sdr_addrs);
@@ -941,7 +932,6 @@ extern "C" {
       set_rx_gain_offset(&openair0_cfg[0],0,bw_gain_adjust);
       device->trx_write_func = trx_usrp_write_recplay;
       device->trx_read_func  = trx_usrp_read_recplay;
-      device->uhd_set_thread_priority = noop_func;
       std::cerr << "USRP device initialized in subframes replay mode for " << s->recplay_state->u_sf_loops << " loops. Use mmap="
                 << s->recplay_state->use_mmap << std::endl;
     } else {
@@ -1294,7 +1284,6 @@ extern "C" {
       LOG_I(HW,"Device timestamp: %f...\n", s->usrp->get_time_now().get_real_secs());
       device->trx_write_func = trx_usrp_write;
       device->trx_read_func  = trx_usrp_read;
-      device->uhd_set_thread_priority = uhd_set_thread_priority;
       s->sample_rate = openair0_cfg[0].sample_rate;
 
       // TODO:

targets/ARCH/tcp_bridge/tcp_bridge.c

@@ -267,7 +267,6 @@ int device_init(openair0_device* device, openair0_config_t *openair0_cfg)
   device->trx_set_gains_func = tcp_bridge_set_gains;
   device->trx_write_func   = tcp_bridge_write;
   device->trx_read_func    = tcp_bridge_read;
-  device->uhd_set_thread_priority = NULL;
 
   device->priv = tcp_bridge;
 

targets/ARCH/tcp_bridge/tcp_bridge_oai.c

@@ -413,7 +413,6 @@ int device_init(openair0_device *device, openair0_config_t *openair0_cfg) {
   device->trx_set_freq_func    = tcp_bridge_set_freq;
   device->trx_set_gains_func   = tcp_bridge_set_gains;
   device->trx_write_func       = tcp_bridge_write;
-  device->uhd_set_thread_priority = NULL;
 
   if (tcp_bridge->is_enb) {
     device->trx_read_func      = tcp_bridge_read;