From 111c6291ec1e530b21ef4735ef59c7343aa8d2f6 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 12 Feb 2019 12:07:40 +0100 Subject: [PATCH 1/5] Revert "clang-tidy: apply performance-unnecessary-value-param check" This reverts commit eae967ed1a2c90da29e0e532be98f58345ba8459. --- src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc | 2 +- src/algorithms/PVT/libs/monitor_pvt_udp_sink.h | 2 +- src/algorithms/PVT/libs/nmea_printer.cc | 2 +- src/algorithms/PVT/libs/nmea_printer.h | 2 +- .../adapters/beidou_b1i_pcps_acquisition.cc | 5 ++--- .../acquisition/adapters/beidou_b1i_pcps_acquisition.h | 2 +- .../adapters/galileo_e1_pcps_ambiguous_acquisition.cc | 5 ++--- .../adapters/galileo_e1_pcps_ambiguous_acquisition.h | 2 +- .../acquisition/adapters/gps_l1_ca_pcps_acquisition.cc | 5 ++--- .../acquisition/adapters/gps_l1_ca_pcps_acquisition.h | 2 +- .../acquisition/adapters/gps_l2_m_pcps_acquisition.cc | 5 ++--- .../acquisition/adapters/gps_l2_m_pcps_acquisition.h | 2 +- .../acquisition/adapters/gps_l5i_pcps_acquisition.cc | 5 ++--- .../acquisition/adapters/gps_l5i_pcps_acquisition.h | 2 +- .../galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc | 4 ++-- .../galileo_e5a_noncoherent_iq_acquisition_caf_cc.h | 6 +++--- .../gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc | 8 ++++---- .../gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h | 6 +++--- .../gnuradio_blocks/pcps_assisted_acquisition_cc.cc | 8 ++++---- .../gnuradio_blocks/pcps_assisted_acquisition_cc.h | 6 +++--- .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc | 8 ++++---- .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.h | 6 +++--- .../gnuradio_blocks/pcps_quicksync_acquisition_cc.cc | 8 ++++---- .../gnuradio_blocks/pcps_quicksync_acquisition_cc.h | 6 +++--- .../gnuradio_blocks/pcps_tong_acquisition_cc.cc | 8 ++++---- .../gnuradio_blocks/pcps_tong_acquisition_cc.h | 6 +++--- .../gnuradio_blocks/signal_generator_c.cc | 2 +- .../gnuradio_blocks/signal_generator_c.h | 4 ++-- .../adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc | 5 ++--- .../adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h | 2 +- .../adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc | 5 ++--- .../adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h | 2 +- .../adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc | 5 ++--- .../adapters/gps_l1_ca_dll_pll_c_aid_tracking.h | 2 +- .../glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc | 6 +++--- .../glonass_l1_ca_dll_pll_c_aid_tracking_cc.h | 8 ++++---- .../glonass_l1_ca_dll_pll_tracking_cc.cc | 4 ++-- .../glonass_l1_ca_dll_pll_tracking_cc.h | 6 +++--- .../glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc | 6 +++--- .../glonass_l2_ca_dll_pll_c_aid_tracking_cc.h | 8 ++++---- .../glonass_l2_ca_dll_pll_tracking_cc.cc | 4 ++-- .../glonass_l2_ca_dll_pll_tracking_cc.h | 6 +++--- .../gps_l1_ca_dll_pll_c_aid_tracking_cc.cc | 6 +++--- .../gps_l1_ca_dll_pll_c_aid_tracking_cc.h | 8 ++++---- .../gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc | 4 ++-- .../gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h | 6 +++--- src/core/libs/INIReader.cc | 2 +- src/core/libs/INIReader.h | 2 +- src/core/monitor/gnss_synchro_udp_sink.cc | 2 +- src/core/monitor/gnss_synchro_udp_sink.h | 2 +- src/core/receiver/gnss_flowgraph.cc | 2 +- src/core/receiver/gnss_flowgraph.h | 2 +- .../acquisition/gps_l1_ca_pcps_acquisition_test.cc | 10 +++++----- 53 files changed, 118 insertions(+), 126 deletions(-) diff --git a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc index 0599416e4..3dc8c8b08 100644 --- a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc +++ b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc @@ -34,7 +34,7 @@ #include #include -Monitor_Pvt_Udp_Sink::Monitor_Pvt_Udp_Sink(const std::vector& addresses, const uint16_t& port) : socket{io_service} +Monitor_Pvt_Udp_Sink::Monitor_Pvt_Udp_Sink(std::vector addresses, const uint16_t& port) : socket{io_service} { for (const auto& address : addresses) { diff --git a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h index f8c6552ae..bec163986 100644 --- a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h +++ b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h @@ -38,7 +38,7 @@ class Monitor_Pvt_Udp_Sink { public: - Monitor_Pvt_Udp_Sink(const std::vector& addresses, const uint16_t& port); + Monitor_Pvt_Udp_Sink(std::vector addresses, const uint16_t &port); bool write_monitor_pvt(Monitor_Pvt monitor_pvt); private: diff --git a/src/algorithms/PVT/libs/nmea_printer.cc b/src/algorithms/PVT/libs/nmea_printer.cc index 8f4122c58..3d4ebc74a 100644 --- a/src/algorithms/PVT/libs/nmea_printer.cc +++ b/src/algorithms/PVT/libs/nmea_printer.cc @@ -269,7 +269,7 @@ bool Nmea_Printer::Print_Nmea_Line(const std::shared_ptr& pvt_dat } -char Nmea_Printer::checkSum(const std::string& sentence) +char Nmea_Printer::checkSum(std::string sentence) { char check = 0; // iterate over the string, XOR each byte with the total sum: diff --git a/src/algorithms/PVT/libs/nmea_printer.h b/src/algorithms/PVT/libs/nmea_printer.h index b7373f45b..6e18d7451 100644 --- a/src/algorithms/PVT/libs/nmea_printer.h +++ b/src/algorithms/PVT/libs/nmea_printer.h @@ -82,7 +82,7 @@ private: std::string get_UTC_NMEA_time(boost::posix_time::ptime d_position_UTC_time); std::string longitude_to_hm(double longitude); std::string latitude_to_hm(double lat); - char checkSum(const std::string& sentence); + char checkSum(std::string sentence); bool print_avg_pos; bool d_flag_nmea_output_file; }; diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc index 050e44eb4..7ee2a7277 100644 --- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc @@ -39,16 +39,15 @@ #include "gnss_sdr_flags.h" #include #include -#include using google::LogMessage; BeidouB1iPcpsAcquisition::BeidouB1iPcpsAcquisition( ConfigurationInterface* configuration, - std::string role, + const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(std::move(role)), + unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h index 3b6c185a8..334aff555 100644 --- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h @@ -55,7 +55,7 @@ class BeidouB1iPcpsAcquisition : public AcquisitionInterface { public: BeidouB1iPcpsAcquisition(ConfigurationInterface* configuration, - std::string role, unsigned int in_streams, + const std::string& role, unsigned int in_streams, unsigned int out_streams); virtual ~BeidouB1iPcpsAcquisition(); diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc index 8e81cc18f..5f4137f7d 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc @@ -37,7 +37,6 @@ #include "gnss_sdr_flags.h" #include #include -#include using google::LogMessage; @@ -45,9 +44,9 @@ using google::LogMessage; GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition( ConfigurationInterface* configuration, - std::string role, + const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(std::move(role)), + unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h index 13dd5fe4a..ee4538022 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h @@ -52,7 +52,7 @@ class GalileoE1PcpsAmbiguousAcquisition : public AcquisitionInterface { public: GalileoE1PcpsAmbiguousAcquisition(ConfigurationInterface* configuration, - std::string role, + const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc index 9d6d74d86..e27f37581 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc @@ -41,7 +41,6 @@ #include "gps_sdr_signal_processing.h" #include #include -#include using google::LogMessage; @@ -49,9 +48,9 @@ using google::LogMessage; GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition( ConfigurationInterface* configuration, - std::string role, + const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(std::move(role)), + unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h index ed9767a81..efca26bdd 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h @@ -56,7 +56,7 @@ class GpsL1CaPcpsAcquisition : public AcquisitionInterface { public: GpsL1CaPcpsAcquisition(ConfigurationInterface* configuration, - std::string role, + const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc index 9cc6f5633..00fcb7624 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc @@ -39,7 +39,6 @@ #include "gps_l2c_signal.h" #include #include -#include using google::LogMessage; @@ -47,9 +46,9 @@ using google::LogMessage; GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition( ConfigurationInterface* configuration, - std::string role, + const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(std::move(role)), + unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h index f296e6304..da1c7ef6e 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h @@ -53,7 +53,7 @@ class GpsL2MPcpsAcquisition : public AcquisitionInterface { public: GpsL2MPcpsAcquisition(ConfigurationInterface* configuration, - std::string role, + const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc index 6d36db29b..d3b722823 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc @@ -39,7 +39,6 @@ #include "gps_l5_signal.h" #include #include -#include using google::LogMessage; @@ -47,9 +46,9 @@ using google::LogMessage; GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition( ConfigurationInterface* configuration, - std::string role, + const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(std::move(role)), + unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h index 02f48d11d..af8cabb81 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h @@ -53,7 +53,7 @@ class GpsL5iPcpsAcquisition : public AcquisitionInterface { public: GpsL5iPcpsAcquisition(ConfigurationInterface* configuration, - std::string role, + const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc index ddaf50528..84e517a09 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc @@ -53,7 +53,7 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr galileo_e5a_noncoherentIQ_make int samples_per_ms, int samples_per_code, bool bit_transition_flag, bool dump, - const std::string &dump_filename, + std::string dump_filename, bool both_signal_components_, int CAF_window_hz_, int Zero_padding_) @@ -73,7 +73,7 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc::galileo_e5a_noncoherentIQ_acquisit int samples_per_code, bool bit_transition_flag, bool dump, - const std::string &dump_filename, + std::string dump_filename, bool both_signal_components_, int CAF_window_hz_, int Zero_padding_) : gr::block("galileo_e5a_noncoherentIQ_acquisition_caf_cc", diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h index 7ef061db4..c95a74b82 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h @@ -56,7 +56,7 @@ galileo_e5a_noncoherentIQ_make_acquisition_caf_cc(unsigned int sampled_ms, int samples_per_ms, int samples_per_code, bool bit_transition_flag, bool dump, - const std::string& dump_filename, + std::string dump_filename, bool both_signal_components_, int CAF_window_hz_, int Zero_padding_); @@ -78,7 +78,7 @@ private: int samples_per_ms, int samples_per_code, bool bit_transition_flag, bool dump, - const std::string& dump_filename, + std::string dump_filename, bool both_signal_components_, int CAF_window_hz_, int Zero_padding_); @@ -90,7 +90,7 @@ private: int samples_per_ms, int samples_per_code, bool bit_transition_flag, bool dump, - const std::string& dump_filename, + std::string dump_filename, bool both_signal_components_, int CAF_window_hz_, int Zero_padding_); diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc index f846e7dff..7b5566aba 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc @@ -47,7 +47,7 @@ galileo_pcps_8ms_acquisition_cc_sptr galileo_pcps_8ms_make_acquisition_cc( int64_t fs_in, int32_t samples_per_ms, int32_t samples_per_code, - bool dump, const std::string &dump_filename) + bool dump, std::string dump_filename) { return galileo_pcps_8ms_acquisition_cc_sptr( new galileo_pcps_8ms_acquisition_cc(sampled_ms, max_dwells, doppler_max, fs_in, samples_per_ms, @@ -63,9 +63,9 @@ galileo_pcps_8ms_acquisition_cc::galileo_pcps_8ms_acquisition_cc( int32_t samples_per_ms, int32_t samples_per_code, bool dump, - const std::string &dump_filename) : gr::block("galileo_pcps_8ms_acquisition_cc", - gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms), - gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms)) + std::string dump_filename) : gr::block("galileo_pcps_8ms_acquisition_cc", + gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms), + gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms)) { this->message_port_register_out(pmt::mp("events")); d_sample_counter = 0ULL; // SAMPLE COUNTER diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h index 372ce1fd6..0c1b81e20 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h @@ -51,7 +51,7 @@ galileo_pcps_8ms_make_acquisition_cc(uint32_t sampled_ms, int32_t samples_per_ms, int32_t samples_per_code, bool dump, - const std::string& dump_filename); + std::string dump_filename); /*! * \brief This class implements a Parallel Code Phase Search Acquisition for @@ -69,7 +69,7 @@ private: int32_t samples_per_ms, int32_t samples_per_code, bool dump, - const std::string& dump_filename); + std::string dump_filename); galileo_pcps_8ms_acquisition_cc( uint32_t sampled_ms, @@ -79,7 +79,7 @@ private: int32_t samples_per_ms, int32_t samples_per_code, bool dump, - const std::string& dump_filename); + std::string dump_filename); void calculate_magnitudes( gr_complex* fft_begin, diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc index 9c7c009de..413b7af10 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc @@ -49,7 +49,7 @@ using google::LogMessage; pcps_assisted_acquisition_cc_sptr pcps_make_assisted_acquisition_cc( int32_t max_dwells, uint32_t sampled_ms, int32_t doppler_max, int32_t doppler_min, int64_t fs_in, int32_t samples_per_ms, bool dump, - const std::string &dump_filename) + std::string dump_filename) { return pcps_assisted_acquisition_cc_sptr( new pcps_assisted_acquisition_cc(max_dwells, sampled_ms, doppler_max, doppler_min, @@ -60,9 +60,9 @@ pcps_assisted_acquisition_cc_sptr pcps_make_assisted_acquisition_cc( pcps_assisted_acquisition_cc::pcps_assisted_acquisition_cc( int32_t max_dwells, uint32_t sampled_ms, int32_t doppler_max, int32_t doppler_min, int64_t fs_in, int32_t samples_per_ms, bool dump, - const std::string &dump_filename) : gr::block("pcps_assisted_acquisition_cc", - gr::io_signature::make(1, 1, sizeof(gr_complex)), - gr::io_signature::make(0, 0, sizeof(gr_complex))) + std::string dump_filename) : gr::block("pcps_assisted_acquisition_cc", + gr::io_signature::make(1, 1, sizeof(gr_complex)), + gr::io_signature::make(0, 0, sizeof(gr_complex))) { this->message_port_register_out(pmt::mp("events")); d_sample_counter = 0ULL; // SAMPLE COUNTER diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h index 8cfff7f41..b27f920df 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h @@ -67,7 +67,7 @@ pcps_make_assisted_acquisition_cc( int32_t doppler_min, int64_t fs_in, int32_t samples_per_ms, - bool dump, const std::string& dump_filename); + bool dump, std::string dump_filename); /*! * \brief This class implements a Parallel Code Phase Search Acquisition. @@ -82,12 +82,12 @@ private: pcps_make_assisted_acquisition_cc(int32_t max_dwells, uint32_t sampled_ms, int32_t doppler_max, int32_t doppler_min, int64_t fs_in, int32_t samples_per_ms, bool dump, - const std::string& dump_filename); + std::string dump_filename); pcps_assisted_acquisition_cc(int32_t max_dwells, uint32_t sampled_ms, int32_t doppler_max, int32_t doppler_min, int64_t fs_in, int32_t samples_per_ms, bool dump, - const std::string& dump_filename); + std::string dump_filename); void calculate_magnitudes(gr_complex* fft_begin, int32_t doppler_shift, int32_t doppler_offset); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc index b8ec55bbd..918bc5aa2 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc @@ -53,7 +53,7 @@ pcps_cccwsr_acquisition_cc_sptr pcps_cccwsr_make_acquisition_cc( int64_t fs_in, int32_t samples_per_ms, int32_t samples_per_code, - bool dump, const std::string &dump_filename) + bool dump, std::string dump_filename) { return pcps_cccwsr_acquisition_cc_sptr( new pcps_cccwsr_acquisition_cc(sampled_ms, max_dwells, doppler_max, fs_in, @@ -69,9 +69,9 @@ pcps_cccwsr_acquisition_cc::pcps_cccwsr_acquisition_cc( int32_t samples_per_ms, int32_t samples_per_code, bool dump, - const std::string &dump_filename) : gr::block("pcps_cccwsr_acquisition_cc", - gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms), - gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms)) + std::string dump_filename) : gr::block("pcps_cccwsr_acquisition_cc", + gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms), + gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms)) { this->message_port_register_out(pmt::mp("events")); d_sample_counter = 0ULL; // SAMPLE COUNTER diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h index 8776ab37f..b1edf0106 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h @@ -58,7 +58,7 @@ pcps_cccwsr_make_acquisition_cc( int32_t samples_per_ms, int32_t samples_per_code, bool dump, - const std::string& dump_filename); + std::string dump_filename); /*! * \brief This class implements a Parallel Code Phase Search Acquisition with @@ -71,12 +71,12 @@ private: pcps_cccwsr_make_acquisition_cc(uint32_t sampled_ms, uint32_t max_dwells, uint32_t doppler_max, int64_t fs_in, int32_t samples_per_ms, int32_t samples_per_code, - bool dump, const std::string& dump_filename); + bool dump, std::string dump_filename); pcps_cccwsr_acquisition_cc(uint32_t sampled_ms, uint32_t max_dwells, uint32_t doppler_max, int64_t fs_in, int32_t samples_per_ms, int32_t samples_per_code, - bool dump, const std::string& dump_filename); + bool dump, std::string dump_filename); void calculate_magnitudes(gr_complex* fft_begin, int32_t doppler_shift, int32_t doppler_offset); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc index e47a0a18c..d04c71495 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc @@ -52,7 +52,7 @@ pcps_quicksync_acquisition_cc_sptr pcps_quicksync_make_acquisition_cc( int32_t samples_per_code, bool bit_transition_flag, bool dump, - const std::string& dump_filename) + std::string dump_filename) { return pcps_quicksync_acquisition_cc_sptr( new pcps_quicksync_acquisition_cc( @@ -72,9 +72,9 @@ pcps_quicksync_acquisition_cc::pcps_quicksync_acquisition_cc( int32_t samples_per_ms, int32_t samples_per_code, bool bit_transition_flag, bool dump, - const std::string& dump_filename) : gr::block("pcps_quicksync_acquisition_cc", - gr::io_signature::make(1, 1, (sizeof(gr_complex) * sampled_ms * samples_per_ms)), - gr::io_signature::make(0, 0, (sizeof(gr_complex) * sampled_ms * samples_per_ms))) + std::string dump_filename) : gr::block("pcps_quicksync_acquisition_cc", + gr::io_signature::make(1, 1, (sizeof(gr_complex) * sampled_ms * samples_per_ms)), + gr::io_signature::make(0, 0, (sizeof(gr_complex) * sampled_ms * samples_per_ms))) { this->message_port_register_out(pmt::mp("events")); d_sample_counter = 0ULL; // SAMPLE COUNTER diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h index 8e41d903d..cf24625a5 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h @@ -76,7 +76,7 @@ pcps_quicksync_make_acquisition_cc( int32_t samples_per_code, bool bit_transition_flag, bool dump, - const std::string& dump_filename); + std::string dump_filename); /*! * \brief This class implements a Parallel Code Phase Search Acquisition with @@ -95,7 +95,7 @@ private: int32_t samples_per_ms, int32_t samples_per_code, bool bit_transition_flag, bool dump, - const std::string& dump_filename); + std::string dump_filename); pcps_quicksync_acquisition_cc(uint32_t folding_factor, uint32_t sampled_ms, uint32_t max_dwells, @@ -103,7 +103,7 @@ private: int32_t samples_per_ms, int32_t samples_per_code, bool bit_transition_flag, bool dump, - const std::string& dump_filename); + std::string dump_filename); void calculate_magnitudes(gr_complex* fft_begin, int32_t doppler_shift, int32_t doppler_offset); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc index e4a52da7b..319525ca3 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc @@ -69,7 +69,7 @@ pcps_tong_acquisition_cc_sptr pcps_tong_make_acquisition_cc( uint32_t tong_init_val, uint32_t tong_max_val, uint32_t tong_max_dwells, - bool dump, const std::string &dump_filename) + bool dump, std::string dump_filename) { return pcps_tong_acquisition_cc_sptr( new pcps_tong_acquisition_cc(sampled_ms, doppler_max, fs_in, samples_per_ms, samples_per_code, @@ -87,9 +87,9 @@ pcps_tong_acquisition_cc::pcps_tong_acquisition_cc( uint32_t tong_max_val, uint32_t tong_max_dwells, bool dump, - const std::string &dump_filename) : gr::block("pcps_tong_acquisition_cc", - gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms), - gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms)) + std::string dump_filename) : gr::block("pcps_tong_acquisition_cc", + gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms), + gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms)) { this->message_port_register_out(pmt::mp("events")); d_sample_counter = 0ULL; // SAMPLE COUNTER diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h index 027f5d58a..e2443fa33 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h @@ -74,7 +74,7 @@ pcps_tong_make_acquisition_cc( uint32_t tong_max_val, uint32_t tong_max_dwells, bool dump, - const std::string& dump_filename); + std::string dump_filename); /*! * \brief This class implements a Parallel Code Phase Search Acquisition with @@ -88,13 +88,13 @@ private: int64_t fs_in, int32_t samples_per_ms, int32_t samples_per_code, uint32_t tong_init_val, uint32_t tong_max_val, uint32_t tong_max_dwells, - bool dump, const std::string& dump_filename); + bool dump, std::string dump_filename); pcps_tong_acquisition_cc(uint32_t sampled_ms, uint32_t doppler_max, int64_t fs_in, int32_t samples_per_ms, int32_t samples_per_code, uint32_t tong_init_val, uint32_t tong_max_val, uint32_t tong_max_dwells, - bool dump, const std::string& dump_filename); + bool dump, std::string dump_filename); void calculate_magnitudes(gr_complex* fft_begin, int32_t doppler_shift, int32_t doppler_offset); diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc index d25fded66..6029af1ac 100644 --- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc +++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc @@ -48,7 +48,7 @@ * a boost shared_ptr. This is effectively the public constructor. */ signal_generator_c_sptr -signal_make_generator_c(const std::vector &signal1, const std::vector &system, const std::vector &PRN, +signal_make_generator_c(std::vector signal1, std::vector system, const std::vector &PRN, const std::vector &CN0_dB, const std::vector &doppler_Hz, const std::vector &delay_chips, const std::vector &delay_sec, bool data_flag, bool noise_flag, unsigned int fs_in, unsigned int vector_length, float BW_BB) diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h index a57f2f1b3..2201a849c 100644 --- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h +++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h @@ -61,7 +61,7 @@ using signal_generator_c_sptr = boost::shared_ptr; * interface for creating new instances. */ signal_generator_c_sptr -signal_make_generator_c(const std::vector &signal1, const std::vector &system, const std::vector &PRN, +signal_make_generator_c(std::vector signal1, std::vector system, const std::vector &PRN, const std::vector &CN0_dB, const std::vector &doppler_Hz, const std::vector &delay_chips, const std::vector &delay_sec, bool data_flag, bool noise_flag, unsigned int fs_in, unsigned int vector_length, float BW_BB); @@ -80,7 +80,7 @@ private: /* Create the signal_generator_c object*/ friend signal_generator_c_sptr - signal_make_generator_c(const std::vector &signal1, const std::vector &system, const std::vector &PRN, + signal_make_generator_c(std::vector signal1, std::vector system, const std::vector &PRN, const std::vector &CN0_dB, const std::vector &doppler_Hz, const std::vector &delay_chips, const std::vector &delay_sec, bool data_flag, bool noise_flag, unsigned int fs_in, unsigned int vector_length, float BW_BB); diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc index 804f93148..e3ca80dbe 100644 --- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc @@ -42,15 +42,14 @@ #include "configuration_interface.h" #include "gnss_sdr_flags.h" #include -#include using google::LogMessage; GlonassL1CaDllPllCAidTracking::GlonassL1CaDllPllCAidTracking( - ConfigurationInterface* configuration, std::string role, - unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams) + ConfigurationInterface* configuration, const std::string& role, + unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { DLOG(INFO) << "role " << role; //################# CONFIGURATION PARAMETERS ######################## diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h index 5911b4288..d50003964 100644 --- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h +++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h @@ -54,7 +54,7 @@ class GlonassL1CaDllPllCAidTracking : public TrackingInterface { public: GlonassL1CaDllPllCAidTracking(ConfigurationInterface* configuration, - std::string role, + const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc index 091f68df4..419ccc462 100644 --- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc @@ -40,15 +40,14 @@ #include "configuration_interface.h" #include "gnss_sdr_flags.h" #include -#include using google::LogMessage; GlonassL2CaDllPllCAidTracking::GlonassL2CaDllPllCAidTracking( - ConfigurationInterface* configuration, std::string role, - unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams) + ConfigurationInterface* configuration, const std::string& role, + unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { DLOG(INFO) << "role " << role; //################# CONFIGURATION PARAMETERS ######################## diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h index 5946b8713..b5659c527 100644 --- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h +++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h @@ -52,7 +52,7 @@ class GlonassL2CaDllPllCAidTracking : public TrackingInterface { public: GlonassL2CaDllPllCAidTracking(ConfigurationInterface* configuration, - std::string role, + const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc index af3dcff79..5531be4e0 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc @@ -41,15 +41,14 @@ #include "configuration_interface.h" #include "gnss_sdr_flags.h" #include -#include using google::LogMessage; GpsL1CaDllPllCAidTracking::GpsL1CaDllPllCAidTracking( - ConfigurationInterface* configuration, std::string role, - unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams) + ConfigurationInterface* configuration, const std::string& role, + unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { DLOG(INFO) << "role " << role; //################# CONFIGURATION PARAMETERS ######################## diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h index d48474ead..a1c54aa46 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h @@ -53,7 +53,7 @@ class GpsL1CaDllPllCAidTracking : public TrackingInterface { public: GpsL1CaDllPllCAidTracking(ConfigurationInterface* configuration, - std::string role, + const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc index 5a7ea0aa4..b422fa6ec 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc @@ -65,7 +65,7 @@ glonass_l1_ca_dll_pll_c_aid_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string &dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -88,7 +88,7 @@ void glonass_l1_ca_dll_pll_c_aid_tracking_cc::forecast(int noutput_items, } -void glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(const pmt::pmt_t &msg) +void glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(pmt::pmt_t msg) { //pmt::print(msg); DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN); @@ -105,7 +105,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc::glonass_l1_ca_dll_pll_c_aid_tracking_cc int64_t fs_in, uint32_t vector_length, bool dump, - const std::string &dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h index 7af766d60..2a5102942 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h @@ -59,7 +59,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc_sptr glonass_l1_ca_dll_pll_c_aid_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -90,7 +90,7 @@ private: glonass_l1_ca_dll_pll_c_aid_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -101,7 +101,7 @@ private: glonass_l1_ca_dll_pll_c_aid_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -169,7 +169,7 @@ private: int32_t d_extend_correlation_ms; bool d_enable_extended_integration; bool d_preamble_synchronized; - void msg_handler_preamble_index(const pmt::pmt_t& msg); + void msg_handler_preamble_index(pmt::pmt_t msg); //Integration period in samples int32_t d_correlation_length_samples; diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc index bffcbcbd3..3df2c07f6 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc @@ -62,7 +62,7 @@ glonass_l1_ca_dll_pll_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string &dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips) @@ -86,7 +86,7 @@ Glonass_L1_Ca_Dll_Pll_Tracking_cc::Glonass_L1_Ca_Dll_Pll_Tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string &dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips) : gr::block("Glonass_L1_Ca_Dll_Pll_Tracking_cc", gr::io_signature::make(1, 1, sizeof(gr_complex)), diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h index 80a04dedf..15bc1c90f 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h @@ -56,7 +56,7 @@ glonass_l1_ca_dll_pll_tracking_cc_sptr glonass_l1_ca_dll_pll_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips); @@ -84,7 +84,7 @@ private: glonass_l1_ca_dll_pll_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips); @@ -92,7 +92,7 @@ private: Glonass_L1_Ca_Dll_Pll_Tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips); diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc index 4f0d5773e..b31f4167b 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc @@ -62,7 +62,7 @@ glonass_l2_ca_dll_pll_c_aid_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string &dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -85,7 +85,7 @@ void glonass_l2_ca_dll_pll_c_aid_tracking_cc::forecast(int noutput_items, } -void glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(const pmt::pmt_t &msg) +void glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(pmt::pmt_t msg) { //pmt::print(msg); DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN); @@ -102,7 +102,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc::glonass_l2_ca_dll_pll_c_aid_tracking_cc int64_t fs_in, uint32_t vector_length, bool dump, - const std::string &dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h index e71970e39..1be8d3c7f 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h @@ -57,7 +57,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc_sptr glonass_l2_ca_dll_pll_c_aid_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -88,7 +88,7 @@ private: glonass_l2_ca_dll_pll_c_aid_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -99,7 +99,7 @@ private: glonass_l2_ca_dll_pll_c_aid_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -167,7 +167,7 @@ private: int32_t d_extend_correlation_ms; bool d_enable_extended_integration; bool d_preamble_synchronized; - void msg_handler_preamble_index(const pmt::pmt_t& msg); + void msg_handler_preamble_index(pmt::pmt_t msg); //Integration period in samples int32_t d_correlation_length_samples; diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc index e24e88159..b5b4dcd3e 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc @@ -62,7 +62,7 @@ glonass_l2_ca_dll_pll_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string &dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips) @@ -86,7 +86,7 @@ Glonass_L2_Ca_Dll_Pll_Tracking_cc::Glonass_L2_Ca_Dll_Pll_Tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string &dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips) : gr::block("Glonass_L2_Ca_Dll_Pll_Tracking_cc", gr::io_signature::make(1, 1, sizeof(gr_complex)), diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h index 20ebca8c2..29f6bb077 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h @@ -54,7 +54,7 @@ glonass_l2_ca_dll_pll_tracking_cc_sptr glonass_l2_ca_dll_pll_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips); @@ -82,7 +82,7 @@ private: glonass_l2_ca_dll_pll_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips); @@ -90,7 +90,7 @@ private: Glonass_L2_Ca_Dll_Pll_Tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float early_late_space_chips); diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc index 015122438..aed6b2abc 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc @@ -54,7 +54,7 @@ gps_l1_ca_dll_pll_c_aid_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string &dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -77,7 +77,7 @@ void gps_l1_ca_dll_pll_c_aid_tracking_cc::forecast(int noutput_items, } -void gps_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(const pmt::pmt_t &msg) +void gps_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(pmt::pmt_t msg) { //pmt::print(msg); DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN); @@ -94,7 +94,7 @@ gps_l1_ca_dll_pll_c_aid_tracking_cc::gps_l1_ca_dll_pll_c_aid_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string &dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h index f35affeef..ecbe2c15f 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h @@ -57,7 +57,7 @@ gps_l1_ca_dll_pll_c_aid_tracking_cc_sptr gps_l1_ca_dll_pll_c_aid_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -88,7 +88,7 @@ private: gps_l1_ca_dll_pll_c_aid_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -99,7 +99,7 @@ private: gps_l1_ca_dll_pll_c_aid_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float pll_bw_hz, float dll_bw_hz, float pll_bw_narrow_hz, @@ -163,7 +163,7 @@ private: int32_t d_extend_correlation_ms; bool d_enable_extended_integration; bool d_preamble_synchronized; - void msg_handler_preamble_index(const pmt::pmt_t& msg); + void msg_handler_preamble_index(pmt::pmt_t msg); //Integration period in samples int32_t d_correlation_length_samples; diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc index a2040c7d8..8ddf18102 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc @@ -64,7 +64,7 @@ gps_l1_ca_kf_make_tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string &dump_filename, + std::string dump_filename, float dll_bw_hz, float early_late_space_chips, bool bce_run, @@ -95,7 +95,7 @@ Gps_L1_Ca_Kf_Tracking_cc::Gps_L1_Ca_Kf_Tracking_cc( int64_t fs_in, uint32_t vector_length, bool dump, - const std::string &dump_filename, + std::string dump_filename, float dll_bw_hz, float early_late_space_chips, bool bce_run, diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h index 91e4b4b47..e4acf778b 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h @@ -60,7 +60,7 @@ gps_l1_ca_kf_make_tracking_cc(uint32_t order, int64_t if_freq, int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float pll_bw_hz, float early_late_space_chips, bool bce_run, @@ -93,7 +93,7 @@ private: int64_t if_freq, int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float dll_bw_hz, float early_late_space_chips, bool bce_run, @@ -106,7 +106,7 @@ private: int64_t if_freq, int64_t fs_in, uint32_t vector_length, bool dump, - const std::string& dump_filename, + std::string dump_filename, float dll_bw_hz, float early_late_space_chips, bool bce_run, diff --git a/src/core/libs/INIReader.cc b/src/core/libs/INIReader.cc index 454986615..63c076b82 100644 --- a/src/core/libs/INIReader.cc +++ b/src/core/libs/INIReader.cc @@ -64,7 +64,7 @@ int INIReader::ParseError() } -std::string INIReader::Get(const std::string& section, const std::string& name, const std::string& default_value) +std::string INIReader::Get(const std::string& section, const std::string& name, std::string default_value) { std::string key = MakeKey(section, name); return _values.count(key) ? _values[key] : default_value; diff --git a/src/core/libs/INIReader.h b/src/core/libs/INIReader.h index 1a9f0f3e5..bfe168bd9 100644 --- a/src/core/libs/INIReader.h +++ b/src/core/libs/INIReader.h @@ -67,7 +67,7 @@ public: //! Get a string value from INI file, returning default_value if not found. std::string Get(const std::string& section, const std::string& name, - const std::string& default_value); + std::string default_value); //! Get an integer (long) value from INI file, returning default_value if not found. int64_t GetInteger(const std::string& section, const std::string& name, int64_t default_value); diff --git a/src/core/monitor/gnss_synchro_udp_sink.cc b/src/core/monitor/gnss_synchro_udp_sink.cc index dbb8510f0..2978537ea 100644 --- a/src/core/monitor/gnss_synchro_udp_sink.cc +++ b/src/core/monitor/gnss_synchro_udp_sink.cc @@ -35,7 +35,7 @@ #include #include -Gnss_Synchro_Udp_Sink::Gnss_Synchro_Udp_Sink(const std::vector& addresses, const uint16_t& port) : socket{io_service} +Gnss_Synchro_Udp_Sink::Gnss_Synchro_Udp_Sink(std::vector addresses, const uint16_t& port) : socket{io_service} { for (const auto& address : addresses) { diff --git a/src/core/monitor/gnss_synchro_udp_sink.h b/src/core/monitor/gnss_synchro_udp_sink.h index 70aaf0c1e..d72b2f18a 100644 --- a/src/core/monitor/gnss_synchro_udp_sink.h +++ b/src/core/monitor/gnss_synchro_udp_sink.h @@ -42,7 +42,7 @@ class Gnss_Synchro_Udp_Sink { public: - Gnss_Synchro_Udp_Sink(const std::vector& addresses, const uint16_t& port); + Gnss_Synchro_Udp_Sink(std::vector addresses, const uint16_t& port); bool write_gnss_synchro(const std::vector& stocks); private: diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index 95a954016..82cc49e09 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -1340,7 +1340,7 @@ void GNSSFlowgraph::apply_action(unsigned int who, unsigned int what) } -void GNSSFlowgraph::priorize_satellites(const std::vector>& visible_satellites) +void GNSSFlowgraph::priorize_satellites(std::vector> visible_satellites) { size_t old_size; Gnss_Signal gs; diff --git a/src/core/receiver/gnss_flowgraph.h b/src/core/receiver/gnss_flowgraph.h index 4862ca181..67f86bc6b 100644 --- a/src/core/receiver/gnss_flowgraph.h +++ b/src/core/receiver/gnss_flowgraph.h @@ -141,7 +141,7 @@ public: /*! * \brief Priorize visible satellites in the specified vector */ - void priorize_satellites(const std::vector>& visible_satellites); + void priorize_satellites(std::vector> visible_satellites); private: void init(); // Populates the SV PRN list available for acquisition and tracking diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc index 13a9d8f54..8dd6ef17f 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc @@ -70,7 +70,7 @@ class GpsL1CaPcpsAcquisitionTest_msg_rx : public gr::block { private: friend GpsL1CaPcpsAcquisitionTest_msg_rx_sptr GpsL1CaPcpsAcquisitionTest_msg_rx_make(); - void msg_handler_events(const pmt::pmt_t &msg); + void msg_handler_events(pmt::pmt_t msg); GpsL1CaPcpsAcquisitionTest_msg_rx(); public: @@ -85,7 +85,7 @@ GpsL1CaPcpsAcquisitionTest_msg_rx_sptr GpsL1CaPcpsAcquisitionTest_msg_rx_make() } -void GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events(const pmt::pmt_t &msg) +void GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg) { try { @@ -236,14 +236,14 @@ void GpsL1CaPcpsAcquisitionTest::plot_grid() } -TEST_F(GpsL1CaPcpsAcquisitionTest /*unused*/, Instantiate /*unused*/) +TEST_F(GpsL1CaPcpsAcquisitionTest, Instantiate) { init(); boost::shared_ptr acquisition = boost::make_shared(config.get(), "Acquisition_1C", 1, 0); } -TEST_F(GpsL1CaPcpsAcquisitionTest /*unused*/, ConnectAndRun /*unused*/) +TEST_F(GpsL1CaPcpsAcquisitionTest, ConnectAndRun) { int fs_in = 4000000; int nsamples = 4000; @@ -276,7 +276,7 @@ TEST_F(GpsL1CaPcpsAcquisitionTest /*unused*/, ConnectAndRun /*unused*/) } -TEST_F(GpsL1CaPcpsAcquisitionTest /*unused*/, ValidationOfResults /*unused*/) +TEST_F(GpsL1CaPcpsAcquisitionTest, ValidationOfResults) { std::chrono::time_point start, end; std::chrono::duration elapsed_seconds(0.0); From 004dd4a38a64dfa2114e3ec683594a60a92c5d20 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 12 Feb 2019 12:57:37 +0100 Subject: [PATCH 2/5] Replace the deprecated branch_path() by parent_path() --- .../volk_gnsssdr/apps/volk_gnsssdr_profile.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc index c211ed710..c18bb2e3a 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc @@ -250,10 +250,10 @@ void write_results(const std::vector *results, bool const fs::path config_path(path); // Until we can update the config on a kernel by kernel basis // do not overwrite volk_gnsssdr_config when using a regex. - if (!fs::exists(config_path.branch_path())) + if (!fs::exists(config_path.parent_path())) { - std::cout << "Creating " << config_path.branch_path() << " ..." << std::endl; - fs::create_directories(config_path.branch_path()); + std::cout << "Creating " << config_path.parent_path() << " ..." << std::endl; + fs::create_directories(config_path.parent_path()); } std::ofstream config; From 31383258b0bf2140c7d21060b828599ae7913e28 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 12 Feb 2019 15:56:18 +0100 Subject: [PATCH 3/5] clang-tidy: apply checks --- .../galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc | 4 ++-- .../gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc | 4 ++-- .../gnuradio_blocks/pcps_assisted_acquisition_cc.cc | 4 ++-- .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc | 4 ++-- .../gnuradio_blocks/pcps_quicksync_acquisition_cc.cc | 4 ++-- .../acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc | 4 ++-- .../signal_generator/gnuradio_blocks/signal_generator_c.cc | 2 +- .../glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc | 6 +++--- .../gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc | 4 ++-- .../glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc | 6 +++--- .../gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc | 4 ++-- .../gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc | 6 +++--- .../tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc | 4 ++-- .../acquisition/gps_l1_ca_pcps_acquisition_test.cc | 2 +- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc index 84e517a09..c6f14d597 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc @@ -60,7 +60,7 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr galileo_e5a_noncoherentIQ_make { return galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr( new galileo_e5a_noncoherentIQ_acquisition_caf_cc(sampled_ms, max_dwells, doppler_max, fs_in, samples_per_ms, - samples_per_code, bit_transition_flag, dump, dump_filename, both_signal_components_, CAF_window_hz_, Zero_padding_)); + samples_per_code, bit_transition_flag, dump, std::move(dump_filename), both_signal_components_, CAF_window_hz_, Zero_padding_)); } @@ -153,7 +153,7 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc::galileo_e5a_noncoherentIQ_acquisit // For dumping samples into a file d_dump = dump; - d_dump_filename = dump_filename; + d_dump_filename = std::move(dump_filename); d_doppler_resolution = 0; d_threshold = 0; diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc index 7b5566aba..cb528d0b1 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc @@ -51,7 +51,7 @@ galileo_pcps_8ms_acquisition_cc_sptr galileo_pcps_8ms_make_acquisition_cc( { return galileo_pcps_8ms_acquisition_cc_sptr( new galileo_pcps_8ms_acquisition_cc(sampled_ms, max_dwells, doppler_max, fs_in, samples_per_ms, - samples_per_code, dump, dump_filename)); + samples_per_code, dump, std::move(dump_filename))); } @@ -95,7 +95,7 @@ galileo_pcps_8ms_acquisition_cc::galileo_pcps_8ms_acquisition_cc( // For dumping samples into a file d_dump = dump; - d_dump_filename = dump_filename; + d_dump_filename = std::move(dump_filename); d_doppler_resolution = 0; d_threshold = 0; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc index 413b7af10..5e8100f59 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc @@ -53,7 +53,7 @@ pcps_assisted_acquisition_cc_sptr pcps_make_assisted_acquisition_cc( { return pcps_assisted_acquisition_cc_sptr( new pcps_assisted_acquisition_cc(max_dwells, sampled_ms, doppler_max, doppler_min, - fs_in, samples_per_ms, dump, dump_filename)); + fs_in, samples_per_ms, dump, std::move(dump_filename))); } @@ -90,7 +90,7 @@ pcps_assisted_acquisition_cc::pcps_assisted_acquisition_cc( // For dumping samples into a file d_dump = dump; - d_dump_filename = dump_filename; + d_dump_filename = std::move(dump_filename); d_doppler_resolution = 0; d_threshold = 0; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc index 918bc5aa2..17082ae25 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc @@ -57,7 +57,7 @@ pcps_cccwsr_acquisition_cc_sptr pcps_cccwsr_make_acquisition_cc( { return pcps_cccwsr_acquisition_cc_sptr( new pcps_cccwsr_acquisition_cc(sampled_ms, max_dwells, doppler_max, fs_in, - samples_per_ms, samples_per_code, dump, dump_filename)); + samples_per_ms, samples_per_code, dump, std::move(dump_filename))); } @@ -105,7 +105,7 @@ pcps_cccwsr_acquisition_cc::pcps_cccwsr_acquisition_cc( // For dumping samples into a file d_dump = dump; - d_dump_filename = dump_filename; + d_dump_filename = std::move(dump_filename); d_doppler_resolution = 0; d_threshold = 0; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc index d04c71495..a55b352c9 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc @@ -61,7 +61,7 @@ pcps_quicksync_acquisition_cc_sptr pcps_quicksync_make_acquisition_cc( fs_in, samples_per_ms, samples_per_code, bit_transition_flag, - dump, dump_filename)); + dump, std::move(dump_filename))); } @@ -114,7 +114,7 @@ pcps_quicksync_acquisition_cc::pcps_quicksync_acquisition_cc( // For dumping samples into a file d_dump = dump; - d_dump_filename = dump_filename; + d_dump_filename = std::move(dump_filename); d_corr_acumulator = nullptr; d_signal_folded = nullptr; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc index 319525ca3..7fc685028 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc @@ -73,7 +73,7 @@ pcps_tong_acquisition_cc_sptr pcps_tong_make_acquisition_cc( { return pcps_tong_acquisition_cc_sptr( new pcps_tong_acquisition_cc(sampled_ms, doppler_max, fs_in, samples_per_ms, samples_per_code, - tong_init_val, tong_max_val, tong_max_dwells, dump, dump_filename)); + tong_init_val, tong_max_val, tong_max_dwells, dump, std::move(dump_filename))); } @@ -121,7 +121,7 @@ pcps_tong_acquisition_cc::pcps_tong_acquisition_cc( // For dumping samples into a file d_dump = dump; - d_dump_filename = dump_filename; + d_dump_filename = std::move(dump_filename); d_doppler_resolution = 0; d_threshold = 0; diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc index 6029af1ac..84a90d555 100644 --- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc +++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc @@ -53,7 +53,7 @@ signal_make_generator_c(std::vector signal1, std::vector &delay_chips, const std::vector &delay_sec, bool data_flag, bool noise_flag, unsigned int fs_in, unsigned int vector_length, float BW_BB) { - return gnuradio::get_initial_sptr(new signal_generator_c(signal1, system, PRN, CN0_dB, doppler_Hz, delay_chips, delay_sec, + return gnuradio::get_initial_sptr(new signal_generator_c(std::move(signal1), std::move(system), PRN, CN0_dB, doppler_Hz, delay_chips, delay_sec, data_flag, noise_flag, fs_in, vector_length, BW_BB)); } diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc index b422fa6ec..21a040646 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc @@ -74,7 +74,7 @@ glonass_l1_ca_dll_pll_c_aid_make_tracking_cc( float early_late_space_chips) { return glonass_l1_ca_dll_pll_c_aid_tracking_cc_sptr(new glonass_l1_ca_dll_pll_c_aid_tracking_cc( - fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips)); + fs_in, vector_length, dump, std::move(dump_filename), pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips)); } @@ -94,7 +94,7 @@ void glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(pmt::pm DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN); if (d_enable_extended_integration == false) //avoid re-setting preamble indicator { - d_preamble_timestamp_s = pmt::to_double(msg); + d_preamble_timestamp_s = pmt::to_double(std::move(msg)); d_enable_extended_integration = true; d_preamble_synchronized = false; } @@ -125,7 +125,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc::glonass_l1_ca_dll_pll_c_aid_tracking_cc d_dump = dump; d_fs_in = fs_in; d_vector_length = vector_length; - d_dump_filename = dump_filename; + d_dump_filename = std::move(dump_filename); d_correlation_length_samples = static_cast(d_vector_length); // Initialize tracking ========================================== diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc index 3df2c07f6..68d94e82f 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc @@ -68,7 +68,7 @@ glonass_l1_ca_dll_pll_make_tracking_cc( float early_late_space_chips) { return glonass_l1_ca_dll_pll_tracking_cc_sptr(new Glonass_L1_Ca_Dll_Pll_Tracking_cc( - fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, early_late_space_chips)); + fs_in, vector_length, dump, std::move(dump_filename), pll_bw_hz, dll_bw_hz, early_late_space_chips)); } @@ -98,7 +98,7 @@ Glonass_L1_Ca_Dll_Pll_Tracking_cc::Glonass_L1_Ca_Dll_Pll_Tracking_cc( d_dump = dump; d_fs_in = fs_in; d_vector_length = vector_length; - d_dump_filename = dump_filename; + d_dump_filename = std::move(dump_filename); d_current_prn_length_samples = static_cast(d_vector_length); diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc index b31f4167b..ae689ab8a 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc @@ -71,7 +71,7 @@ glonass_l2_ca_dll_pll_c_aid_make_tracking_cc( float early_late_space_chips) { return glonass_l2_ca_dll_pll_c_aid_tracking_cc_sptr(new glonass_l2_ca_dll_pll_c_aid_tracking_cc( - fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips)); + fs_in, vector_length, dump, std::move(dump_filename), pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips)); } @@ -91,7 +91,7 @@ void glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(pmt::pm DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN); if (d_enable_extended_integration == false) //avoid re-setting preamble indicator { - d_preamble_timestamp_s = pmt::to_double(msg); + d_preamble_timestamp_s = pmt::to_double(std::move(msg)); d_enable_extended_integration = true; d_preamble_synchronized = false; } @@ -122,7 +122,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc::glonass_l2_ca_dll_pll_c_aid_tracking_cc d_dump = dump; d_fs_in = fs_in; d_vector_length = vector_length; - d_dump_filename = dump_filename; + d_dump_filename = std::move(dump_filename); d_correlation_length_samples = static_cast(d_vector_length); // Initialize tracking ========================================== diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc index b5b4dcd3e..8156ea09b 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc @@ -68,7 +68,7 @@ glonass_l2_ca_dll_pll_make_tracking_cc( float early_late_space_chips) { return glonass_l2_ca_dll_pll_tracking_cc_sptr(new Glonass_L2_Ca_Dll_Pll_Tracking_cc( - fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, early_late_space_chips)); + fs_in, vector_length, dump, std::move(dump_filename), pll_bw_hz, dll_bw_hz, early_late_space_chips)); } @@ -98,7 +98,7 @@ Glonass_L2_Ca_Dll_Pll_Tracking_cc::Glonass_L2_Ca_Dll_Pll_Tracking_cc( d_dump = dump; d_fs_in = fs_in; d_vector_length = vector_length; - d_dump_filename = dump_filename; + d_dump_filename = std::move(dump_filename); d_current_prn_length_samples = static_cast(d_vector_length); diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc index aed6b2abc..45a890cbe 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc @@ -63,7 +63,7 @@ gps_l1_ca_dll_pll_c_aid_make_tracking_cc( float early_late_space_chips) { return gps_l1_ca_dll_pll_c_aid_tracking_cc_sptr(new gps_l1_ca_dll_pll_c_aid_tracking_cc( - fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips)); + fs_in, vector_length, dump, std::move(dump_filename), pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips)); } @@ -83,7 +83,7 @@ void gps_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(pmt::pmt_t DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN); if (d_enable_extended_integration == false) //avoid re-setting preamble indicator { - d_preamble_timestamp_s = pmt::to_double(msg); + d_preamble_timestamp_s = pmt::to_double(std::move(msg)); d_enable_extended_integration = true; d_preamble_synchronized = false; } @@ -114,7 +114,7 @@ gps_l1_ca_dll_pll_c_aid_tracking_cc::gps_l1_ca_dll_pll_c_aid_tracking_cc( d_dump = dump; d_fs_in = fs_in; d_vector_length = vector_length; - d_dump_filename = dump_filename; + d_dump_filename = std::move(dump_filename); d_correlation_length_samples = static_cast(d_vector_length); // Initialize tracking ========================================== diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc index 8ddf18102..96c478a3f 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc @@ -74,7 +74,7 @@ gps_l1_ca_kf_make_tracking_cc( int32_t bce_kappa) { return gps_l1_ca_kf_tracking_cc_sptr(new Gps_L1_Ca_Kf_Tracking_cc(order, if_freq, - fs_in, vector_length, dump, dump_filename, dll_bw_hz, early_late_space_chips, + fs_in, vector_length, dump, std::move(dump_filename), dll_bw_hz, early_late_space_chips, bce_run, bce_ptrans, bce_strans, bce_nu, bce_kappa)); } @@ -115,7 +115,7 @@ Gps_L1_Ca_Kf_Tracking_cc::Gps_L1_Ca_Kf_Tracking_cc( d_if_freq = if_freq; d_fs_in = fs_in; d_vector_length = vector_length; - d_dump_filename = dump_filename; + d_dump_filename = std::move(dump_filename); d_current_prn_length_samples = static_cast(d_vector_length); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc index 8dd6ef17f..5cc30eeb1 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc @@ -89,7 +89,7 @@ void GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg) { try { - int64_t message = pmt::to_long(msg); + int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } catch (boost::bad_any_cast &e) From 719af13a3305e1ead0a594c1d3859452461e8f51 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 14 Feb 2019 12:51:43 +0100 Subject: [PATCH 4/5] Remove google-runtime-references check --- .clang-tidy | 4 +-- .../PVT/gnuradio_blocks/rtklib_pvt_cc.cc | 30 +++++++++---------- src/algorithms/PVT/libs/rtklib_solver.cc | 4 +-- src/core/receiver/control_message_factory.cc | 2 +- src/core/receiver/control_message_factory.h | 2 +- src/core/receiver/control_thread.cc | 17 +++++++---- src/core/receiver/control_thread.h | 2 +- src/core/receiver/gnss_block_factory.cc | 6 ++-- src/core/receiver/gnss_block_factory.h | 6 ++-- src/core/receiver/gnss_flowgraph.cc | 3 +- src/core/receiver/gnss_flowgraph.h | 2 +- 11 files changed, 41 insertions(+), 37 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index d71c07a3b..bcc3e3cdb 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,5 +1,5 @@ --- -Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,google-runtime-references,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-bool-literals,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,performance-faster-string-find,performance-inefficient-algorithm,performance-move-const-arg,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-container-size-empty,readability-named-parameter,readability-non-const-parameter,readability-string-compare' +Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-bool-literals,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,performance-faster-string-find,performance-inefficient-algorithm,performance-move-const-arg,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-container-size-empty,readability-named-parameter,readability-non-const-parameter,readability-string-compare' WarningsAsErrors: '' HeaderFilterRegex: '' AnalyzeTemporaryDtors: false @@ -21,8 +21,6 @@ CheckOptions: value: '_t' - key: google-runtime-int.UnsignedTypePrefix value: uint - - key: google-runtime-references.WhiteListTypes - value: '' - key: misc-throw-by-value-catch-by-reference.CheckThrowTemporaries value: '1' - key: modernize-loop-convert.MaxCopySize diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc index 151c667c8..e618e7b5d 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc @@ -618,7 +618,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc() { LOG(WARNING) << e.what(); } - catch (std::exception& e) + catch (const std::exception& e) { LOG(WARNING) << e.what(); } @@ -704,7 +704,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc() { LOG(WARNING) << "Problem opening output XML file"; } - catch (std::exception& e) + catch (const std::exception& e) { LOG(WARNING) << e.what(); } @@ -734,7 +734,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc() { LOG(WARNING) << e.what(); } - catch (std::exception& e) + catch (const std::exception& e) { LOG(WARNING) << e.what(); } @@ -764,7 +764,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc() { LOG(WARNING) << "Problem opening output XML file"; } - catch (std::exception& e) + catch (const std::exception& e) { LOG(WARNING) << e.what(); } @@ -794,7 +794,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc() { LOG(WARNING) << "Problem opening output XML file"; } - catch (std::exception& e) + catch (const std::exception& e) { LOG(WARNING) << e.what(); } @@ -824,7 +824,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc() { LOG(WARNING) << "Problem opening output XML file"; } - catch (std::exception& e) + catch (const std::exception& e) { LOG(WARNING) << e.what(); } @@ -854,7 +854,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc() { LOG(WARNING) << "Problem opening output XML file"; } - catch (std::exception& e) + catch (const std::exception& e) { LOG(WARNING) << e.what(); } @@ -914,7 +914,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc() { LOG(WARNING) << "Problem opening output XML file"; } - catch (std::exception& e) + catch (const std::exception& e) { LOG(WARNING) << e.what(); } @@ -944,7 +944,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc() { LOG(WARNING) << "Problem opening output XML file"; } - catch (std::exception& e) + catch (const std::exception& e) { LOG(WARNING) << e.what(); } @@ -974,7 +974,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc() { LOG(WARNING) << "Problem opening output XML file"; } - catch (std::exception& e) + catch (const std::exception& e) { LOG(WARNING) << e.what(); } @@ -1004,7 +1004,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc() { LOG(WARNING) << "Problem opening output XML file"; } - catch (std::exception& e) + catch (const std::exception& e) { LOG(WARNING) << e.what(); } @@ -1064,7 +1064,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc() { LOG(WARNING) << "Problem opening output XML file"; } - catch (std::exception& e) + catch (const std::exception& e) { LOG(WARNING) << e.what(); } @@ -1124,7 +1124,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc() { LOG(WARNING) << "Problem opening output XML file"; } - catch (std::exception& e) + catch (const std::exception& e) { LOG(WARNING) << e.what(); } @@ -1176,7 +1176,7 @@ bool rtklib_pvt_cc::save_gnss_synchro_map_xml(const std::string& file_name) xml << boost::serialization::make_nvp("GNSS-SDR_gnss_synchro_map", gnss_observables_map); LOG(INFO) << "Saved gnss_sychro map data"; } - catch (std::exception& e) + catch (const std::exception& e) { LOG(WARNING) << e.what(); return false; @@ -1201,7 +1201,7 @@ bool rtklib_pvt_cc::load_gnss_synchro_map_xml(const std::string& file_name) xml >> boost::serialization::make_nvp("GNSS-SDR_gnss_synchro_map", gnss_observables_map); //std::cout << "Loaded gnss_synchro map data with " << gnss_synchro_map.size() << " pseudoranges" << std::endl; } - catch (std::exception& e) + catch (const std::exception& e) { std::cout << e.what() << "File: " << file_name; return false; diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc index aeabc0517..0a9115622 100644 --- a/src/algorithms/PVT/libs/rtklib_solver.cc +++ b/src/algorithms/PVT/libs/rtklib_solver.cc @@ -93,11 +93,11 @@ rtklib_solver::rtklib_solver(int nchannels, std::string dump_filename, bool flag { try { - d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit); + d_dump_file.exceptions(std::ofstream::failbit | std::ofstream::badbit); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); LOG(INFO) << "PVT lib dump enabled Log file: " << d_dump_filename.c_str(); } - catch (const std::ifstream::failure &e) + catch (const std::ofstream::failure &e) { LOG(WARNING) << "Exception opening RTKLIB dump file " << e.what(); } diff --git a/src/core/receiver/control_message_factory.cc b/src/core/receiver/control_message_factory.cc index d2871d39e..435a9a6d6 100644 --- a/src/core/receiver/control_message_factory.cc +++ b/src/core/receiver/control_message_factory.cc @@ -53,7 +53,7 @@ gr::message::sptr ControlMessageFactory::GetQueueMessage(unsigned int who, unsig } -std::shared_ptr>> ControlMessageFactory::GetControlMessages(const gr::message::sptr& queue_message) +std::shared_ptr>> ControlMessageFactory::GetControlMessages(const gr::message::sptr queue_message) // NOLINT(performance-unnecessary-value-param) { std::shared_ptr>> control_messages = std::make_shared>>(); unsigned int control_messages_count = queue_message->length() / sizeof(ControlMessage); diff --git a/src/core/receiver/control_message_factory.h b/src/core/receiver/control_message_factory.h index 3aac015a9..4ca93e725 100644 --- a/src/core/receiver/control_message_factory.h +++ b/src/core/receiver/control_message_factory.h @@ -58,7 +58,7 @@ public: virtual ~ControlMessageFactory(); gr::message::sptr GetQueueMessage(unsigned int who, unsigned int what); - std::shared_ptr>> GetControlMessages(const gr::message::sptr& queue_message); + std::shared_ptr>> GetControlMessages(const gr::message::sptr queue_message); // NOLINT(performance-unnecessary-value-param) }; #endif /*GNSS_SDR_CONTROL_MESSAGE_FACTORY_H_*/ diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc index 71e789778..6bb4f7b9d 100644 --- a/src/core/receiver/control_thread.cc +++ b/src/core/receiver/control_thread.cc @@ -285,11 +285,16 @@ int ControlThread::run() flowgraph_->disconnect(); // Join keyboard thread - keyboard_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000)); - sysv_queue_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000)); - cmd_interface_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000)); - - LOG(INFO) << "Flowgraph stopped"; + try + { + keyboard_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000)); + sysv_queue_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000)); + cmd_interface_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000)); + } + catch (const boost::thread_interrupted &interrupt) + { + DLOG(INFO) << "Thread interrupted"; + } if (restart_) { @@ -300,7 +305,7 @@ int ControlThread::run() } -void ControlThread::set_control_queue(const gr::msg_queue::sptr &control_queue) +void ControlThread::set_control_queue(const gr::msg_queue::sptr control_queue) // NOLINT(performance-unnecessary-value-param) { if (flowgraph_->running()) { diff --git a/src/core/receiver/control_thread.h b/src/core/receiver/control_thread.h index b500e43fa..590ebb622 100644 --- a/src/core/receiver/control_thread.h +++ b/src/core/receiver/control_thread.h @@ -93,7 +93,7 @@ public: * * \param[in] boost::shared_ptr control_queue */ - void set_control_queue(const gr::msg_queue::sptr& control_queue); + void set_control_queue(const gr::msg_queue::sptr control_queue); // NOLINT(performance-unnecessary-value-param) unsigned int processed_control_messages() diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index e0e08a8c0..dce01a732 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -182,7 +182,7 @@ GNSSBlockFactory::~GNSSBlockFactory() = default; std::unique_ptr GNSSBlockFactory::GetSignalSource( - const std::shared_ptr& configuration, const gr::msg_queue::sptr& queue, int ID) + const std::shared_ptr& configuration, const gr::msg_queue::sptr queue, int ID) // NOLINT(performance-unnecessary-value-param) { std::string default_implementation = "File_Signal_Source"; std::string role = "SignalSource"; //backwards compatibility for old conf files @@ -851,7 +851,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_B1( } std::unique_ptr>> GNSSBlockFactory::GetChannels( - const std::shared_ptr& configuration, const gr::msg_queue::sptr& queue) + const std::shared_ptr& configuration, const gr::msg_queue::sptr queue) // NOLINT(performance-unnecessary-value-param) { std::string default_implementation = "Pass_Through"; std::string tracking_implementation; @@ -1139,7 +1139,7 @@ std::unique_ptr GNSSBlockFactory::GetBlock( const std::shared_ptr& configuration, const std::string& role, const std::string& implementation, unsigned int in_streams, - unsigned int out_streams, const gr::msg_queue::sptr& queue) + unsigned int out_streams, const gr::msg_queue::sptr queue) // NOLINT(performance-unnecessary-value-param) { std::unique_ptr block; diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h index e3eb02226..d9c153794 100644 --- a/src/core/receiver/gnss_block_factory.h +++ b/src/core/receiver/gnss_block_factory.h @@ -58,7 +58,7 @@ public: GNSSBlockFactory(); virtual ~GNSSBlockFactory(); std::unique_ptr GetSignalSource(const std::shared_ptr& configuration, - const gr::msg_queue::sptr& queue, int ID = -1); + const gr::msg_queue::sptr queue, int ID = -1); // NOLINT(performance-unnecessary-value-param) std::unique_ptr GetSignalConditioner(const std::shared_ptr& configuration, int ID = -1); @@ -67,7 +67,7 @@ public: std::unique_ptr GetObservables(const std::shared_ptr& configuration); std::unique_ptr>> GetChannels(const std::shared_ptr& configuration, - const gr::msg_queue::sptr& queue); + const gr::msg_queue::sptr queue); // NOLINT(performance-unnecessary-value-param) /* * \brief Returns the block with the required configuration and implementation @@ -75,7 +75,7 @@ public: std::unique_ptr GetBlock(const std::shared_ptr& configuration, const std::string& role, const std::string& implementation, unsigned int in_streams, unsigned int out_streams, - const gr::msg_queue::sptr& queue = nullptr); + const gr::msg_queue::sptr queue = nullptr); // NOLINT(performance-unnecessary-value-param) private: std::unique_ptr GetChannel_1C(const std::shared_ptr& configuration, diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index 82cc49e09..be8b18f01 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -62,7 +62,7 @@ using google::LogMessage; -GNSSFlowgraph::GNSSFlowgraph(std::shared_ptr configuration, const gr::msg_queue::sptr& queue) +GNSSFlowgraph::GNSSFlowgraph(std::shared_ptr configuration, const gr::msg_queue::sptr queue) // NOLINT(performance-unnecessary-value-param) { connected_ = false; running_ = false; @@ -839,6 +839,7 @@ void GNSSFlowgraph::disconnect() for (unsigned int i = 0; i < channels_count_; i++) { top_block_->disconnect(observables_->get_right_block(), i, pvt_->get_left_block(), i); + top_block_->disconnect(observables_->get_right_block(), i, GnssSynchroMonitor_, i); top_block_->msg_disconnect(channels_.at(i)->get_right_block(), pmt::mp("telemetry"), pvt_->get_left_block(), pmt::mp("telemetry")); } } diff --git a/src/core/receiver/gnss_flowgraph.h b/src/core/receiver/gnss_flowgraph.h index 67f86bc6b..e0023b444 100644 --- a/src/core/receiver/gnss_flowgraph.h +++ b/src/core/receiver/gnss_flowgraph.h @@ -72,7 +72,7 @@ public: /*! * \brief Constructor that initializes the receiver flow graph */ - GNSSFlowgraph(std::shared_ptr configuration, const gr::msg_queue::sptr& queue); + GNSSFlowgraph(std::shared_ptr configuration, const gr::msg_queue::sptr queue); // NOLINT(performance-unnecessary-value-param) /*! * \brief Destructor From 786118a30579616528eda40cc973a7c8817c1d6f Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 14 Feb 2019 16:46:16 +0100 Subject: [PATCH 5/5] Fix disconection of Monitor block --- src/core/receiver/gnss_flowgraph.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index be8b18f01..5989d9940 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -839,7 +839,10 @@ void GNSSFlowgraph::disconnect() for (unsigned int i = 0; i < channels_count_; i++) { top_block_->disconnect(observables_->get_right_block(), i, pvt_->get_left_block(), i); - top_block_->disconnect(observables_->get_right_block(), i, GnssSynchroMonitor_, i); + if (enable_monitor_) + { + top_block_->disconnect(observables_->get_right_block(), i, GnssSynchroMonitor_, i); + } top_block_->msg_disconnect(channels_.at(i)->get_right_block(), pmt::mp("telemetry"), pvt_->get_left_block(), pmt::mp("telemetry")); } }