diff --git a/openair2/UTIL/LOG/log.h b/openair2/UTIL/LOG/log.h
index 1735a89a73530521a006374bfd881874c2aa3dbb..5e5be23e0d27fc07de7f126b2d076320f455c549 100644
--- a/openair2/UTIL/LOG/log.h
+++ b/openair2/UTIL/LOG/log.h
@@ -46,7 +46,9 @@
#include <time.h>
#include <stdint.h>
#include <inttypes.h>
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
#include <pthread.h>
#else
#include "rtai_fifos.h"
diff --git a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
index c12cc50ead176a8146d6b667af1c5f4bac2e3267..00db1f46c680ea779b13428c27260873582ce9cf 100644
--- a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+++ b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
@@ -66,17 +66,17 @@ typedef struct {
// --------------------------------
//! USRP device pointer
uhd::usrp::multi_usrp::sptr usrp;
-
- //create a send streamer and a receive streamer
- //! USRP TX Stream
- uhd::tx_streamer::sptr tx_stream;
- //! USRP RX Stream
- uhd::rx_streamer::sptr rx_stream;
-
- //! USRP TX Metadata
- uhd::tx_metadata_t tx_md;
- //! USRP RX Metadata
- uhd::rx_metadata_t rx_md;
+
+ //create a send streamer and a receive streamer
+ //! USRP TX Stream
+ uhd::tx_streamer::sptr tx_stream;
+ //! USRP RX Stream
+ uhd::rx_streamer::sptr rx_stream;
+
+ //! USRP TX Metadata
+ uhd::tx_metadata_t tx_md;
+ //! USRP RX Metadata
+ uhd::rx_metadata_t rx_md;
//! Sampling rate
double sample_rate;
@@ -109,7 +109,7 @@ static int trx_usrp_start(openair0_device *device) {
// init recv and send streaming
uhd::stream_cmd_t cmd(uhd::stream_cmd_t::STREAM_MODE_START_CONTINUOUS);
cmd.time_spec = s->usrp->get_time_now() + uhd::time_spec_t(0.05);
- cmd.stream_now = true;
+ cmd.stream_now = false; // start at constant delay
s->rx_stream->issue_stream_cmd(cmd);
s->tx_md.time_spec = cmd.time_spec + uhd::time_spec_t(1-(double)s->tx_forward_nsamps/s->sample_rate);
@@ -122,7 +122,7 @@ static int trx_usrp_start(openair0_device *device) {
s->rx_timestamp = 0;
return 0;
}
-/*! \brief Terminate operation of the USRP transceiver -- free all associated resources
+/*! \brief Terminate operation of the USRP transceiver -- free all associated resources
* \param device the hardware to use
*/
static void trx_usrp_end(openair0_device *device) {
@@ -151,36 +151,33 @@ static int trx_usrp_write(openair0_device *device, openair0_timestamp timestamp,
s->tx_md.time_spec = uhd::time_spec_t::from_ticks(timestamp, s->sample_rate);
s->tx_md.has_time_spec = flags;
-
- if(flags>0)
- s->tx_md.has_time_spec = true;
- else
- s->tx_md.has_time_spec = false;
- if (flags == 2) { // start of burst
- s->tx_md.start_of_burst = true;
- s->tx_md.end_of_burst = false;
- }
- else if (flags == 3) { // end of burst
- s->tx_md.start_of_burst = false;
- s->tx_md.end_of_burst = true;
- }
- else if (flags == 4) { // start and end
- s->tx_md.start_of_burst = true;
- s->tx_md.end_of_burst = true;
- }
- else if (flags==1) { // middle of burst
- s->tx_md.start_of_burst = false;
- s->tx_md.end_of_burst = false;
- }
-
- if (cc>1) {
- std::vector<void *> buff_ptrs;
+ if(flags>0)
+ s->tx_md.has_time_spec = true;
+ else
+ s->tx_md.has_time_spec = false;
+
+ if (flags == 2) { // start of burst
+ s->tx_md.start_of_burst = true;
+ s->tx_md.end_of_burst = false;
+ } else if (flags == 3) { // end of burst
+ s->tx_md.start_of_burst = false;
+ s->tx_md.end_of_burst = true;
+ } else if (flags == 4) { // start and end
+ s->tx_md.start_of_burst = true;
+ s->tx_md.end_of_burst = true;
+ } else if (flags==1) { // middle of burst
+ s->tx_md.start_of_burst = false;
+ s->tx_md.end_of_burst = false;
+ }
+
+ if (cc>1) {
+ std::vector<void *> buff_ptrs;
for (int i=0; i<cc; i++)
buff_ptrs.push_back(buff[i]);
- ret = (int)s->tx_stream->send(buff_ptrs, nsamps, s->tx_md,1e-3);
+ ret = (int)s->tx_stream->send(buff_ptrs, nsamps, s->tx_md,1e-3);
} else
- ret = (int)s->tx_stream->send(buff[0], nsamps, s->tx_md,1e-3);
+ ret = (int)s->tx_stream->send(buff[0], nsamps, s->tx_md,1e-3);
@@ -239,27 +236,27 @@ static int trx_usrp_read(openair0_device *device, openair0_timestamp *ptimestamp
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);
@@ -280,39 +277,39 @@ static int trx_usrp_read(openair0_device *device, openair0_timestamp *ptimestamp
* \param b second variable
*/
static bool is_equal(double a, double b) {
- return std::fabs(a-b) < std::numeric_limits<double>::epsilon();
+ return std::fabs(a-b) < std::numeric_limits<double>::epsilon();
}
void *freq_thread(void *arg) {
-
- openair0_device *device=(openair0_device *)arg;
- usrp_state_t *s = (usrp_state_t*)device->priv;
-
- s->usrp->set_tx_freq(device->openair0_cfg[0].tx_freq[0]);
- s->usrp->set_rx_freq(device->openair0_cfg[0].rx_freq[0]);
+
+ openair0_device *device=(openair0_device *)arg;
+ usrp_state_t *s = (usrp_state_t*)device->priv;
+
+ s->usrp->set_tx_freq(device->openair0_cfg[0].tx_freq[0]);
+ s->usrp->set_rx_freq(device->openair0_cfg[0].rx_freq[0]);
}
/*! \brief Set frequencies (TX/RX). Spawns a thread to handle the frequency change to not block the calling thread
* \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 dont_block) {
- usrp_state_t *s = (usrp_state_t*)device->priv;
- pthread_t f_thread;
+ usrp_state_t *s = (usrp_state_t*)device->priv;
+ pthread_t f_thread;
- printf("Setting USRP TX Freq %f, RX Freq %f\n",openair0_cfg[0].tx_freq[0],openair0_cfg[0].rx_freq[0]);
+ printf("Setting USRP TX Freq %f, RX Freq %f\n",openair0_cfg[0].tx_freq[0],openair0_cfg[0].rx_freq[0]);
- // spawn a thread to handle the frequency change to not block the calling thread
- if (dont_block == 1)
- pthread_create(&f_thread,NULL,freq_thread,(void*)device);
- else {
- s->usrp->set_tx_freq(device->openair0_cfg[0].tx_freq[0]);
- s->usrp->set_rx_freq(device->openair0_cfg[0].rx_freq[0]);
- }
+ // spawn a thread to handle the frequency change to not block the calling thread
+ if (dont_block == 1)
+ pthread_create(&f_thread,NULL,freq_thread,(void*)device);
+ else {
+ s->usrp->set_tx_freq(device->openair0_cfg[0].tx_freq[0]);
+ s->usrp->set_rx_freq(device->openair0_cfg[0].rx_freq[0]);
+ }
- return(0);
+ return(0);
}
@@ -361,14 +358,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 */
@@ -441,12 +438,12 @@ void set_rx_gain_offset(openair0_config_t *openair0_cfg, int chain_index,int bw_
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++;
+ 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++;
}
}
@@ -491,11 +488,11 @@ extern "C" {
double usrp_master_clock = 184.32e6;
std::string args = "type=x300";
- // workaround for an api problem, master clock has to be set with the constructor not via set_master_clock_rate
- args += boost::str(boost::format(",master_clock_rate=%f") % usrp_master_clock);
-
+ // workaround for an api problem, master clock has to be set with the constructor not via set_master_clock_rate
+ args += boost::str(boost::format(",master_clock_rate=%f") % usrp_master_clock);
+
// args += ",num_send_frames=256,num_recv_frames=256, send_frame_size=4096, recv_frame_size=4096";
-
+
// args += ",num_send_frames=256,num_recv_frames=256, send_frame_size=4096, recv_frame_size=4096";
uhd::device_addrs_t device_adds = uhd::device::find(args);
@@ -507,10 +504,10 @@ extern "C" {
LOG_I(PHY,"Found USRP X300\n");
s->usrp = uhd::usrp::multi_usrp::make(args);
// lock mboard clocks
- if (openair0_cfg[0].clock_source == internal)
- s->usrp->set_clock_source("internal");
- else
- s->usrp->set_clock_source("external");
+ if (openair0_cfg[0].clock_source == internal)
+ s->usrp->set_clock_source("internal");
+ else
+ s->usrp->set_clock_source("external");
//Setting device type to USRP X300/X310
device->type=USRP_X300_DEV;
@@ -523,29 +520,29 @@ extern "C" {
switch ((int)openair0_cfg[0].sample_rate) {
case 30720000:
- // from usrp_time_offset
- //openair0_cfg[0].samples_per_packet = 2048;
- openair0_cfg[0].tx_sample_advance = 15;
- openair0_cfg[0].tx_bw = 20e6;
- openair0_cfg[0].rx_bw = 20e6;
- break;
- case 15360000:
- //openair0_cfg[0].samples_per_packet = 2048;
- openair0_cfg[0].tx_sample_advance = 45;
- openair0_cfg[0].tx_bw = 10e6;
- openair0_cfg[0].rx_bw = 10e6;
- break;
- case 7680000:
- //openair0_cfg[0].samples_per_packet = 2048;
- openair0_cfg[0].tx_sample_advance = 50;
- openair0_cfg[0].tx_bw = 5e6;
- openair0_cfg[0].rx_bw = 5e6;
- break;
- case 1920000:
- //openair0_cfg[0].samples_per_packet = 2048;
- openair0_cfg[0].tx_sample_advance = 50;
- openair0_cfg[0].tx_bw = 1.25e6;
- openair0_cfg[0].rx_bw = 1.25e6;
+ // from usrp_time_offset
+ //openair0_cfg[0].samples_per_packet = 2048;
+ openair0_cfg[0].tx_sample_advance = 15;
+ openair0_cfg[0].tx_bw = 20e6;
+ openair0_cfg[0].rx_bw = 20e6;
+ break;
+ case 15360000:
+ //openair0_cfg[0].samples_per_packet = 2048;
+ openair0_cfg[0].tx_sample_advance = 45;
+ openair0_cfg[0].tx_bw = 10e6;
+ openair0_cfg[0].rx_bw = 10e6;
+ break;
+ case 7680000:
+ //openair0_cfg[0].samples_per_packet = 2048;
+ openair0_cfg[0].tx_sample_advance = 50;
+ openair0_cfg[0].tx_bw = 5e6;
+ openair0_cfg[0].rx_bw = 5e6;
+ break;
+ case 1920000:
+ //openair0_cfg[0].samples_per_packet = 2048;
+ openair0_cfg[0].tx_sample_advance = 50;
+ openair0_cfg[0].tx_bw = 1.25e6;
+ openair0_cfg[0].rx_bw = 1.25e6;
break;
default:
LOG_E(PHY,"Error: unknown sampling rate %f\n",openair0_cfg[0].sample_rate);
@@ -558,19 +555,19 @@ extern "C" {
args += ",num_send_frames=256,num_recv_frames=256, send_frame_size=15360, recv_frame_size=15360" ;
s->usrp = uhd::usrp::multi_usrp::make(args);
- // s->usrp->set_rx_subdev_spec(rx_subdev);
- // s->usrp->set_tx_subdev_spec(tx_subdev);
-
- // do not explicitly set the clock to "internal", because this will disable the gpsdo
- // // lock mboard clocks
- // s->usrp->set_clock_source("internal");
- // set master clock rate and sample rate for tx & rx for streaming
-
- // lock mboard clocks
- if (openair0_cfg[0].clock_source == internal)
- s->usrp->set_clock_source("internal");
- else
- s->usrp->set_clock_source("external");
+ // s->usrp->set_rx_subdev_spec(rx_subdev);
+ // s->usrp->set_tx_subdev_spec(tx_subdev);
+
+ // do not explicitly set the clock to "internal", because this will disable the gpsdo
+ // // lock mboard clocks
+ // s->usrp->set_clock_source("internal");
+ // set master clock rate and sample rate for tx & rx for streaming
+
+ // lock mboard clocks
+ if (openair0_cfg[0].clock_source == internal)
+ s->usrp->set_clock_source("internal");
+ else
+ s->usrp->set_clock_source("external");
device->type = USRP_B200_DEV;
if ((vers == 3) && (subvers == 9) && (subsubvers>=2)) {
@@ -581,52 +578,52 @@ extern "C" {
bw_gain_adjust=1;
}
- switch ((int)openair0_cfg[0].sample_rate) {
- case 30720000:
- s->usrp->set_master_clock_rate(30.72e6);
- //openair0_cfg[0].samples_per_packet = 1024;
- openair0_cfg[0].tx_sample_advance = 115;
- openair0_cfg[0].tx_bw = 20e6;
- openair0_cfg[0].rx_bw = 20e6;
- break;
- case 23040000:
- s->usrp->set_master_clock_rate(23.04e6); //to be checked
- //openair0_cfg[0].samples_per_packet = 1024;
- openair0_cfg[0].tx_sample_advance = 113;
- openair0_cfg[0].tx_bw = 20e6;
- openair0_cfg[0].rx_bw = 20e6;
- break;
- case 15360000:
- s->usrp->set_master_clock_rate(30.72e06);
- //openair0_cfg[0].samples_per_packet = 1024;
- openair0_cfg[0].tx_sample_advance = 103;
- openair0_cfg[0].tx_bw = 20e6;
- openair0_cfg[0].rx_bw = 20e6;
- break;
- case 7680000:
- s->usrp->set_master_clock_rate(30.72e6);
- //openair0_cfg[0].samples_per_packet = 1024;
- openair0_cfg[0].tx_sample_advance = 80;
- openair0_cfg[0].tx_bw = 20e6;
- openair0_cfg[0].rx_bw = 20e6;
- break;
- case 1920000:
- s->usrp->set_master_clock_rate(30.72e6);
- //openair0_cfg[0].samples_per_packet = 1024;
- openair0_cfg[0].tx_sample_advance = 40;
- openair0_cfg[0].tx_bw = 20e6;
- openair0_cfg[0].rx_bw = 20e6;
- break;
- default:
+ switch ((int)openair0_cfg[0].sample_rate) {
+ case 30720000:
+ s->usrp->set_master_clock_rate(30.72e6);
+ //openair0_cfg[0].samples_per_packet = 1024;
+ openair0_cfg[0].tx_sample_advance = 115;
+ openair0_cfg[0].tx_bw = 20e6;
+ openair0_cfg[0].rx_bw = 20e6;
+ break;
+ case 23040000:
+ s->usrp->set_master_clock_rate(23.04e6); //to be checked
+ //openair0_cfg[0].samples_per_packet = 1024;
+ openair0_cfg[0].tx_sample_advance = 113;
+ openair0_cfg[0].tx_bw = 20e6;
+ openair0_cfg[0].rx_bw = 20e6;
+ break;
+ case 15360000:
+ s->usrp->set_master_clock_rate(30.72e06);
+ //openair0_cfg[0].samples_per_packet = 1024;
+ openair0_cfg[0].tx_sample_advance = 103;
+ openair0_cfg[0].tx_bw = 20e6;
+ openair0_cfg[0].rx_bw = 20e6;
+ break;
+ case 7680000:
+ s->usrp->set_master_clock_rate(30.72e6);
+ //openair0_cfg[0].samples_per_packet = 1024;
+ openair0_cfg[0].tx_sample_advance = 80;
+ openair0_cfg[0].tx_bw = 20e6;
+ openair0_cfg[0].rx_bw = 20e6;
+ break;
+ case 1920000:
+ s->usrp->set_master_clock_rate(30.72e6);
+ //openair0_cfg[0].samples_per_packet = 1024;
+ openair0_cfg[0].tx_sample_advance = 40;
+ openair0_cfg[0].tx_bw = 20e6;
+ openair0_cfg[0].rx_bw = 20e6;
+ break;
+ default:
LOG_E(PHY,"Error: unknown sampling rate %f\n",openair0_cfg[0].sample_rate);
exit(-1);
break;
}
}
- /* device specific */
- //openair0_cfg[0].txlaunch_wait = 1;//manage when TX processing is triggered
- //openair0_cfg[0].txlaunch_wait_slotcount = 1; //manage when TX processing is triggered
+ /* device specific */
+ //openair0_cfg[0].txlaunch_wait = 1;//manage when TX processing is triggered
+ //openair0_cfg[0].txlaunch_wait_slotcount = 1; //manage when TX processing is triggered
openair0_cfg[0].iq_txshift = 4;//shift
openair0_cfg[0].iq_rxrescale = 15;//rescale iqs
@@ -660,7 +657,7 @@ extern "C" {
// display USRP settings
LOG_I(PHY,"Actual master clock: %fMHz...\n",s->usrp->get_master_clock_rate()/1e6);
- sleep(1);
+ sleep(1);
// create tx & rx streamer
uhd::stream_args_t stream_args_rx("sc16", "sc16");
@@ -711,24 +708,24 @@ extern "C" {
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_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;
+ }
}
/*@}*/
diff --git a/targets/RT/USER/lte-ue.c b/targets/RT/USER/lte-ue.c
index 5115a824fc104cb0bf22bc42a86b768a99ce075a..0f341d29a56a7e2d9e05d31d4411d768e3f8baab 100644
--- a/targets/RT/USER/lte-ue.c
+++ b/targets/RT/USER/lte-ue.c
@@ -79,6 +79,7 @@
#define FRAME_PERIOD 100000000ULL
#define DAQ_PERIOD 66667ULL
+#define FIFO_PRIORITY 40
typedef enum {
pss=0,
@@ -241,171 +242,69 @@ static void *UE_thread_synch(void *arg) {
int current_offset = 0;
sync_mode_t sync_mode = pbch;
int CC_id = UE->CC_id;
- int ind;
- int found;
int freq_offset=0;
- UE->is_synchronized = 0;
- printf("UE_thread_sync in with PHY_vars_UE %p\n",arg);
- printf("waiting for sync (UE_thread_synch) \n");
-
-#ifndef DEADLINE_SCHEDULER
- int policy, s, j;
- struct sched_param sparam;
- char cpu_affinity[1024];
cpu_set_t cpuset;
-
- /* Set affinity mask to include CPUs 1 to MAX_CPUS */
- /* CPU 0 is reserved for UHD threads */
CPU_ZERO(&cpuset);
+ CPU_SET(3, &cpuset);
+ // this thread priority must be lower that the main acquisition thread
+ init_thread(100000, 500000, FIFO_PRIORITY-1, &cpuset,
+ "sync UE");
-#ifdef CPU_AFFINITY
- if (get_nprocs() >2) {
- for (j = 1; j < get_nprocs(); j++)
- CPU_SET(j, &cpuset);
-
- s = pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
- if (s != 0) {
- perror( "pthread_setaffinity_np");
- exit_fun("Error setting processor affinity");
- }
- }
-#endif
-
- /* Check the actual affinity mask assigned to the thread */
-
- s = pthread_getaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
- if (s != 0) {
- perror( "pthread_getaffinity_np");
- exit_fun("Error getting processor affinity ");
- }
- memset(cpu_affinity, 0 , sizeof(cpu_affinity));
- for (j = 0; j < CPU_SETSIZE; j++)
- if (CPU_ISSET(j, &cpuset)) {
- char temp[1024];
- sprintf(temp, " CPU_%d ", j);
- strcat(cpu_affinity, temp);
- }
-
- memset(&sparam, 0 , sizeof (sparam));
- sparam.sched_priority = sched_get_priority_max(SCHED_FIFO)-1;
- policy = SCHED_FIFO ;
-
- s = pthread_setschedparam(pthread_self(), policy, &sparam);
- if (s != 0) {
- perror("pthread_setschedparam : ");
- exit_fun("Error setting thread priority");
- }
- s = pthread_getschedparam(pthread_self(), &policy, &sparam);
- if (s != 0) {
- perror("pthread_getschedparam : ");
- exit_fun("Error getting thread priority");
-
- }
-
- LOG_I( HW, "[SCHED][UE] Started UE synch thread on CPU %d TID %ld , sched_policy = %s, priority = %d, CPU Affinity = %s \n", (int)sched_getcpu(), gettid(),
- (policy == SCHED_FIFO) ? "SCHED_FIFO" :
- (policy == SCHED_RR) ? "SCHED_RR" :
- (policy == SCHED_OTHER) ? "SCHED_OTHER" :
- "???",
- (int) sparam.sched_priority, cpu_affinity);
-
-#endif
-
- printf("starting UE synch thread (IC %d)\n",UE->proc.instance_cnt_synch);
- ind = 0;
- found = 0;
-
+ UE->is_synchronized = 0;
if (UE->UE_scan == 0) {
- do {
+ int ind;
+ for ( ind=0;
+ ind < sizeof(eutra_bands) / sizeof(eutra_bands[0]);
+ ind++) {
current_band = eutra_bands[ind].band;
- printf( "Scanning band %d, dl_min %"PRIu32", ul_min %"PRIu32"\n", current_band, eutra_bands[ind].dl_min,eutra_bands[ind].ul_min);
-
- if ((eutra_bands[ind].dl_min <= downlink_frequency[0][0]) && (eutra_bands[ind].dl_max >= downlink_frequency[0][0])) {
+ LOG_D(PHY, "Scanning band %d, dl_min %"PRIu32", ul_min %"PRIu32"\n", current_band, eutra_bands[ind].dl_min,eutra_bands[ind].ul_min);
+ if ( eutra_bands[ind].dl_min <= downlink_frequency[0][0] && eutra_bands[ind].dl_max >= downlink_frequency[0][0] ) {
for (i=0; i<4; i++)
uplink_frequency_offset[CC_id][i] = eutra_bands[ind].ul_min - eutra_bands[ind].dl_min;
-
- found = 1;
break;
}
-
- ind++;
- } while (ind < sizeof(eutra_bands) / sizeof(eutra_bands[0]));
-
- if (found == 0) {
- exit_fun("Can't find EUTRA band for frequency");
- return &UE_thread_synch_retval;
}
+ AssertFatal( ind < sizeof(eutra_bands) / sizeof(eutra_bands[0]), "Can't find EUTRA band for frequency");
-
-
-
-
-
- LOG_I( PHY, "[SCHED][UE] Check absolute frequency DL %"PRIu32", UL %"PRIu32" (oai_exit %d, rx_num_channels %d)\n", downlink_frequency[0][0], downlink_frequency[0][0]+uplink_frequency_offset[0][0],oai_exit, openair0_cfg[0].rx_num_channels);
+ LOG_I( PHY, "[SCHED][UE] Check absolute frequency DL %"PRIu32", UL %"PRIu32" (oai_exit %d, rx_num_channels %d)\n",
+ downlink_frequency[0][0], downlink_frequency[0][0]+uplink_frequency_offset[0][0],
+ oai_exit, openair0_cfg[0].rx_num_channels);
for (i=0; i<openair0_cfg[UE->rf_map.card].rx_num_channels; i++) {
openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i];
- openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i]+uplink_frequency_offset[CC_id][i];
+ openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] =
+ downlink_frequency[CC_id][i]+uplink_frequency_offset[CC_id][i];
openair0_cfg[UE->rf_map.card].autocal[UE->rf_map.chain+i] = 1;
if (uplink_frequency_offset[CC_id][i] != 0) //
openair0_cfg[UE->rf_map.card].duplex_mode = duplex_mode_FDD;
else //FDD
openair0_cfg[UE->rf_map.card].duplex_mode = duplex_mode_TDD;
}
-
sync_mode = pbch;
- } else if (UE->UE_scan == 1) {
+ } else {
current_band=0;
-
for (i=0; i<openair0_cfg[UE->rf_map.card].rx_num_channels; i++) {
downlink_frequency[UE->rf_map.card][UE->rf_map.chain+i] = bands_to_scan.band_info[CC_id].dl_min;
- uplink_frequency_offset[UE->rf_map.card][UE->rf_map.chain+i] = bands_to_scan.band_info[CC_id].ul_min-bands_to_scan.band_info[CC_id].dl_min;
-
+ uplink_frequency_offset[UE->rf_map.card][UE->rf_map.chain+i] =
+ bands_to_scan.band_info[CC_id].ul_min-bands_to_scan.band_info[CC_id].dl_min;
openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i];
- openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i]+uplink_frequency_offset[CC_id][i];
+ openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] =
+ downlink_frequency[CC_id][i]+uplink_frequency_offset[CC_id][i];
openair0_cfg[UE->rf_map.card].rx_gain[UE->rf_map.chain+i] = UE->rx_total_gain_dB;
}
}
-
- pthread_mutex_lock(&sync_mutex);
- printf("Locked sync_mutex, waiting (UE_sync_thread)\n");
-
- while (sync_var<0)
- pthread_cond_wait(&sync_cond, &sync_mutex);
-
- pthread_mutex_unlock(&sync_mutex);
- printf("Started device, unlocked sync_mutex (UE_sync_thread)\n");
-
- if (UE->rfdevice.trx_start_func(&UE->rfdevice) != 0 ) {
- LOG_E(HW,"Could not start the device\n");
- oai_exit=1;
- }
+ AssertFatal(UE->rfdevice.trx_start_func(&UE->rfdevice) == 0, "Could not start the device\n");
while (oai_exit==0) {
-
- if (pthread_mutex_lock(&UE->proc.mutex_synch) != 0) {
- LOG_E( PHY, "[SCHED][UE] error locking mutex for UE initial synch thread\n" );
- exit_fun("noting to add");
- return &UE_thread_synch_retval;
- }
-
-
- while (UE->proc.instance_cnt_synch < 0) {
+ AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
+ while (UE->proc.instance_cnt_synch < 0)
// the thread waits here most of the time
pthread_cond_wait( &UE->proc.cond_synch, &UE->proc.mutex_synch );
- }
-
- if (pthread_mutex_unlock(&UE->proc.mutex_synch) != 0) {
- LOG_E( PHY, "[SCHED][eNB] error unlocking mutex for UE Initial Synch thread\n" );
- exit_fun("nothing to add");
- return &UE_thread_synch_retval;
- }
-
- VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_UE_THREAD_SYNCH, 1 );
+ AssertFatal ( 0== pthread_mutex_unlock(&UE->proc.mutex_synch), "");
switch (sync_mode) {
case pss:
@@ -453,17 +352,16 @@ static void *UE_thread_synch(void *arg) {
UE->UE_scan_carrier );
if (UE->UE_scan_carrier == 1) {
-
UE->UE_scan_carrier = 0;
// rerun with new cell parameters and frequency-offset
for (i=0; i<openair0_cfg[UE->rf_map.card].rx_num_channels; i++) {
openair0_cfg[UE->rf_map.card].rx_gain[UE->rf_map.chain+i] = UE->rx_total_gain_dB;//-USRP_GAIN_OFFSET;
- if (freq_offset >= 0) {
+ if (freq_offset >= 0)
openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] += UE->common_vars.freq_offset;
- } else {
+ else
openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] -= UE->common_vars.freq_offset;
- }
- openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] = openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i]+uplink_frequency_offset[CC_id][i];
+ openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] =
+ openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i]+uplink_frequency_offset[CC_id][i];
downlink_frequency[CC_id][i] = openair0_cfg[CC_id].rx_freq[i];
freq_offset=0;
}
@@ -506,7 +404,9 @@ static void *UE_thread_synch(void *arg) {
oai_exit=1;
}
} else {
+ AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
UE->is_synchronized = 1;
+ AssertFatal ( 0== pthread_mutex_unlock(&UE->proc.mutex_synch), "");
if( UE->mode == rx_dump_frame ) {
FILE *fd;
@@ -524,7 +424,10 @@ static void *UE_thread_synch(void *arg) {
exit(0);
}
} else {
+ AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
UE->is_synchronized = 0;
+ AssertFatal ( 0== pthread_mutex_unlock(&UE->proc.mutex_synch), "");
+
}
}
}
@@ -532,12 +435,9 @@ static void *UE_thread_synch(void *arg) {
// initial sync failed
// calculate new offset and try again
if (UE->UE_scan_carrier == 1) {
- if (freq_offset >= 0) {
+ if (freq_offset >= 0)
freq_offset += 100;
- freq_offset *= -1;
- } else {
- freq_offset *= -1;
- }
+ freq_offset *= -1;
if (abs(freq_offset) > 7500) {
LOG_I( PHY, "[initial_sync] No cell synchronization found, abandoning\n" );
@@ -554,8 +454,6 @@ static void *UE_thread_synch(void *arg) {
mac_xface->macphy_exit("No cell synchronization found, abandoning");
return &UE_thread_synch_retval; // not reached
}
- } else {
-
}
LOG_I( PHY, "[initial_sync] trying carrier off %d Hz, rxgain %d (DL %u, UL %u)\n",
freq_offset,
@@ -566,40 +464,22 @@ static void *UE_thread_synch(void *arg) {
for (i=0; i<openair0_cfg[UE->rf_map.card].rx_num_channels; i++) {
openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i]+freq_offset;
openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] = downlink_frequency[CC_id][i]+uplink_frequency_offset[CC_id][i]+freq_offset;
-
openair0_cfg[UE->rf_map.card].rx_gain[UE->rf_map.chain+i] = UE->rx_total_gain_dB;//-USRP_GAIN_OFFSET;
-
- if (UE->UE_scan_carrier==1) {
+ if (UE->UE_scan_carrier==1)
openair0_cfg[UE->rf_map.card].autocal[UE->rf_map.chain+i] = 1;
- }
}
-
UE->rfdevice.trx_set_freq_func(&UE->rfdevice,&openair0_cfg[0],0);
-
}// initial_sync=0
-
break;
-
case si:
default:
break;
}
-
- if (pthread_mutex_lock(&UE->proc.mutex_synch) != 0) {
- LOG_E( PHY, "[SCHED][UE] error locking mutex for UE synch\n" );
- exit_fun("noting to add");
- return &UE_thread_synch_retval;
- }
-
+ AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
// indicate readiness
UE->proc.instance_cnt_synch--;
-
- if (pthread_mutex_unlock(&UE->proc.mutex_synch) != 0) {
- LOG_E( PHY, "[SCHED][UE] error unlocking mutex for UE synch\n" );
- exit_fun("noting to add");
- return &UE_thread_synch_retval;
- }
+ AssertFatal ( 0== pthread_mutex_unlock(&UE->proc.mutex_synch), "");
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_UE_THREAD_SYNCH, 0 );
} // while !oai_exit
@@ -631,7 +511,7 @@ static void *UE_thread_rxn_txnp4(void *arg) {
cpu_set_t cpuset;
CPU_ZERO(&cpuset);
CPU_SET(proc->sub_frame_start+1, &cpuset);
- init_thread(900000,1000000 , 40, &cpuset,//sched_get_priority_max(SCHED_FIFO)-1,
+ init_thread(900000,1000000 , FIFO_PRIORITY-1, &cpuset,
threadname);
while (!oai_exit) {
@@ -750,12 +630,11 @@ void *UE_thread(void *arg) {
cpu_set_t cpuset;
CPU_ZERO(&cpuset);
CPU_SET(3, &cpuset);
- init_thread(100000, 500000, 40, &cpuset, //sched_get_priority_max(SCHED_FIFO),
+ init_thread(100000, 500000, FIFO_PRIORITY, &cpuset,
"main UE");
AssertFatal(0== openair0_device_load(&(UE->rfdevice), &openair0_cfg[0]), "");
UE->rfdevice.host_type = BBU_HOST;
- sleep(1);
init_UE_threads(UE);
#ifdef NAS_UE
@@ -767,13 +646,12 @@ void *UE_thread(void *arg) {
int sub_frame=-1;
//int cumulated_shift=0;
while (!oai_exit) {
+ AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
+ int instance_cnt_synch = UE->proc.instance_cnt_synch;
+ int is_synchronized = UE->is_synchronized;
+ AssertFatal ( 0== pthread_mutex_unlock(&UE->proc.mutex_synch), "");
- if (UE->is_synchronized == 0) {
-
- AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
- int instance_cnt_synch = UE->proc.instance_cnt_synch;
- AssertFatal ( 0== pthread_mutex_unlock(&UE->proc.mutex_synch), "");
-
+ if (is_synchronized == 0) {
if (instance_cnt_synch < 0) { // we can invoke the synch
// grab 10 ms of signal and wakeup synch thread
for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++)
@@ -793,14 +671,12 @@ void *UE_thread(void *arg) {
LOG_E( PHY, "[SCHED][UE] UE sync thread busy!!\n" );
exit_fun("nothing to add");
}
- } //
- else {
+ } else {
// grab 10 ms of signal into dummy buffer
-
if (UE->mode != loop_through_memory) {
for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++)
rxp[i] = (void*)&dummy_rx[i][0];
- for (int sf=0; sf<10; sf++) {
+ for (int sf=0; sf<10; sf++)
// printf("Reading dummy sf %d\n",sf);
AssertFatal ( UE->frame_parms.samples_per_tti ==
UE->rfdevice.trx_read_func(&UE->rfdevice,
@@ -808,8 +684,6 @@ void *UE_thread(void *arg) {
rxp,
UE->frame_parms.samples_per_tti,
UE->frame_parms.nb_antennas_rx), "");
-
- }
}
}
@@ -861,32 +735,20 @@ void *UE_thread(void *arg) {
readBlockSize=UE->frame_parms.samples_per_tti;
writeBlockSize=UE->frame_parms.samples_per_tti;
} else {
- static int rx_correction_timer=5;
- static int rx_off_diff =0;
- if ((UE->rx_offset<(5*UE->frame_parms.samples_per_tti)) &&
- (UE->rx_offset > 0) &&
- (rx_correction_timer == 0)) {
- rx_off_diff = -1 ;
- LOG_D(PHY,"AbsSubframe %d.%d UE->rx_offset %d > %d, diff %d\n",
- proc->frame_rx,proc->subframe_rx,UE->rx_offset,0,rx_off_diff);
- rx_correction_timer = 5;
- } else if ((UE->rx_offset>(5*UE->frame_parms.samples_per_tti)) &&
- (UE->rx_offset < ((10*UE->frame_parms.samples_per_tti))) &&
- (rx_correction_timer == 0)) { // moving to the left so drop rx_off_diff samples
- rx_off_diff = 1;
- LOG_D(PHY,"AbsSubframe %d.%d UE->rx_offset %d < %d, diff %d\n",
- proc->frame_rx,proc->subframe_rx,UE->rx_offset,10*UE->frame_parms.samples_per_tti,rx_off_diff);
- rx_correction_timer = 5;
- }
- if (rx_correction_timer>0)
- rx_correction_timer--;
- UE->rx_offset_diff = rx_off_diff;
+ if ( UE->rx_offset < 5*UE->frame_parms.samples_per_tti &&
+ UE->rx_offset > 0 )
+ UE->rx_offset_diff = -1 ;
+ if ( UE->rx_offset > 5*UE->frame_parms.samples_per_tti &&
+ UE->rx_offset < 10*UE->frame_parms.samples_per_tti )
+ UE->rx_offset_diff = 1;
+
LOG_D(PHY,"SET rx_off_diff to %d\n",UE->rx_offset_diff);
- rx_off_diff = 0;
- readBlockSize=UE->frame_parms.samples_per_tti-
- UE->frame_parms.ofdm_symbol_size-
- UE->frame_parms.nb_prefix_samples0;
- writeBlockSize=UE->frame_parms.samples_per_tti - rx_off_diff;
+ readBlockSize=UE->frame_parms.samples_per_tti -
+ UE->frame_parms.ofdm_symbol_size -
+ UE->frame_parms.nb_prefix_samples0 -
+ UE->rx_offset_diff;
+ writeBlockSize=UE->frame_parms.samples_per_tti -
+ UE->rx_offset_diff;
}
AssertFatal(readBlockSize ==