diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc index af21af002..0f2effce3 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc @@ -1596,9 +1596,9 @@ void rtklib_pvt_gs::msg_handler_telemetry(const pmt::pmt_t& msg) LOG(WARNING) << "msg_handler_telemetry unknown object type!"; } } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_telemetry Bad any_cast: " << e.what(); } } diff --git a/src/algorithms/channel/adapters/channel.h b/src/algorithms/channel/adapters/channel.h index 5af67ad95..9a502bf5a 100644 --- a/src/algorithms/channel/adapters/channel.h +++ b/src/algorithms/channel/adapters/channel.h @@ -81,7 +81,6 @@ public: inline std::shared_ptr acquisition() const { return acq_; } inline std::shared_ptr tracking() const { return trk_; } inline std::shared_ptr telemetry() const { return nav_; } - void msg_handler_events(pmt::pmt_t msg); private: std::shared_ptr channel_fsm_; diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc index 4ba3947be..998bafe30 100644 --- a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc +++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc @@ -38,31 +38,30 @@ channel_msg_receiver_cc_sptr channel_msg_receiver_make_cc(std::shared_ptr channel_fsm, bool repeat) : gr::block("channel_msg_receiver_cc", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)) +channel_msg_receiver_cc::channel_msg_receiver_cc(std::shared_ptr channel_fsm, bool repeat) : gr::block("channel_msg_receiver_cc", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), + d_channel_fsm(std::move(channel_fsm)), + d_repeat(repeat) { this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&channel_msg_receiver_cc::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&channel_msg_receiver_cc::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&channel_msg_receiver_cc::msg_handler_events, this, _1)); + boost::bind(&channel_msg_receiver_cc::msg_handler_channel_events, this, _1)); #endif #endif - - d_channel_fsm = std::move(channel_fsm); - d_repeat = repeat; } -void channel_msg_receiver_cc::msg_handler_events(pmt::pmt_t msg) +void channel_msg_receiver_cc::msg_handler_channel_events(const pmt::pmt_t& msg) { bool result = false; try { - const int64_t message = pmt::to_long(std::move(msg)); + const int64_t message = pmt::to_long(msg); switch (message) { case 1: // positive acquisition @@ -88,12 +87,12 @@ void channel_msg_receiver_cc::msg_handler_events(pmt::pmt_t msg) break; } } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any cast: " << e.what(); } if (!result) { - LOG(WARNING) << "msg_handler_telemetry invalid event"; + LOG(WARNING) << "msg_handler_channel_events invalid event"; } } diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.h b/src/algorithms/channel/libs/channel_msg_receiver_cc.h index 05831e1db..14edd45c0 100644 --- a/src/algorithms/channel/libs/channel_msg_receiver_cc.h +++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.h @@ -50,7 +50,7 @@ public: private: friend channel_msg_receiver_cc_sptr channel_msg_receiver_make_cc(std::shared_ptr channel_fsm, bool repeat); channel_msg_receiver_cc(std::shared_ptr channel_fsm, bool repeat); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t& msg); std::shared_ptr d_channel_fsm; bool d_repeat; // todo: change FSM to include repeat value }; diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc index 253605891..3d06b1a67 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc @@ -225,9 +225,9 @@ void hybrid_observables_gs::msg_handler_pvt_to_observables(const pmt::pmt_t &msg LOG(INFO) << "Corrected new RX Time offset: " << static_cast(round(new_rx_clock_offset_s * 1000.0)) << "[ms]"; } } - catch (boost::bad_any_cast &e) + catch (const boost::bad_any_cast &e) { - LOG(WARNING) << "msg_handler_pvt_to_observables Bad any cast!"; + LOG(WARNING) << "msg_handler_pvt_to_observables Bad any_cast: " << e.what(); } } diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc index 532b25787..031eb0626 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc @@ -604,9 +604,9 @@ void dll_pll_veml_tracking::msg_handler_telemetry_to_trk(const pmt::pmt_t &msg) } } } - catch (boost::bad_any_cast &e) + catch (const boost::bad_any_cast &e) { - LOG(WARNING) << "msg_handler_telemetry_to_trk Bad any cast!"; + LOG(WARNING) << "msg_handler_telemetry_to_trk Bad any_cast: " << e.what(); } } diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc index 5f50e4cdf..b5c69ecb8 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc @@ -500,9 +500,9 @@ void dll_pll_veml_tracking_fpga::msg_handler_telemetry_to_trk(const pmt::pmt_t & } } } - catch (boost::bad_any_cast &e) + catch (const boost::bad_any_cast &e) { - LOG(WARNING) << "msg_handler_telemetry_to_trk Bad any cast!"; + LOG(WARNING) << "msg_handler_telemetry_to_trk Bad any_cast: " << e.what(); } } diff --git a/src/core/libs/channel_status_msg_receiver.cc b/src/core/libs/channel_status_msg_receiver.cc index 791b53c48..4d22afdea 100644 --- a/src/core/libs/channel_status_msg_receiver.cc +++ b/src/core/libs/channel_status_msg_receiver.cc @@ -1,6 +1,7 @@ /*! * \file channel_status_msg_receiver.cc - * \brief GNU Radio block that receives asynchronous channel messages from acquisition and tracking blocks + * \brief GNU Radio block that receives asynchronous channel messages from + * acquisition and tracking blocks * \author Javier Arribas, 2019. jarribas(at)cttc.es * * ----------------------------------------------------------------------------- @@ -45,21 +46,21 @@ channel_status_msg_receiver::channel_status_msg_receiver() : gr::block("channel_ this->message_port_register_in(pmt::mp("status")); this->set_msg_handler(pmt::mp("status"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_status(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&channel_status_msg_receiver::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&channel_status_msg_receiver::msg_handler_channel_status, this, boost::placeholders::_1)); #else - boost::bind(&channel_status_msg_receiver::msg_handler_events, this, _1)); + boost::bind(&channel_status_msg_receiver::msg_handler_channel_status, this, _1)); #endif #endif d_pvt_status.RX_time = -1; // to indicate that the PVT is not available } -void channel_status_msg_receiver::msg_handler_events(const pmt::pmt_t& msg) +void channel_status_msg_receiver::msg_handler_channel_status(const pmt::pmt_t& msg) { - gr::thread::scoped_lock lock(d_setlock); // require mutex with msg_handler_events function called by the scheduler + gr::thread::scoped_lock lock(d_setlock); // require mutex with msg_handler_channel_status function called by the scheduler try { const size_t msg_type_hash_code = pmt::any_ref(msg).type().hash_code(); @@ -98,22 +99,22 @@ void channel_status_msg_receiver::msg_handler_events(const pmt::pmt_t& msg) LOG(WARNING) << "channel_status_msg_receiver unknown object type!"; } } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "channel_status_msg_receiver Bad any cast!"; + LOG(WARNING) << "channel_status_msg_receiver Bad any_cast: " << e.what(); } } std::map> channel_status_msg_receiver::get_current_status_map() { - gr::thread::scoped_lock lock(d_setlock); // require mutex with msg_handler_events function called by the scheduler + gr::thread::scoped_lock lock(d_setlock); // require mutex with msg_handler_channel_status function called by the scheduler return d_channel_status_map; } Monitor_Pvt channel_status_msg_receiver::get_current_status_pvt() { - gr::thread::scoped_lock lock(d_setlock); // require mutex with msg_handler_events function called by the scheduler + gr::thread::scoped_lock lock(d_setlock); // require mutex with msg_handler_channel_status function called by the scheduler return d_pvt_status; } diff --git a/src/core/libs/channel_status_msg_receiver.h b/src/core/libs/channel_status_msg_receiver.h index ac8ffdecd..9b3c31935 100644 --- a/src/core/libs/channel_status_msg_receiver.h +++ b/src/core/libs/channel_status_msg_receiver.h @@ -1,6 +1,7 @@ /*! * \file channel_status_msg_receiver.h - * \brief GNU Radio block that receives asynchronous channel messages from acquisition and tracking blocks + * \brief GNU Radio block that receives asynchronous channel messages from + * acquisition and tracking blocks * \author Javier Arribas, 2019. jarribas(at)cttc.es * * ----------------------------------------------------------------------------- @@ -62,7 +63,7 @@ public: private: friend channel_status_msg_receiver_sptr channel_status_msg_receiver_make(); channel_status_msg_receiver(); - void msg_handler_events(const pmt::pmt_t& msg); + void msg_handler_channel_status(const pmt::pmt_t& msg); Monitor_Pvt d_pvt_status{}; std::map> d_channel_status_map; }; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc index 384e763e8..0b05d74c4 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc @@ -122,7 +122,7 @@ class AcqPerfTest_msg_rx : public gr::block { private: friend AcqPerfTest_msg_rx_sptr AcqPerfTest_msg_rx_make(Concurrent_Queue& queue); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); explicit AcqPerfTest_msg_rx(Concurrent_Queue& queue); Concurrent_Queue& channel_internal_queue; @@ -138,7 +138,7 @@ AcqPerfTest_msg_rx_sptr AcqPerfTest_msg_rx_make(Concurrent_Queue& queue) } -void AcqPerfTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void AcqPerfTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { @@ -146,9 +146,9 @@ void AcqPerfTest_msg_rx::msg_handler_events(pmt::pmt_t msg) rx_message = message; channel_internal_queue.push(rx_message); } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -159,12 +159,12 @@ AcqPerfTest_msg_rx::AcqPerfTest_msg_rx(Concurrent_Queue& queue) : gr::block this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&AcqPerfTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&AcqPerfTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&AcqPerfTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&AcqPerfTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc index 5b84ea69d..17037fac3 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc @@ -76,7 +76,7 @@ class BeidouB1iPcpsAcquisitionTest_msg_rx : public gr::block { private: friend BeidouB1iPcpsAcquisitionTest_msg_rx_sptr BeidouB1iPcpsAcquisitionTest_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); BeidouB1iPcpsAcquisitionTest_msg_rx(); public: @@ -91,16 +91,16 @@ BeidouB1iPcpsAcquisitionTest_msg_rx_sptr BeidouB1iPcpsAcquisitionTest_msg_rx_mak } -void BeidouB1iPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void BeidouB1iPcpsAcquisitionTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } - catch (boost::bad_any_cast &e) + catch (const boost::bad_any_cast &e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -111,12 +111,12 @@ BeidouB1iPcpsAcquisitionTest_msg_rx::BeidouB1iPcpsAcquisitionTest_msg_rx() : gr: this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto &&PH1) { msg_handler_events(PH1); }); + [this](auto &&PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&BeidouB1iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&BeidouB1iPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&BeidouB1iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&BeidouB1iPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc index 9522c9b0d..8e2a7d902 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc @@ -76,7 +76,7 @@ class BeidouB3iPcpsAcquisitionTest_msg_rx : public gr::block { private: friend BeidouB3iPcpsAcquisitionTest_msg_rx_sptr BeidouB3iPcpsAcquisitionTest_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); BeidouB3iPcpsAcquisitionTest_msg_rx(); public: @@ -91,16 +91,16 @@ BeidouB3iPcpsAcquisitionTest_msg_rx_sptr BeidouB3iPcpsAcquisitionTest_msg_rx_mak } -void BeidouB3iPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void BeidouB3iPcpsAcquisitionTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } - catch (boost::bad_any_cast &e) + catch (const boost::bad_any_cast &e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -111,12 +111,12 @@ BeidouB3iPcpsAcquisitionTest_msg_rx::BeidouB3iPcpsAcquisitionTest_msg_rx() : gr: this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto &&PH1) { msg_handler_events(PH1); }); + [this](auto &&PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&BeidouB3iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&BeidouB3iPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&BeidouB3iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&BeidouB3iPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc index c70c9cb55..a8e9590f5 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc @@ -68,7 +68,7 @@ class GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx : public gr::block { private: friend GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue& queue); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); explicit GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue& queue); Concurrent_Queue& channel_internal_queue; @@ -84,7 +84,7 @@ GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1Pcps8msAmb } -void GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { @@ -92,9 +92,9 @@ void GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events rx_message = message; channel_internal_queue.push(rx_message); } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -105,12 +105,12 @@ GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1Pcps8msAmbiguo this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc index 0c327cbda..3881a9c06 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc @@ -66,7 +66,7 @@ class GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx : public gr::block { private: friend GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue& queue); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); explicit GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue& queue); Concurrent_Queue& channel_internal_queue; @@ -82,7 +82,7 @@ GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsAmbiguous } -void GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { @@ -90,9 +90,9 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pm rx_message = message; channel_internal_queue.push(rx_message); } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -103,12 +103,12 @@ GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsAmbiguousAcqu this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc index f31778f2b..74c4eb851 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc @@ -75,7 +75,7 @@ class GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx : public gr::block { private: friend GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_make(Concurrent_Queue& queue); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); explicit GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx(Concurrent_Queue& queue); Concurrent_Queue& channel_internal_queue; @@ -91,7 +91,7 @@ GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcqu } -void GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { @@ -99,9 +99,9 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_events(pmt::p rx_message = message; channel_internal_queue.push(rx_message); } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -112,12 +112,12 @@ GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::GalileoE1PcpsAmbiguousAcquisit this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc index 8b10959b9..78b03e57b 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc @@ -89,7 +89,7 @@ class GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx : public gr::block { private: friend GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx(); public: @@ -104,16 +104,16 @@ GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisit } -void GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -124,12 +124,12 @@ GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsAmbiguousAcquisitionT this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc index 2ff9ae5ec..8a703f494 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc @@ -69,7 +69,7 @@ class GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx : public gr::block { private: friend GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(Concurrent_Queue& queue); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); explicit GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx(Concurrent_Queue& queue); Concurrent_Queue& channel_internal_queue; @@ -85,7 +85,7 @@ GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsCccwsrAmbig } -void GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { @@ -93,9 +93,9 @@ void GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_events(pmt: rx_message = message; channel_internal_queue.push(rx_message); } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -106,12 +106,12 @@ GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsCccwsrAmbiguous this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc index 932b015f8..2188e3183 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc @@ -71,7 +71,7 @@ class GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx : public gr: { private: friend GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(Concurrent_Queue& queue); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); explicit GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx(Concurrent_Queue& queue); Concurrent_Queue& channel_internal_queue; @@ -87,7 +87,7 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr GalileoE1Pcps } -void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { @@ -95,9 +95,9 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_ rx_message = message; channel_internal_queue.push(rx_message); } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -108,12 +108,12 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::GalileoE1PcpsQuic this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc index acaf020c8..b3319201e 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc @@ -66,7 +66,7 @@ class GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx : public gr::bloc { private: friend GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue& queue); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); explicit GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue& queue); Concurrent_Queue& channel_internal_queue; @@ -82,7 +82,7 @@ GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsTongA } -void GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { @@ -90,9 +90,9 @@ void GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_event rx_message = message; channel_internal_queue.push(rx_message); } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -103,12 +103,12 @@ GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsTongAmbig this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc index 853b567ae..3a3030617 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc @@ -62,7 +62,7 @@ class GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx : public gr::block { private: friend GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_make(Concurrent_Queue& queue); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); explicit GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx(Concurrent_Queue& queue); Concurrent_Queue& channel_internal_queue; @@ -78,7 +78,7 @@ GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr GalileoE5aPcpsAcquisi } -void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { @@ -86,9 +86,9 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_events(p rx_message = message; channel_internal_queue.push(rx_message); } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -99,12 +99,12 @@ GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::GalileoE5aPcpsAcquisition this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc index f9c44cdd7..72b6cb483 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc @@ -72,7 +72,7 @@ class GalileoE5bPcpsAcquisitionTest_msg_rx : public gr::block { private: friend GalileoE5bPcpsAcquisitionTest_msg_rx_sptr GalileoE5bPcpsAcquisitionTest_msg_rx_make(Concurrent_Queue& queue); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); explicit GalileoE5bPcpsAcquisitionTest_msg_rx(Concurrent_Queue& queue); Concurrent_Queue& channel_internal_queue; @@ -88,7 +88,7 @@ GalileoE5bPcpsAcquisitionTest_msg_rx_sptr GalileoE5bPcpsAcquisitionTest_msg_rx_m } -void GalileoE5bPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GalileoE5bPcpsAcquisitionTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { @@ -96,7 +96,7 @@ void GalileoE5bPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg) rx_message = message; channel_internal_queue.push(rx_message); } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { std::cout << "msg_handler_telemetry Bad any cast!" << std::endl; rx_message = 0; @@ -109,12 +109,12 @@ GalileoE5bPcpsAcquisitionTest_msg_rx::GalileoE5bPcpsAcquisitionTest_msg_rx(Concu this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](pmt::pmt_t&& PH1) { msg_handler_channel_events(PH1); }); #else #if BOOST_173_OR_GREATER - boost::bind(&GalileoE5bPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GalileoE5bPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GalileoE5bPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GalileoE5bPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc index 681648c60..d04aa7605 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc @@ -68,7 +68,7 @@ class GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx : public gr::block { private: friend GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_make(Concurrent_Queue& queue); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); explicit GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx(Concurrent_Queue& queue); Concurrent_Queue& channel_internal_queue; @@ -84,7 +84,7 @@ GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr GlonassL1CaPcpsAcquisitionGSo } -void GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { @@ -92,9 +92,9 @@ void GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_events(pmt::pmt_ rx_message = message; channel_internal_queue.push(rx_message); } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -105,12 +105,12 @@ GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::GlonassL1CaPcpsAcquisitionGSoC201 this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc index 28717401f..78728ed6b 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc @@ -62,7 +62,7 @@ class GlonassL1CaPcpsAcquisitionTest_msg_rx : public gr::block { private: friend GlonassL1CaPcpsAcquisitionTest_msg_rx_sptr GlonassL1CaPcpsAcquisitionTest_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); GlonassL1CaPcpsAcquisitionTest_msg_rx(); public: @@ -77,14 +77,14 @@ GlonassL1CaPcpsAcquisitionTest_msg_rx_sptr GlonassL1CaPcpsAcquisitionTest_msg_rx } -void GlonassL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GlonassL1CaPcpsAcquisitionTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { std::cout << "msg_handler_telemetry Bad any cast!\n"; rx_message = 0; @@ -97,12 +97,12 @@ GlonassL1CaPcpsAcquisitionTest_msg_rx::GlonassL1CaPcpsAcquisitionTest_msg_rx() : this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GlonassL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GlonassL1CaPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GlonassL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GlonassL1CaPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc index c14a43c09..e48e9432e 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc @@ -66,7 +66,7 @@ class GlonassL2CaPcpsAcquisitionTest_msg_rx : public gr::block { private: friend GlonassL2CaPcpsAcquisitionTest_msg_rx_sptr GlonassL2CaPcpsAcquisitionTest_msg_rx_make(concurrent_queue& queue); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); explicit GlonassL2CaPcpsAcquisitionTest_msg_rx(concurrent_queue& queue); concurrent_queue& channel_internal_queue; @@ -82,7 +82,7 @@ GlonassL2CaPcpsAcquisitionTest_msg_rx_sptr GlonassL2CaPcpsAcquisitionTest_msg_rx } -void GlonassL2CaPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GlonassL2CaPcpsAcquisitionTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { @@ -90,9 +90,9 @@ void GlonassL2CaPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg) rx_message = message; channel_internal_queue.push(rx_message); } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -103,12 +103,12 @@ GlonassL2CaPcpsAcquisitionTest_msg_rx::GlonassL2CaPcpsAcquisitionTest_msg_rx(con this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GlonassL2CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GlonassL2CaPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GlonassL2CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GlonassL2CaPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc index b9f366f16..c359ea580 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc @@ -69,7 +69,7 @@ class GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx : public gr::block { private: friend GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue& queue); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); explicit GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue& queue); Concurrent_Queue& channel_internal_queue; @@ -85,7 +85,7 @@ GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsAcquisitionGSoC2013Tes } -void GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { @@ -93,9 +93,9 @@ void GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pmt_t ms rx_message = message; channel_internal_queue.push(rx_message); } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -106,12 +106,12 @@ GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsAcquisitionGSoC2013Test_ms this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; 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 12f4c144d..1b690edfc 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 @@ -86,7 +86,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_channel_events(const pmt::pmt_t &msg); GpsL1CaPcpsAcquisitionTest_msg_rx(); public: @@ -101,16 +101,16 @@ 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_channel_events(const pmt::pmt_t &msg) { try { int64_t message = pmt::to_long(msg); rx_message = message; } - catch (boost::bad_any_cast &e) + catch (const boost::bad_any_cast &e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -121,12 +121,12 @@ GpsL1CaPcpsAcquisitionTest_msg_rx::GpsL1CaPcpsAcquisitionTest_msg_rx() : gr::blo this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto &&PH1) { msg_handler_events(PH1); }); + [this](auto &&PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc index d748eca1f..b29681951 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc @@ -64,7 +64,7 @@ class GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx : public gr::block { private: friend GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue& queue); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); explicit GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue& queue); Concurrent_Queue& channel_internal_queue; @@ -80,7 +80,7 @@ GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsOpenClAcquisitio } -void GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { @@ -88,9 +88,9 @@ void GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pm rx_message = message; channel_internal_queue.push(rx_message); } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -101,12 +101,12 @@ GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsOpenClAcquisitionGSo this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc index ab132f8e5..046db9394 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc @@ -68,7 +68,7 @@ class GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx : public gr::block { private: friend GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_make(Concurrent_Queue& queue); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); explicit GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx(Concurrent_Queue& queue); Concurrent_Queue& channel_internal_queue; @@ -84,7 +84,7 @@ GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr GpsL1CaPcpsQuickSyncAcqu } -void GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { @@ -92,9 +92,9 @@ void GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_events(pmt: rx_message = message; channel_internal_queue.push(rx_message); } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -105,12 +105,12 @@ GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::GpsL1CaPcpsQuickSyncAcquisit this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc index ba36bb896..6f50a4904 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc @@ -66,7 +66,7 @@ class GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx : public gr::block { private: friend GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue& queue); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); explicit GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue& queue); Concurrent_Queue& channel_internal_queue; @@ -82,7 +82,7 @@ GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsTongAcquisitionGSo } -void GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { @@ -90,9 +90,9 @@ void GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pmt_ rx_message = message; channel_internal_queue.push(rx_message); } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -103,12 +103,12 @@ GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsTongAcquisitionGSoC201 this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc index 8404e056b..6aab65a4a 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc @@ -81,7 +81,7 @@ class GpsL2MPcpsAcquisitionTest_msg_rx : public gr::block { private: friend GpsL2MPcpsAcquisitionTest_msg_rx_sptr GpsL2MPcpsAcquisitionTest_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); GpsL2MPcpsAcquisitionTest_msg_rx(); public: @@ -94,16 +94,16 @@ GpsL2MPcpsAcquisitionTest_msg_rx_sptr GpsL2MPcpsAcquisitionTest_msg_rx_make() return GpsL2MPcpsAcquisitionTest_msg_rx_sptr(new GpsL2MPcpsAcquisitionTest_msg_rx()); } -void GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } - catch (boost::bad_any_cast &e) + catch (const boost::bad_any_cast &e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -113,12 +113,12 @@ GpsL2MPcpsAcquisitionTest_msg_rx::GpsL2MPcpsAcquisitionTest_msg_rx() : gr::block this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto &&PH1) { msg_handler_events(PH1); }); + [this](auto &&PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc index 4c1be22fa..dabbde9ec 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc +++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc @@ -35,7 +35,7 @@ Acquisition_msg_rx_sptr Acquisition_msg_rx_make() } -void Acquisition_msg_rx::msg_handler_events(const pmt::pmt_t& msg) +void Acquisition_msg_rx::msg_handler_channel_events(const pmt::pmt_t& msg) { try { @@ -43,7 +43,7 @@ void Acquisition_msg_rx::msg_handler_events(const pmt::pmt_t& msg) rx_message = message; top_block->stop(); // stop the flowgraph } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { LOG(WARNING) << "msg_handler_acquisition Bad cast!\n"; rx_message = 0; @@ -56,12 +56,12 @@ Acquisition_msg_rx::Acquisition_msg_rx() : gr::block("Acquisition_msg_rx", gr::i this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&Acquisition_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&Acquisition_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&Acquisition_msg_rx::msg_handler_events, this, _1)); + boost::bind(&Acquisition_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h index 5ad8c6ba1..13fee5132 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h +++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h @@ -48,7 +48,7 @@ class Acquisition_msg_rx : public gr::block { private: friend Acquisition_msg_rx_sptr Acquisition_msg_rx_make(); - void msg_handler_events(const pmt::pmt_t& msg); + void msg_handler_channel_events(const pmt::pmt_t& msg); Acquisition_msg_rx(); public: diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc index b56a7a56d..d78518ba2 100644 --- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc @@ -105,7 +105,7 @@ class HybridObservablesTest_msg_rx : public gr::block { private: friend HybridObservablesTest_msg_rx_sptr HybridObservablesTest_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); HybridObservablesTest_msg_rx(); public: @@ -120,16 +120,16 @@ HybridObservablesTest_msg_rx_sptr HybridObservablesTest_msg_rx_make() } -void HybridObservablesTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void HybridObservablesTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -140,12 +140,12 @@ HybridObservablesTest_msg_rx::HybridObservablesTest_msg_rx() : gr::block("Hybrid this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&HybridObservablesTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&HybridObservablesTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&HybridObservablesTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&HybridObservablesTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; @@ -171,7 +171,7 @@ class HybridObservablesTest_tlm_msg_rx : public gr::block { private: friend HybridObservablesTest_tlm_msg_rx_sptr HybridObservablesTest_tlm_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); HybridObservablesTest_tlm_msg_rx(); public: @@ -186,16 +186,16 @@ HybridObservablesTest_tlm_msg_rx_sptr HybridObservablesTest_tlm_msg_rx_make() } -void HybridObservablesTest_tlm_msg_rx::msg_handler_events(pmt::pmt_t msg) +void HybridObservablesTest_tlm_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -206,12 +206,12 @@ HybridObservablesTest_tlm_msg_rx::HybridObservablesTest_tlm_msg_rx() : gr::block this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&HybridObservablesTest_tlm_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&HybridObservablesTest_tlm_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&HybridObservablesTest_tlm_msg_rx::msg_handler_events, this, _1)); + boost::bind(&HybridObservablesTest_tlm_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc index 97fcab298..7b7863eb9 100644 --- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc @@ -101,7 +101,7 @@ class HybridObservablesTest_msg_rx_Fpga : public gr::block { private: friend HybridObservablesTest_msg_rx_Fpga_sptr HybridObservablesTest_msg_rx_Fpga_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); HybridObservablesTest_msg_rx_Fpga(); public: @@ -116,16 +116,16 @@ HybridObservablesTest_msg_rx_Fpga_sptr HybridObservablesTest_msg_rx_Fpga_make() } -void HybridObservablesTest_msg_rx_Fpga::msg_handler_events(pmt::pmt_t msg) +void HybridObservablesTest_msg_rx_Fpga::msg_handler_channel_events(const pmt::pmt_t msg) { try { int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -136,12 +136,12 @@ HybridObservablesTest_msg_rx_Fpga::HybridObservablesTest_msg_rx_Fpga() : gr::blo this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&HybridObservablesTest_msg_rx_Fpga::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&HybridObservablesTest_msg_rx_Fpga::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&HybridObservablesTest_msg_rx_Fpga::msg_handler_events, this, _1)); + boost::bind(&HybridObservablesTest_msg_rx_Fpga::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; @@ -164,7 +164,7 @@ class HybridObservablesTest_tlm_msg_rx_Fpga : public gr::block { private: friend HybridObservablesTest_tlm_msg_rx_Fpga_sptr HybridObservablesTest_tlm_msg_rx_Fpga_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); HybridObservablesTest_tlm_msg_rx_Fpga(); public: @@ -179,16 +179,16 @@ HybridObservablesTest_tlm_msg_rx_Fpga_sptr HybridObservablesTest_tlm_msg_rx_Fpga } -void HybridObservablesTest_tlm_msg_rx_Fpga::msg_handler_events(pmt::pmt_t msg) +void HybridObservablesTest_tlm_msg_rx_Fpga::msg_handler_channel_events(const pmt::pmt_t msg) { try { int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -197,7 +197,7 @@ void HybridObservablesTest_tlm_msg_rx_Fpga::msg_handler_events(pmt::pmt_t msg) HybridObservablesTest_tlm_msg_rx_Fpga::HybridObservablesTest_tlm_msg_rx_Fpga() : gr::block("HybridObservablesTest_tlm_msg_rx_Fpga", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)) { this->message_port_register_in(pmt::mp("events")); - this->set_msg_handler(pmt::mp("events"), boost::bind(&HybridObservablesTest_tlm_msg_rx_Fpga::msg_handler_events, this, boost::placeholders::_1)); + this->set_msg_handler(pmt::mp("events"), boost::bind(&HybridObservablesTest_tlm_msg_rx_Fpga::msg_handler_channel_events, this, boost::placeholders::_1)); rx_message = 0; } diff --git a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc index 44f772957..d268aabe7 100644 --- a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc @@ -75,7 +75,7 @@ class GpsL1CADllPllTelemetryDecoderTest_msg_rx : public gr::block { private: friend GpsL1CADllPllTelemetryDecoderTest_msg_rx_sptr GpsL1CADllPllTelemetryDecoderTest_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); GpsL1CADllPllTelemetryDecoderTest_msg_rx(); public: @@ -88,16 +88,16 @@ GpsL1CADllPllTelemetryDecoderTest_msg_rx_sptr GpsL1CADllPllTelemetryDecoderTest_ return GpsL1CADllPllTelemetryDecoderTest_msg_rx_sptr(new GpsL1CADllPllTelemetryDecoderTest_msg_rx()); } -void GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -107,12 +107,12 @@ GpsL1CADllPllTelemetryDecoderTest_msg_rx::GpsL1CADllPllTelemetryDecoderTest_msg_ this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; @@ -135,7 +135,7 @@ class GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx : public gr::block { private: friend GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx_sptr GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx(); public: @@ -148,16 +148,16 @@ GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx_sptr GpsL1CADllPllTelemetryDecoderT return GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx_sptr(new GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx()); } -void GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -167,9 +167,9 @@ GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::GpsL1CADllPllTelemetryDecoderTest_ this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else - boost::bind(&GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc index 99d91d3a1..0ddb4cd72 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc @@ -54,7 +54,7 @@ class GlonassL1CaDllPllCAidTrackingTest_msg_rx : public gr::block { private: friend GlonassL1CaDllPllCAidTrackingTest_msg_rx_sptr GlonassL1CaDllPllCAidTrackingTest_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); GlonassL1CaDllPllCAidTrackingTest_msg_rx(); public: @@ -67,16 +67,16 @@ GlonassL1CaDllPllCAidTrackingTest_msg_rx_sptr GlonassL1CaDllPllCAidTrackingTest_ return GlonassL1CaDllPllCAidTrackingTest_msg_rx_sptr(new GlonassL1CaDllPllCAidTrackingTest_msg_rx()); } -void GlonassL1CaDllPllCAidTrackingTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GlonassL1CaDllPllCAidTrackingTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -86,12 +86,12 @@ GlonassL1CaDllPllCAidTrackingTest_msg_rx::GlonassL1CaDllPllCAidTrackingTest_msg_ this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GlonassL1CaDllPllCAidTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GlonassL1CaDllPllCAidTrackingTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GlonassL1CaDllPllCAidTrackingTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GlonassL1CaDllPllCAidTrackingTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc index e1de2336f..406ac52c2 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc @@ -61,7 +61,7 @@ class GlonassL1CaDllPllTrackingTest_msg_rx : public gr::block { private: friend GlonassL1CaDllPllTrackingTest_msg_rx_sptr GlonassL1CaDllPllTrackingTest_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); GlonassL1CaDllPllTrackingTest_msg_rx(); public: @@ -74,16 +74,16 @@ GlonassL1CaDllPllTrackingTest_msg_rx_sptr GlonassL1CaDllPllTrackingTest_msg_rx_m return GlonassL1CaDllPllTrackingTest_msg_rx_sptr(new GlonassL1CaDllPllTrackingTest_msg_rx()); } -void GlonassL1CaDllPllTrackingTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GlonassL1CaDllPllTrackingTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -93,12 +93,12 @@ GlonassL1CaDllPllTrackingTest_msg_rx::GlonassL1CaDllPllTrackingTest_msg_rx() : g this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GlonassL1CaDllPllTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GlonassL1CaDllPllTrackingTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GlonassL1CaDllPllTrackingTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GlonassL1CaDllPllTrackingTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc index b1849c090..0d09fa00a 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc @@ -88,7 +88,7 @@ class GpsL1CADllPllTrackingTest_msg_rx : public gr::block { private: friend GpsL1CADllPllTrackingTest_msg_rx_sptr GpsL1CADllPllTrackingTest_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); GpsL1CADllPllTrackingTest_msg_rx(); public: @@ -103,7 +103,7 @@ GpsL1CADllPllTrackingTest_msg_rx_sptr GpsL1CADllPllTrackingTest_msg_rx_make() } -void GpsL1CADllPllTrackingTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GpsL1CADllPllTrackingTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { @@ -111,9 +111,9 @@ void GpsL1CADllPllTrackingTest_msg_rx::msg_handler_events(pmt::pmt_t msg) rx_message = message; // 3 -> loss of lock // std::cout << "Received trk message: " << rx_message << '\n'; } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -124,12 +124,12 @@ GpsL1CADllPllTrackingTest_msg_rx::GpsL1CADllPllTrackingTest_msg_rx() : gr::block this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GpsL1CADllPllTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GpsL1CADllPllTrackingTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GpsL1CADllPllTrackingTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CADllPllTrackingTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc index a062ae9a1..642be7ebc 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc @@ -172,7 +172,7 @@ class GpsL1CADllPllTrackingTestFpga_msg_rx : public gr::block { private: friend GpsL1CADllPllTrackingTestFpga_msg_rx_sptr GpsL1CADllPllTrackingTestFpga_msg_rx_make(); - void msg_handler_events(const pmt::pmt_t &msg); + void msg_handler_channel_events(const pmt::pmt_t &msg); GpsL1CADllPllTrackingTestFpga_msg_rx(); public: @@ -188,16 +188,16 @@ GpsL1CADllPllTrackingTestFpga_msg_rx_sptr GpsL1CADllPllTrackingTestFpga_msg_rx_m } -void GpsL1CADllPllTrackingTestFpga_msg_rx::msg_handler_events(const pmt::pmt_t &msg) +void GpsL1CADllPllTrackingTestFpga_msg_rx::msg_handler_channel_events(const pmt::pmt_t &msg) { try { int64_t message = pmt::to_long(msg); rx_message = message; } - catch (boost::bad_any_cast &e) + catch (const boost::bad_any_cast &e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -210,12 +210,12 @@ GpsL1CADllPllTrackingTestFpga_msg_rx::GpsL1CADllPllTrackingTestFpga_msg_rx() : g this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto &&PH1) { msg_handler_events(PH1); }); + [this](auto &&PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GpsL1CADllPllTrackingTestFpga_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GpsL1CADllPllTrackingTestFpga_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GpsL1CADllPllTrackingTestFpga_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CADllPllTrackingTestFpga_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc index 44b596b45..dfa7d5c2f 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc @@ -90,7 +90,7 @@ class GpsL1CAKfTrackingTest_msg_rx : public gr::block { private: friend GpsL1CAKfTrackingTest_msg_rx_sptr GpsL1CAKfTrackingTest_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); GpsL1CAKfTrackingTest_msg_rx(); public: @@ -105,16 +105,16 @@ GpsL1CAKfTrackingTest_msg_rx_sptr GpsL1CAKfTrackingTest_msg_rx_make() } -void GpsL1CAKfTrackingTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GpsL1CAKfTrackingTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { long int message = pmt::to_long(std::move(msg)); rx_message = message; } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -125,12 +125,12 @@ GpsL1CAKfTrackingTest_msg_rx::GpsL1CAKfTrackingTest_msg_rx() : gr::block("GpsL1C this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GpsL1CAKfTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GpsL1CAKfTrackingTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GpsL1CAKfTrackingTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CAKfTrackingTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc index 29d99ead3..744098257 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc @@ -65,7 +65,7 @@ class GpsL2MDllPllTrackingTest_msg_rx : public gr::block { private: friend GpsL2MDllPllTrackingTest_msg_rx_sptr GpsL2MDllPllTrackingTest_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); GpsL2MDllPllTrackingTest_msg_rx(); public: @@ -80,16 +80,16 @@ GpsL2MDllPllTrackingTest_msg_rx_sptr GpsL2MDllPllTrackingTest_msg_rx_make() } -void GpsL2MDllPllTrackingTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void GpsL2MDllPllTrackingTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; + LOG(WARNING) << "msg_handler_channel_events Bad any_cast: " << e.what(); rx_message = 0; } } @@ -100,12 +100,12 @@ GpsL2MDllPllTrackingTest_msg_rx::GpsL2MDllPllTrackingTest_msg_rx() : gr::block(" this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&GpsL2MDllPllTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&GpsL2MDllPllTrackingTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&GpsL2MDllPllTrackingTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL2MDllPllTrackingTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc index 6e9d73fe3..f93afec3e 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc @@ -104,7 +104,7 @@ class TrackingPullInTest_msg_rx : public gr::block { private: friend TrackingPullInTest_msg_rx_sptr TrackingPullInTest_msg_rx_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); TrackingPullInTest_msg_rx(); public: @@ -119,7 +119,7 @@ TrackingPullInTest_msg_rx_sptr TrackingPullInTest_msg_rx_make() } -void TrackingPullInTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +void TrackingPullInTest_msg_rx::msg_handler_channel_events(const pmt::pmt_t msg) { try { @@ -127,7 +127,7 @@ void TrackingPullInTest_msg_rx::msg_handler_events(pmt::pmt_t msg) rx_message = message; // 3 -> loss of lock // std::cout << "Received trk message: " << rx_message << '\n'; } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { LOG(WARNING) << "msg_handler_tracking Bad cast!"; rx_message = 0; @@ -140,12 +140,12 @@ TrackingPullInTest_msg_rx::TrackingPullInTest_msg_rx() : gr::block("TrackingPull this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&TrackingPullInTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&TrackingPullInTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&TrackingPullInTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&TrackingPullInTest_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc index 8745f5292..e1107919c 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc @@ -103,7 +103,7 @@ class TrackingPullInTest_msg_rx_Fpga : public gr::block { private: friend TrackingPullInTest_msg_rx_Fpga_sptr TrackingPullInTest_msg_rx_Fpga_make(); - void msg_handler_events(pmt::pmt_t msg); + void msg_handler_channel_events(const pmt::pmt_t msg); TrackingPullInTest_msg_rx_Fpga(); public: @@ -118,14 +118,14 @@ TrackingPullInTest_msg_rx_Fpga_sptr TrackingPullInTest_msg_rx_Fpga_make() } -void TrackingPullInTest_msg_rx_Fpga::msg_handler_events(pmt::pmt_t msg) +void TrackingPullInTest_msg_rx_Fpga::msg_handler_channel_events(const pmt::pmt_t msg) { try { int64_t message = pmt::to_long(std::move(msg)); rx_message = message; // 3 -> loss of lock } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { LOG(WARNING) << "msg_handler_tracking Bad cast!"; rx_message = 0; @@ -138,12 +138,12 @@ TrackingPullInTest_msg_rx_Fpga::TrackingPullInTest_msg_rx_Fpga() : gr::block("Tr this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&TrackingPullInTest_msg_rx_Fpga::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&TrackingPullInTest_msg_rx_Fpga::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&TrackingPullInTest_msg_rx_Fpga::msg_handler_events, this, _1)); + boost::bind(&TrackingPullInTest_msg_rx_Fpga::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0; diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc index d87a59a38..27c44dd85 100644 --- a/src/utils/front-end-cal/main.cc +++ b/src/utils/front-end-cal/main.cc @@ -112,7 +112,7 @@ class FrontEndCal_msg_rx : public gr::block { private: friend FrontEndCal_msg_rx_sptr FrontEndCal_msg_rx_make(); - void msg_handler_events(const pmt::pmt_t& msg); + void msg_handler_channel_events(const pmt::pmt_t& msg); FrontEndCal_msg_rx(); public: @@ -126,7 +126,7 @@ FrontEndCal_msg_rx_sptr FrontEndCal_msg_rx_make() } -void FrontEndCal_msg_rx::msg_handler_events(const pmt::pmt_t& msg) +void FrontEndCal_msg_rx::msg_handler_channel_events(const pmt::pmt_t& msg) { try { @@ -134,7 +134,7 @@ void FrontEndCal_msg_rx::msg_handler_events(const pmt::pmt_t& msg) rx_message = message; channel_internal_queue.push(rx_message); } - catch (boost::bad_any_cast& e) + catch (const boost::bad_any_cast& e) { LOG(WARNING) << "msg_handler_telemetry Bad any cast!\n"; rx_message = 0; @@ -147,12 +147,12 @@ FrontEndCal_msg_rx::FrontEndCal_msg_rx() : gr::block("FrontEndCal_msg_rx", gr::i this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](auto&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_channel_events(PH1); }); #else #if USE_BOOST_BIND_PLACEHOLDERS - boost::bind(&FrontEndCal_msg_rx::msg_handler_events, this, boost::placeholders::_1)); + boost::bind(&FrontEndCal_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1)); #else - boost::bind(&FrontEndCal_msg_rx::msg_handler_events, this, _1)); + boost::bind(&FrontEndCal_msg_rx::msg_handler_channel_events, this, _1)); #endif #endif rx_message = 0;