mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-13 11:40:33 +00:00
Fix some performance inefficiencies detected by Coverity Scan
This commit is contained in:
parent
0f42dbdea4
commit
cfb6f283d4
@ -97,7 +97,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_->set_channel_fsm(channel_fsm);
|
||||
acquisition_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -96,7 +96,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_->set_channel_fsm(channel_fsm);
|
||||
acquisition_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -93,7 +93,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm);
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -96,7 +96,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_->set_channel_fsm(channel_fsm);
|
||||
acquisition_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -122,7 +122,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_fpga_->set_channel_fsm(channel_fsm);
|
||||
acquisition_fpga_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -94,7 +94,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm);
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -94,7 +94,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm);
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
/*!
|
||||
* \brief Set statistics threshold of PCPS algorithm
|
||||
|
@ -94,7 +94,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm);
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
/*!
|
||||
* \brief Set statistics threshold of TONG algorithm
|
||||
|
@ -94,7 +94,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm);
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -87,7 +87,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_->set_channel_fsm(channel_fsm);
|
||||
acquisition_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -122,7 +122,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_fpga_->set_channel_fsm(channel_fsm);
|
||||
acquisition_fpga_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -118,7 +118,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_->set_channel_fsm(channel_fsm);
|
||||
acquisition_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -121,7 +121,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_fpga_->set_channel_fsm(channel_fsm);
|
||||
acquisition_fpga_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -96,7 +96,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_->set_channel_fsm(channel_fsm);
|
||||
acquisition_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -98,7 +98,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_->set_channel_fsm(channel_fsm);
|
||||
acquisition_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -97,7 +97,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_->set_channel_fsm(channel_fsm);
|
||||
acquisition_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -102,7 +102,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_->set_channel_fsm(channel_fsm);
|
||||
acquisition_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -96,7 +96,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm);
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -123,7 +123,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_fpga_->set_channel_fsm(channel_fsm);
|
||||
acquisition_fpga_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -95,7 +95,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm);
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -93,7 +93,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm);
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -96,7 +96,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm);
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -94,7 +94,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm);
|
||||
acquisition_cc_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -98,7 +98,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_->set_channel_fsm(channel_fsm);
|
||||
acquisition_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -98,7 +98,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_fpga_->set_channel_fsm(channel_fsm);
|
||||
acquisition_fpga_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -97,7 +97,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_->set_channel_fsm(channel_fsm);
|
||||
acquisition_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -125,7 +125,7 @@ public:
|
||||
inline void set_channel_fsm(std::weak_ptr<ChannelFsm> channel_fsm) override
|
||||
{
|
||||
channel_fsm_ = channel_fsm;
|
||||
acquisition_fpga_->set_channel_fsm(channel_fsm);
|
||||
acquisition_fpga_->set_channel_fsm(channel_fsm_);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -730,7 +730,7 @@ int galileo_e5a_noncoherentIQ_acquisition_caf_cc::general_work(int noutput_items
|
||||
auto **out = reinterpret_cast<Gnss_Synchro **>(&output_items[0]);
|
||||
Gnss_Synchro current_synchro_data = Gnss_Synchro();
|
||||
current_synchro_data = *d_gnss_synchro;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
return_value = 1; // Number of Gnss_Synchro objects produced
|
||||
}
|
||||
|
||||
|
@ -381,7 +381,7 @@ int galileo_pcps_8ms_acquisition_cc::general_work(int noutput_items,
|
||||
auto **out = reinterpret_cast<Gnss_Synchro **>(&output_items[0]);
|
||||
Gnss_Synchro current_synchro_data = Gnss_Synchro();
|
||||
current_synchro_data = *d_gnss_synchro;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
noutput_items = 1; // Number of Gnss_Synchro objects produced
|
||||
}
|
||||
|
||||
|
@ -566,7 +566,7 @@ int pcps_acquisition_fine_doppler_cc::general_work(int noutput_items,
|
||||
auto **out = reinterpret_cast<Gnss_Synchro **>(&output_items[0]);
|
||||
Gnss_Synchro current_synchro_data = Gnss_Synchro();
|
||||
current_synchro_data = *d_gnss_synchro;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
return_value = 1; // Number of Gnss_Synchro objects produced
|
||||
}
|
||||
break;
|
||||
|
@ -427,7 +427,7 @@ int pcps_assisted_acquisition_cc::general_work(int noutput_items,
|
||||
auto **out = reinterpret_cast<Gnss_Synchro **>(&output_items[0]);
|
||||
Gnss_Synchro current_synchro_data = Gnss_Synchro();
|
||||
current_synchro_data = *d_gnss_synchro;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
noutput_items = 1; // Number of Gnss_Synchro objects produced
|
||||
}
|
||||
break;
|
||||
|
@ -403,7 +403,7 @@ int pcps_cccwsr_acquisition_cc::general_work(int noutput_items,
|
||||
auto **out = reinterpret_cast<Gnss_Synchro **>(&output_items[0]);
|
||||
Gnss_Synchro current_synchro_data = Gnss_Synchro();
|
||||
current_synchro_data = *d_gnss_synchro;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
noutput_items = 1; // Number of Gnss_Synchro objects produced
|
||||
}
|
||||
|
||||
|
@ -765,7 +765,7 @@ int pcps_opencl_acquisition_cc::general_work(int noutput_items,
|
||||
auto **out = reinterpret_cast<Gnss_Synchro **>(&output_items[0]);
|
||||
Gnss_Synchro current_synchro_data = Gnss_Synchro();
|
||||
current_synchro_data = *d_gnss_synchro;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
noutput_items = 1; // Number of Gnss_Synchro objects produced
|
||||
}
|
||||
|
||||
|
@ -507,7 +507,7 @@ int pcps_quicksync_acquisition_cc::general_work(int noutput_items,
|
||||
auto** out = reinterpret_cast<Gnss_Synchro**>(&output_items[0]);
|
||||
Gnss_Synchro current_synchro_data = Gnss_Synchro();
|
||||
current_synchro_data = *d_gnss_synchro;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
noutput_items = 1; // Number of Gnss_Synchro objects produced
|
||||
}
|
||||
|
||||
|
@ -403,7 +403,7 @@ int pcps_tong_acquisition_cc::general_work(int noutput_items,
|
||||
auto **out = reinterpret_cast<Gnss_Synchro **>(&output_items[0]);
|
||||
Gnss_Synchro current_synchro_data = Gnss_Synchro();
|
||||
current_synchro_data = *d_gnss_synchro;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
noutput_items = 1; // Number of Gnss_Synchro objects produced
|
||||
}
|
||||
|
||||
|
@ -232,7 +232,7 @@ void read_results(std::vector<volk_gnsssdr_test_results_t> *results, std::string
|
||||
|
||||
if (single_kernel_result.size() == 3)
|
||||
{
|
||||
volk_gnsssdr_test_results_t kernel_result;
|
||||
volk_gnsssdr_test_results_t kernel_result{};
|
||||
kernel_result.name = std::string(single_kernel_result[0]);
|
||||
kernel_result.config_name = std::string(single_kernel_result[0]);
|
||||
kernel_result.best_arch_u = std::string(single_kernel_result[1]);
|
||||
|
@ -36,6 +36,7 @@
|
||||
#include <iomanip> // for setprecision
|
||||
#include <iostream> // for cout
|
||||
#include <memory> // for shared_ptr, make_shared
|
||||
#include <utility> // for std::move
|
||||
|
||||
#define CRC_ERROR_LIMIT 8
|
||||
|
||||
@ -702,8 +703,8 @@ int beidou_b1i_telemetry_decoder_gs::general_work(int noutput_items __attribute_
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Make the output (copy the object contents to the GNURadio reserved memory)
|
||||
*out[0] = current_symbol;
|
||||
// 3. Make the output (move the object contents to the GNURadio reserved memory)
|
||||
*out[0] = std::move(current_symbol);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
@ -35,6 +35,7 @@
|
||||
#include <iomanip> // for setprecision
|
||||
#include <iostream> // for cout
|
||||
#include <memory> // for shared_ptr, make_shared
|
||||
#include <utility> // for std::move
|
||||
|
||||
#define CRC_ERROR_LIMIT 8
|
||||
|
||||
@ -726,8 +727,8 @@ int beidou_b3i_telemetry_decoder_gs::general_work(
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Make the output (copy the object contents to the GNURadio reserved memory)
|
||||
*out[0] = current_symbol;
|
||||
// 3. Make the output (move the object contents to the GNURadio reserved memory)
|
||||
*out[0] = std::move(current_symbol);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
@ -1399,8 +1399,8 @@ int galileo_telemetry_decoder_gs::general_work(int noutput_items __attribute__((
|
||||
LOG(WARNING) << "Exception writing navigation data dump file " << e.what();
|
||||
}
|
||||
}
|
||||
// 3. Make the output (copy the object contents to the GNURadio reserved memory)
|
||||
*out[0] = current_symbol;
|
||||
// 3. Make the output (move the object contents to the GNURadio reserved memory)
|
||||
*out[0] = std::move(current_symbol);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
@ -33,6 +33,7 @@
|
||||
#include <iomanip> // for std::setprecision
|
||||
#include <iostream> // for cout
|
||||
#include <memory> // for shared_ptr, make_shared
|
||||
#include <utility> // for std::move
|
||||
|
||||
#define CRC_ERROR_LIMIT 6
|
||||
|
||||
@ -525,8 +526,8 @@ int glonass_l1_ca_telemetry_decoder_gs::general_work(int noutput_items __attribu
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Make the output (copy the object contents to the GNURadio reserved memory)
|
||||
*out[0] = current_symbol;
|
||||
// 3. Make the output (move the object contents to the GNURadio reserved memory)
|
||||
*out[0] = std::move(current_symbol);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
@ -33,6 +33,7 @@
|
||||
#include <iomanip> // for std::setprecision
|
||||
#include <iostream> // for cout
|
||||
#include <memory> // for shared_ptr, make_shared
|
||||
#include <utility> // for std::move
|
||||
|
||||
#define CRC_ERROR_LIMIT 6
|
||||
|
||||
@ -528,8 +529,8 @@ int glonass_l2_ca_telemetry_decoder_gs::general_work(int noutput_items __attribu
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Make the output (copy the object contents to the GNURadio reserved memory)
|
||||
*out[0] = current_symbol;
|
||||
// 3. Make the output (move the object contents to the GNURadio reserved memory)
|
||||
*out[0] = std::move(current_symbol);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
@ -36,6 +36,7 @@
|
||||
#include <iomanip> // for setprecision
|
||||
#include <iostream> // for cout
|
||||
#include <memory> // for shared_ptr
|
||||
#include <utility> // for std::move
|
||||
#include <vector>
|
||||
|
||||
#ifdef COMPILER_HAS_ROTL
|
||||
@ -659,8 +660,8 @@ int gps_l1_ca_telemetry_decoder_gs::general_work(int noutput_items __attribute__
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Make the output (copy the object contents to the GNU Radio reserved memory)
|
||||
*out[0] = current_symbol;
|
||||
// 3. Make the output (move the object contents to the GNU Radio reserved memory)
|
||||
*out[0] = std::move(current_symbol);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
@ -35,6 +35,7 @@
|
||||
#include <iomanip> // for setprecision
|
||||
#include <iostream> // for cout
|
||||
#include <memory> // for shared_ptr, make_shared
|
||||
#include <utility> // for std::move
|
||||
|
||||
|
||||
gps_l2c_telemetry_decoder_gs_sptr
|
||||
@ -368,6 +369,6 @@ int gps_l2c_telemetry_decoder_gs::general_work(int noutput_items __attribute__((
|
||||
}
|
||||
|
||||
// 3. Make the output (copy the object contents to the GNURadio reserved memory)
|
||||
out[0] = current_synchro_data;
|
||||
out[0] = std::move(current_synchro_data);
|
||||
return 1;
|
||||
}
|
||||
|
@ -33,6 +33,7 @@
|
||||
#include <exception> // for std::exception
|
||||
#include <iomanip> // for std::setprecision
|
||||
#include <iostream> // for std::cout
|
||||
#include <utility> // for std::move
|
||||
|
||||
gps_l5_telemetry_decoder_gs_sptr
|
||||
gps_l5_make_telemetry_decoder_gs(const Gnss_Satellite &satellite, const Tlm_Conf &conf)
|
||||
@ -383,8 +384,8 @@ int gps_l5_telemetry_decoder_gs::general_work(int noutput_items __attribute__((u
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Make the output (copy the object contents to the GNURadio reserved memory)
|
||||
out[0] = current_synchro_data;
|
||||
// 3. Make the output (move the object contents to the GNURadio reserved memory)
|
||||
out[0] = std::move(current_synchro_data);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
@ -25,6 +25,7 @@
|
||||
#include <cmath> // for abs
|
||||
#include <exception> // for exception
|
||||
#include <iomanip> // for operator<<, setw
|
||||
#include <utility> // for std::move
|
||||
|
||||
// logging levels
|
||||
#define EVENT 2 // logs important events which don't occur every block
|
||||
@ -470,7 +471,7 @@ int sbas_l1_telemetry_decoder_gs::general_work(int noutput_items __attribute__((
|
||||
// UPDATE GNSS SYNCHRO DATA
|
||||
// actually the SBAS telemetry decoder doesn't support ranging
|
||||
current_symbol.Flag_valid_word = false; // indicate to observable block that this synchro object isn't valid for pseudorange computation
|
||||
out[0] = current_symbol;
|
||||
out[0] = std::move(current_symbol);
|
||||
consume_each(1); // tell scheduler input items consumed
|
||||
return 1; // tell scheduler output items produced
|
||||
}
|
||||
|
@ -2066,7 +2066,6 @@ int dll_pll_veml_tracking::general_work(int noutput_items __attribute__((unused)
|
||||
current_synchro_data.Tracking_sample_counter = this->nitems_read(0);
|
||||
current_synchro_data.Flag_valid_symbol_output = !loss_of_lock;
|
||||
current_synchro_data.Flag_PLL_180_deg_phase_locked = d_Flag_PLL_180_deg_phase_locked;
|
||||
*out[0] = current_synchro_data;
|
||||
|
||||
// generate new tag associated with gnss-synchro object
|
||||
|
||||
@ -2088,6 +2087,7 @@ int dll_pll_veml_tracking::general_work(int noutput_items __attribute__((unused)
|
||||
d_timetag_waiting = false;
|
||||
}
|
||||
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
@ -2015,7 +2015,7 @@ int dll_pll_veml_tracking_fpga::general_work(int noutput_items __attribute__((un
|
||||
current_synchro_data.Tracking_sample_counter = d_sample_counter_next; // d_sample_counter;
|
||||
current_synchro_data.Flag_valid_symbol_output = !loss_of_lock;
|
||||
current_synchro_data.Flag_PLL_180_deg_phase_locked = d_Flag_PLL_180_deg_phase_locked;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
@ -291,7 +291,7 @@ int Galileo_E1_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attri
|
||||
samples_offset = std::round(d_acq_code_phase_samples + acq_trk_shif_correction_samples);
|
||||
current_synchro_data.Tracking_sample_counter = d_sample_counter + static_cast<uint64_t>(samples_offset);
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
d_sample_counter = d_sample_counter + static_cast<uint64_t>(samples_offset); // count for the processed samples
|
||||
d_pull_in = false;
|
||||
consume_each(samples_offset); // shift input to perform alignment with local replica
|
||||
@ -438,7 +438,7 @@ int Galileo_E1_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attri
|
||||
current_synchro_data.Signal[2] = '\0';
|
||||
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
|
||||
if (d_dump)
|
||||
{
|
||||
|
@ -575,7 +575,7 @@ int glonass_l1_ca_dll_pll_c_aid_tracking_cc::general_work(int noutput_items __at
|
||||
current_synchro_data.Carrier_phase_rads = d_acc_carrier_phase_cycles * TWO_PI;
|
||||
current_synchro_data.Carrier_Doppler_hz = d_carrier_doppler_hz;
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
consume_each(samples_offset); // shift input to perform alignment with local replica
|
||||
return 1;
|
||||
}
|
||||
@ -811,7 +811,7 @@ int glonass_l1_ca_dll_pll_c_aid_tracking_cc::general_work(int noutput_items __at
|
||||
}
|
||||
// assign the GNU Radio block output data
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
if (d_dump)
|
||||
{
|
||||
// MULTIPLEXED FILE RECORDING - Record results to file
|
||||
|
@ -578,7 +578,7 @@ int glonass_l1_ca_dll_pll_c_aid_tracking_sc::general_work(int noutput_items __at
|
||||
current_synchro_data.Carrier_phase_rads = d_acc_carrier_phase_cycles * TWO_PI;
|
||||
current_synchro_data.Carrier_Doppler_hz = d_carrier_doppler_hz;
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
consume_each(samples_offset); // shift input to perform alignment with local replica
|
||||
return 1;
|
||||
}
|
||||
@ -813,7 +813,7 @@ int glonass_l1_ca_dll_pll_c_aid_tracking_sc::general_work(int noutput_items __at
|
||||
current_synchro_data.Tracking_sample_counter = d_sample_counter + static_cast<uint64_t>(d_correlation_length_samples);
|
||||
}
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
if (d_dump)
|
||||
{
|
||||
// MULTIPLEXED FILE RECORDING - Record results to file
|
||||
|
@ -518,7 +518,7 @@ int Glonass_L1_Ca_Dll_Pll_Tracking_cc::general_work(int noutput_items __attribut
|
||||
current_synchro_data.Carrier_Doppler_hz = d_carrier_doppler_hz;
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
current_synchro_data.correlation_length_ms = 1;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
consume_each(samples_offset); // shift input to perform alignment with local replica
|
||||
return 1;
|
||||
}
|
||||
@ -637,7 +637,7 @@ int Glonass_L1_Ca_Dll_Pll_Tracking_cc::general_work(int noutput_items __attribut
|
||||
|
||||
// assign the GNU Radio block output data
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
if (d_dump)
|
||||
{
|
||||
// MULTIPLEXED FILE RECORDING - Record results to file
|
||||
|
@ -574,7 +574,7 @@ int glonass_l2_ca_dll_pll_c_aid_tracking_cc::general_work(int noutput_items __at
|
||||
current_synchro_data.Carrier_phase_rads = d_acc_carrier_phase_cycles * TWO_PI;
|
||||
current_synchro_data.Carrier_Doppler_hz = d_carrier_doppler_hz;
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
consume_each(samples_offset); // shift input to perform alignment with local replica
|
||||
return 1;
|
||||
}
|
||||
@ -806,7 +806,7 @@ int glonass_l2_ca_dll_pll_c_aid_tracking_cc::general_work(int noutput_items __at
|
||||
}
|
||||
// assign the GNU Radio block output data
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
if (d_dump)
|
||||
{
|
||||
// MULTIPLEXED FILE RECORDING - Record results to file
|
||||
|
@ -575,7 +575,7 @@ int glonass_l2_ca_dll_pll_c_aid_tracking_sc::general_work(int noutput_items __at
|
||||
current_synchro_data.Carrier_phase_rads = d_acc_carrier_phase_cycles * TWO_PI;
|
||||
current_synchro_data.Carrier_Doppler_hz = d_carrier_doppler_hz;
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
consume_each(samples_offset); // shift input to perform alignment with local replica
|
||||
return 1;
|
||||
}
|
||||
@ -810,7 +810,7 @@ int glonass_l2_ca_dll_pll_c_aid_tracking_sc::general_work(int noutput_items __at
|
||||
current_synchro_data.Tracking_sample_counter = d_sample_counter + static_cast<uint64_t>(d_correlation_length_samples);
|
||||
}
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
if (d_dump)
|
||||
{
|
||||
// MULTIPLEXED FILE RECORDING - Record results to file
|
||||
|
@ -520,7 +520,7 @@ int Glonass_L2_Ca_Dll_Pll_Tracking_cc::general_work(int noutput_items __attribut
|
||||
current_synchro_data.Carrier_Doppler_hz = d_carrier_doppler_hz;
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
current_synchro_data.correlation_length_ms = 1;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
consume_each(samples_offset); // shift input to perform alignment with local replica
|
||||
return 1;
|
||||
}
|
||||
@ -639,7 +639,7 @@ int Glonass_L2_Ca_Dll_Pll_Tracking_cc::general_work(int noutput_items __attribut
|
||||
|
||||
// assign the GNU Radio block output data
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
if (d_dump)
|
||||
{
|
||||
// MULTIPLEXED FILE RECORDING - Record results to file
|
||||
|
@ -30,6 +30,7 @@
|
||||
#include <iostream>
|
||||
#include <memory>
|
||||
#include <sstream>
|
||||
#include <utility>
|
||||
|
||||
|
||||
gps_l1_ca_dll_pll_tracking_gpu_cc_sptr
|
||||
@ -344,7 +345,7 @@ int Gps_L1_Ca_Dll_Pll_Tracking_GPU_cc::general_work(int noutput_items __attribut
|
||||
current_synchro_data.Tracking_sample_counter = d_sample_counter + static_cast<uint64_t>(samples_offset);
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
current_synchro_data.correlation_length_ms = 1;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
d_sample_counter += static_cast<uint64_t>(samples_offset); // count for the processed samples
|
||||
d_pull_in = false;
|
||||
consume_each(samples_offset); // shift input to perform alignment with local replica
|
||||
@ -479,7 +480,7 @@ int Gps_L1_Ca_Dll_Pll_Tracking_GPU_cc::general_work(int noutput_items __attribut
|
||||
|
||||
// assign the GNU Radio block output data
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
|
||||
if (d_dump)
|
||||
{
|
||||
|
@ -634,7 +634,7 @@ int Gps_L1_Ca_Gaussian_Tracking_cc::general_work(int noutput_items __attribute__
|
||||
current_synchro_data.Carrier_Doppler_hz = d_carrier_doppler_hz;
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
current_synchro_data.correlation_length_ms = 1;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
// Kalman filter initialization reset
|
||||
kf_P_x = kf_P_x_ini;
|
||||
// Update Kalman states based on acquisition information
|
||||
@ -811,7 +811,7 @@ int Gps_L1_Ca_Gaussian_Tracking_cc::general_work(int noutput_items __attribute__
|
||||
|
||||
// assign the GNU Radio block output data
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
|
||||
if (d_dump)
|
||||
{
|
||||
|
@ -319,7 +319,7 @@ int Gps_L1_Ca_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attrib
|
||||
samples_offset = std::round(d_acq_code_phase_samples + acq_trk_shif_correction_samples);
|
||||
current_synchro_data.Tracking_sample_counter = d_sample_counter + static_cast<uint64_t>(samples_offset);
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
d_sample_counter_seconds = d_sample_counter_seconds + (static_cast<double>(samples_offset) / static_cast<double>(d_fs_in));
|
||||
d_sample_counter = d_sample_counter + static_cast<uint64_t>(samples_offset); // count for the processed samples
|
||||
d_pull_in = false;
|
||||
@ -468,7 +468,7 @@ int Gps_L1_Ca_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attrib
|
||||
current_synchro_data.Signal[2] = '\0';
|
||||
|
||||
current_synchro_data.fs = d_fs_in;
|
||||
*out[0] = current_synchro_data;
|
||||
*out[0] = std::move(current_synchro_data);
|
||||
|
||||
if (d_dump)
|
||||
{
|
||||
|
@ -21,6 +21,7 @@
|
||||
#include "rtklib_solver.h"
|
||||
#include <fstream>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
|
||||
class RinexPrinterTest : public ::testing::Test
|
||||
@ -296,9 +297,9 @@ TEST_F(RinexPrinterTest, MixedObsHeader)
|
||||
Pvt_Conf conf;
|
||||
conf.use_e6_for_pvt = false;
|
||||
auto pvt_solution = std::make_shared<Rtklib_Solver>(rtk, conf, "filename", 106, false, false);
|
||||
pvt_solution->galileo_ephemeris_map[1] = eph_gal;
|
||||
pvt_solution->galileo_ephemeris_map[1] = std::move(eph_gal);
|
||||
|
||||
pvt_solution->gps_ephemeris_map[1] = eph_gps;
|
||||
pvt_solution->gps_ephemeris_map[1] = std::move(eph_gps);
|
||||
|
||||
std::map<int, Gnss_Synchro> gnss_observables_map;
|
||||
Gnss_Synchro gs{};
|
||||
@ -603,8 +604,8 @@ TEST_F(RinexPrinterTest, GpsObsLogDualBand)
|
||||
Pvt_Conf conf;
|
||||
conf.use_e6_for_pvt = false;
|
||||
auto pvt_solution = std::make_shared<Rtklib_Solver>(rtk, conf, "filename", 7, false, false);
|
||||
pvt_solution->gps_ephemeris_map[1] = eph;
|
||||
pvt_solution->gps_cnav_ephemeris_map[1] = eph_cnav;
|
||||
pvt_solution->gps_ephemeris_map[1] = std::move(eph);
|
||||
pvt_solution->gps_cnav_ephemeris_map[1] = std::move(eph_cnav);
|
||||
std::map<int, Gnss_Synchro> gnss_observables_map;
|
||||
|
||||
Gnss_Synchro gs1 = Gnss_Synchro();
|
||||
|
Loading…
Reference in New Issue
Block a user