first version of RT fix in UE

common/utils/itti/assertions.h

@@ -65,7 +65,7 @@ _Assert_(cOND, _Assert_Exit_, #vALUE1 ": %" PRIdMAX "\n" #vALUE2 ": %" PRIdMAX "
          (intmax_t)vALUE1, (intmax_t)vALUE2, (intmax_t)vALUE3)
 
 #define DevCheck4(cOND, vALUE1, vALUE2, vALUE3, vALUE4)                                                                         \
-_Assert_(cOND, _Assert_Exit_, #vALUE1": %"PRIdMAX"\n"#vALUE2": %"PRIdMAX"\n"#vALUE3": %"PRIdMAX"\n"#vALUE4": %"PRIdMAX"\n\n",   \
+_Assert_(cOND, _Assert_Exit_, #vALUE1": %" PRIdMAX "\n" #vALUE2 ": %" PRIdMAX "\n" #vALUE3 ": %" PRIdMAX "\n" #vALUE4 ": %" PRIdMAX "\n\n",   \
          (intmax_t)vALUE1, (intmax_t)vALUE2, (intmax_t)vALUE3, (intmax_t)vALUE4)
 
 #define DevParam(vALUE1, vALUE2, vALUE3)    DevCheck(0, vALUE1, vALUE2, vALUE3)

openair1/PHY/defs.h

@@ -371,6 +371,9 @@ typedef struct {
   pthread_mutex_t mutex_rxtx;
   /// scheduling parameters for RXn-TXnp4 thread
   struct sched_param sched_param_rxtx;
+  int sub_frame_start;
+  int sub_frame_step;
+  unsigned long long gotIQs;
 } UE_rxtx_proc_t;
 
 /// Context data structure for eNB subframe processing

openair2/COMMON/platform_types.h

@@ -255,7 +255,7 @@ typedef struct protocol_ctxt_s {
     (Ctxt_Pp)->subframe  = sUBfRAME; \
     PROTOCOL_CTXT_COMPUTE_MODULE_ID(Ctxt_Pp)
 
-#define PROTOCOL_CTXT_FMT "[FRAME %05u][%s][MOD %02u][RNTI %"PRIx16"]"
+#define PROTOCOL_CTXT_FMT "[FRAME %05u][%s][MOD %02u][RNTI %" PRIx16 "]"
 #define PROTOCOL_CTXT_ARGS(CTXT_Pp) \
     (CTXT_Pp)->frame, \
     ((CTXT_Pp)->enb_flag == ENB_FLAG_YES) ? "eNB":" UE", \

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

@@ -45,7 +45,7 @@
 #ifdef __SSE4_1__
 #  include <smmintrin.h>
 #endif
- 
+
 #ifdef __AVX2__
 #  include <immintrin.h>
 #endif
@@ -61,8 +61,8 @@
 /*! \brief USRP Configuration */
 typedef struct {
 
-  // --------------------------------
-  // variables for USRP configuration
+    // --------------------------------
+    // variables for USRP configuration
     // --------------------------------
     //! USRP device pointer
     uhd::usrp::multi_usrp::sptr usrp;
@@ -92,8 +92,8 @@ typedef struct {
     int num_seq_errors;
     int64_t tx_count;
     int64_t rx_count;
-  //! timestamp of RX packet
-  openair0_timestamp rx_timestamp;
+    //! timestamp of RX packet
+    openair0_timestamp rx_timestamp;
 
 } usrp_state_t;
 extern double cpuf;
@@ -150,19 +150,19 @@ static void trx_usrp_end(openair0_device *device) {
     s->rx_stream->issue_stream_cmd(uhd::stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS);
     //send a mini EOB packet
     s->tx_md.end_of_burst = true;
-  s->tx_stream->send("", 0, s->tx_md);
-  s->tx_md.end_of_burst = false;
-  
+    s->tx_stream->send("", 0, s->tx_md);
+    s->tx_md.end_of_burst = false;
+
 }
 
 /*! \brief Called to send samples to the USRP RF target
       @param device pointer to the device structure specific to the RF hardware target
-      @param timestamp The timestamp at whicch the first sample MUST be sent 
+      @param timestamp The timestamp at whicch the first sample MUST be sent
       @param buff Buffer which holds the samples
       @param nsamps number of samples to be sent
       @param antenna_id index of the antenna if the device has multiple anteannas
       @param flags flags must be set to TRUE if timestamp parameter needs to be applied
-*/ 
+*/
 static int trx_usrp_write(openair0_device *device, openair0_timestamp timestamp, void **buff, int nsamps, int cc, int flags) {
     int ret=0;
     usrp_state_t *s = (usrp_state_t*)device->priv;
@@ -230,31 +230,31 @@ static int trx_usrp_read(openair0_device *device, openair0_timestamp *ptimestamp
                     break;
             }
         }
-  // bring RX data into 12 LSBs for softmodem RX
-    for (int i=0;i<cc;i++) {
-      for (int j=0; j<nsamps2; j++) {      
+        // bring RX data into 12 LSBs for softmodem RX
+        for (int i=0; i<cc; i++) {
+            for (int j=0; j<nsamps2; j++) {
 #if defined(__x86_64__) || defined(__i386__)
 #ifdef __AVX2__
-        ((__m256i *)buff[i])[j] = _mm256_srai_epi16(buff_tmp[i][j],4);
+                ((__m256i *)buff[i])[j] = _mm256_srai_epi16(buff_tmp[i][j],4);
 #else
-        ((__m128i *)buff[i])[j] = _mm_srai_epi16(buff_tmp[i][j],4);
+                ((__m128i *)buff[i])[j] = _mm_srai_epi16(buff_tmp[i][j],4);
 #endif
 #elif defined(__arm__)
-        ((int16x8_t*)buff[i])[j] = vshrq_n_s16(buff_tmp[i][j],4);
+                ((int16x8_t*)buff[i])[j] = vshrq_n_s16(buff_tmp[i][j],4);
 #endif
-      }
-    }
-  } else if (device->type == USRP_X300_DEV) {
-    if (cc>1) { 
-    // receive multiple channels (e.g. RF A and RF B)
-      std::vector<void *> buff_ptrs;
- 
-      for (int i=0;i<cc;i++) buff_ptrs.push_back(buff[i]);
-      samples_received = s->rx_stream->recv(buff_ptrs, nsamps, s->rx_md);
-    } else {
-    // receive a single channel (e.g. from connector RF A)
-      samples_received = s->rx_stream->recv(buff[0], nsamps, s->rx_md);
-    }
+            }
+        }
+    } else if (device->type == USRP_X300_DEV) {
+        if (cc>1) {
+            // receive multiple channels (e.g. RF A and RF B)
+            std::vector<void *> buff_ptrs;
+
+            for (int i=0; i<cc; i++) buff_ptrs.push_back(buff[i]);
+            samples_received = s->rx_stream->recv(buff_ptrs, nsamps, s->rx_md);
+        } else {
+            // receive a single channel (e.g. from connector RF A)
+            samples_received = s->rx_stream->recv(buff[0], nsamps, s->rx_md);
+        }
     }
     if (samples_received < nsamps)
         LOG_E(PHY,"[recv] received %d samples out of %d\n",samples_received,nsamps);
@@ -283,56 +283,56 @@ static bool is_equal(double a, double b) {
  * \param device the hardware to use
  * \param openair0_cfg RF frontend parameters set by application
  * \param dummy dummy variable not used
- * \returns 0 in success 
+ * \returns 0 in success
  */
 int trx_usrp_set_freq(openair0_device* device, openair0_config_t *openair0_cfg, int dummy) {
 
-  usrp_state_t *s = (usrp_state_t*)device->priv;
+    usrp_state_t *s = (usrp_state_t*)device->priv;
 
     LOG_I(PHY,"Setting USRP TX Freq %f, RX Freq %f\n",openair0_cfg[0].tx_freq[0],openair0_cfg[0].rx_freq[0]);
-  s->usrp->set_tx_freq(openair0_cfg[0].tx_freq[0]);
-  s->usrp->set_rx_freq(openair0_cfg[0].rx_freq[0]);
+    s->usrp->set_tx_freq(openair0_cfg[0].tx_freq[0]);
+    s->usrp->set_rx_freq(openair0_cfg[0].rx_freq[0]);
+
+    return(0);
 
-  return(0);
-  
 }
 
-/*! \brief Set RX frequencies 
+/*! \brief Set RX frequencies
  * \param device the hardware to use
  * \param openair0_cfg RF frontend parameters set by application
- * \returns 0 in success 
+ * \returns 0 in success
  */
 int openair0_set_rx_frequencies(openair0_device* device, openair0_config_t *openair0_cfg) {
 
-  usrp_state_t *s = (usrp_state_t*)device->priv;
-  static int first_call=1;
-  static double rf_freq,diff;
+    usrp_state_t *s = (usrp_state_t*)device->priv;
+    static int first_call=1;
+    static double rf_freq,diff;
 
-  uhd::tune_request_t rx_tune_req(openair0_cfg[0].rx_freq[0]);
+    uhd::tune_request_t rx_tune_req(openair0_cfg[0].rx_freq[0]);
 
-  rx_tune_req.rf_freq_policy = uhd::tune_request_t::POLICY_MANUAL;
-  rx_tune_req.rf_freq = openair0_cfg[0].rx_freq[0];
-  rf_freq=openair0_cfg[0].rx_freq[0];
-  s->usrp->set_rx_freq(rx_tune_req);
+    rx_tune_req.rf_freq_policy = uhd::tune_request_t::POLICY_MANUAL;
+    rx_tune_req.rf_freq = openair0_cfg[0].rx_freq[0];
+    rf_freq=openair0_cfg[0].rx_freq[0];
+    s->usrp->set_rx_freq(rx_tune_req);
+
+    return(0);
 
-  return(0);
-  
 }
 
 /*! \brief Set Gains (TX/RX)
  * \param device the hardware to use
  * \param openair0_cfg RF frontend parameters set by application
- * \returns 0 in success 
+ * \returns 0 in success
  */
-int trx_usrp_set_gains(openair0_device* device, 
-		       openair0_config_t *openair0_cfg) {
+int trx_usrp_set_gains(openair0_device* device,
+                       openair0_config_t *openair0_cfg) {
 
-  usrp_state_t *s = (usrp_state_t*)device->priv;
+    usrp_state_t *s = (usrp_state_t*)device->priv;
 
-  s->usrp->set_tx_gain(openair0_cfg[0].tx_gain[0]);
-  ::uhd::gain_range_t gain_range = s->usrp->get_rx_gain_range(0);
-  // limit to maximum gain
-  if (openair0_cfg[0].rx_gain[0]-openair0_cfg[0].rx_gain_offset[0] > gain_range.stop()) {
+    s->usrp->set_tx_gain(openair0_cfg[0].tx_gain[0]);
+    ::uhd::gain_range_t gain_range = s->usrp->get_rx_gain_range(0);
+    // limit to maximum gain
+    if (openair0_cfg[0].rx_gain[0]-openair0_cfg[0].rx_gain_offset[0] > gain_range.stop()) {
         LOG_E(PHY,"RX Gain 0 too high, reduce by %f dB\n",
               openair0_cfg[0].rx_gain[0]-openair0_cfg[0].rx_gain_offset[0] - gain_range.stop());
         exit(-1);
@@ -342,14 +342,14 @@ int trx_usrp_set_gains(openair0_device* device,
           openair0_cfg[0].rx_gain[0]-openair0_cfg[0].rx_gain_offset[0],
           openair0_cfg[0].rx_gain[0],gain_range.stop());
 
-  return(0);
+    return(0);
 }
 
 /*! \brief Stop USRP
  * \param card refers to the hardware index to use
  */
 int trx_usrp_stop(openair0_device* device) {
-  return(0);
+    return(0);
 }
 
 /*! \brief USRPB210 RX calibration table */
@@ -385,49 +385,49 @@ rx_gain_calib_table_t calib_table_x310[] = {
 /*! \brief Set RX gain offset
  * \param openair0_cfg RF frontend parameters set by application
  * \param chain_index RF chain to apply settings to
- * \returns 0 in success 
+ * \returns 0 in success
  */
 void set_rx_gain_offset(openair0_config_t *openair0_cfg, int chain_index,int bw_gain_adjust) {
 
-  int i=0;
-  // loop through calibration table to find best adjustment factor for RX frequency
-  double min_diff = 6e9,diff,gain_adj=0.0;
-  if (bw_gain_adjust==1) {
-    switch ((int)openair0_cfg[0].sample_rate) {
-    case 30720000:      
-      break;
-    case 23040000:
-      gain_adj=1.25;
-      break;
-    case 15360000:
-      gain_adj=3.0;
-      break;
-    case 7680000:
-      gain_adj=6.0;
-      break;
-    case 3840000:
-      gain_adj=9.0;
-      break;
-    case 1920000:
-      gain_adj=12.0;
-      break;
-    default:
+    int i=0;
+    // loop through calibration table to find best adjustment factor for RX frequency
+    double min_diff = 6e9,diff,gain_adj=0.0;
+    if (bw_gain_adjust==1) {
+        switch ((int)openair0_cfg[0].sample_rate) {
+        case 30720000:
+            break;
+        case 23040000:
+            gain_adj=1.25;
+            break;
+        case 15360000:
+            gain_adj=3.0;
+            break;
+        case 7680000:
+            gain_adj=6.0;
+            break;
+        case 3840000:
+            gain_adj=9.0;
+            break;
+        case 1920000:
+            gain_adj=12.0;
+            break;
+        default:
             LOG_E(PHY,"unknown sampling rate %d\n",(int)openair0_cfg[0].sample_rate);
-      exit(-1);
-      break;
+            exit(-1);
+            break;
+        }
     }
-  }
-  while (openair0_cfg->rx_gain_calib_table[i].freq>0) {
-    diff = fabs(openair0_cfg->rx_freq[chain_index] - openair0_cfg->rx_gain_calib_table[i].freq);
+    while (openair0_cfg->rx_gain_calib_table[i].freq>0) {
+        diff = fabs(openair0_cfg->rx_freq[chain_index] - openair0_cfg->rx_gain_calib_table[i].freq);
         LOG_I(PHY,"cal %d: freq %f, offset %f, diff %f\n",
-	   i,
-	   openair0_cfg->rx_gain_calib_table[i].freq,
-	   openair0_cfg->rx_gain_calib_table[i].offset,diff);
-    if (min_diff > diff) {
-      min_diff = diff;
-      openair0_cfg->rx_gain_offset[chain_index] = openair0_cfg->rx_gain_calib_table[i].offset+gain_adj;
-    }
-    i++;
+              i,
+              openair0_cfg->rx_gain_calib_table[i].freq,
+              openair0_cfg->rx_gain_calib_table[i].offset,diff);
+        if (min_diff > diff) {
+            min_diff = diff;
+            openair0_cfg->rx_gain_offset[chain_index] = openair0_cfg->rx_gain_calib_table[i].offset+gain_adj;
+        }
+        i++;
     }
 }
 
@@ -448,10 +448,10 @@ int trx_usrp_reset_stats(openair0_device* device) {
 }
 
 extern "C" {
-/*! \brief Initialize Openair USRP target. It returns 0 if OK
-* \param device the hardware to use
-     * \param openair0_cfg RF frontend parameters set by application
-     */
+    /*! \brief Initialize Openair USRP target. It returns 0 if OK
+    * \param device the hardware to use
+         * \param openair0_cfg RF frontend parameters set by application
+         */
     int device_init(openair0_device* device, openair0_config_t *openair0_cfg) {
         //uhd::set_thread_priority_safe(1.0);
         usrp_state_t *s = (usrp_state_t*)calloc(sizeof(usrp_state_t),1);
@@ -485,17 +485,17 @@ extern "C" {
             }
             LOG_I(PHY,"Found USRP X300\n");
             s->usrp = uhd::usrp::multi_usrp::make(args);
-    // lock mboard clocks
-    s->usrp->set_clock_source("internal");
-    
-    //Setting device type to USRP X300/X310 
-    device->type=USRP_X300_DEV;
+            // lock mboard clocks
+            s->usrp->set_clock_source("internal");
 
-    // this is not working yet, master clock has to be set via constructor
-    // set master clock rate and sample rate for tx & rx for streaming
-    //s->usrp->set_master_clock_rate(usrp_master_clock);
+            //Setting device type to USRP X300/X310
+            device->type=USRP_X300_DEV;
 
-    openair0_cfg[0].rx_gain_calib_table = calib_table_x310;
+            // this is not working yet, master clock has to be set via constructor
+            // set master clock rate and sample rate for tx & rx for streaming
+            //s->usrp->set_master_clock_rate(usrp_master_clock);
+
+            openair0_cfg[0].rx_gain_calib_table = calib_table_x310;
 
             switch ((int)openair0_cfg[0].sample_rate) {
             case 30720000:
@@ -610,7 +610,7 @@ extern "C" {
         uhd::stream_args_t stream_args_rx("sc16", "sc16");
         int samples=openair0_cfg[0].sample_rate;
         //while ( samples > s->rx_stream->get_max_num_samps())
-        samples/=4000;
+        samples/=24000;
         stream_args_rx.args["spp"] = str(boost::format("%d") % samples );
         for (int i = 0; i<openair0_cfg[0].rx_num_channels; i++)
             stream_args_rx.channels.push_back(i);
@@ -646,33 +646,33 @@ extern "C" {
             LOG_I(PHY,"  Actual TX frequency: %fGHz...\n", s->usrp->get_tx_freq(i)/1e9);
             LOG_I(PHY,"  Actual TX gain: %f...\n", s->usrp->get_tx_gain(i));
             LOG_I(PHY,"  Actual TX bandwidth: %fM...\n", s->usrp->get_tx_bandwidth(i)/1e6);
-            LOG_I(PHY,"  Actual TX antenna: %s...\n", s->usrp->get_tx_antenna(i));
+            LOG_I(PHY,"  Actual TX antenna: %u...\n", s->usrp->get_tx_antenna(i));
         }
 
         LOG_I(PHY,"Device timestamp: %f...\n", s->usrp->get_time_now().get_real_secs());
 
         device->priv = s;
-  device->trx_start_func = trx_usrp_start;
-  device->trx_write_func = trx_usrp_write;
-  device->trx_read_func  = trx_usrp_read;
-  device->trx_get_stats_func = trx_usrp_get_stats;
-  device->trx_reset_stats_func = trx_usrp_reset_stats;
-  device->trx_end_func   = trx_usrp_end;
-  device->trx_stop_func  = trx_usrp_stop;
-  device->trx_set_freq_func = trx_usrp_set_freq;
-  device->trx_set_gains_func   = trx_usrp_set_gains;
-  device->openair0_cfg = openair0_cfg;
-
-  s->sample_rate = openair0_cfg[0].sample_rate;
-  // TODO:
-  // init tx_forward_nsamps based usrp_time_offset ex
-  if(is_equal(s->sample_rate, (double)30.72e6))
-    s->tx_forward_nsamps  = 176;
-  if(is_equal(s->sample_rate, (double)15.36e6))
-    s->tx_forward_nsamps = 90;
-  if(is_equal(s->sample_rate, (double)7.68e6))
-    s->tx_forward_nsamps = 50;
-  return 0;
-  }
+        device->trx_start_func = trx_usrp_start;
+        device->trx_write_func = trx_usrp_write;
+        device->trx_read_func  = trx_usrp_read;
+        device->trx_get_stats_func = trx_usrp_get_stats;
+        device->trx_reset_stats_func = trx_usrp_reset_stats;
+        device->trx_end_func   = trx_usrp_end;
+        device->trx_stop_func  = trx_usrp_stop;
+        device->trx_set_freq_func = trx_usrp_set_freq;
+        device->trx_set_gains_func   = trx_usrp_set_gains;
+        device->openair0_cfg = openair0_cfg;
+
+        s->sample_rate = openair0_cfg[0].sample_rate;
+        // TODO:
+        // init tx_forward_nsamps based usrp_time_offset ex
+        if(is_equal(s->sample_rate, (double)30.72e6))
+            s->tx_forward_nsamps  = 176;
+        if(is_equal(s->sample_rate, (double)15.36e6))
+            s->tx_forward_nsamps = 90;
+        if(is_equal(s->sample_rate, (double)7.68e6))
+            s->tx_forward_nsamps = 50;
+        return 0;
+    }
 }
 /*@}*/

targets/RT/USER/lte-softmodem.c

@@ -484,9 +484,12 @@ static void *scope_thread(void *arg)
   int UE_id, CC_id;
   int ue_cnt=0;
 
-  sched_param.sched_priority = sched_get_priority_min(SCHED_FIFO)+1;
-  sched_setscheduler(0, SCHED_FIFO,&sched_param);
-
+  sched_param.sched_priority = sched_get_priority_max(SCHED_OTHER);
+  sched_setscheduler(0, SCHED_OTHER,&sched_param);
+  cpu_set_t cpuset;
+  CPU_ZERO(&cpuset);
+  CPU_SET(0, &cpuset);
+  pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
   printf("Scope thread has priority %d\n",sched_param.sched_priority);
 
 # ifdef ENABLE_XFORMS_WRITE_STATS