mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2026-09-29 12:21:51 +00:00
Add debug internal logging for destructors. Sort destructor order
This commit is contained in:
@@ -195,6 +195,7 @@ void ControlThread::init()
|
||||
|
||||
ControlThread::~ControlThread() // NOLINT(modernize-use-equals-default)
|
||||
{
|
||||
DLOG(INFO) << "Control Thread destructor called";
|
||||
if (msqid_ != -1)
|
||||
{
|
||||
msgctl(msqid_, IPC_RMID, nullptr);
|
||||
|
||||
@@ -147,6 +147,10 @@ private:
|
||||
void keyboard_listener();
|
||||
void sysv_queue_listener();
|
||||
|
||||
std::shared_ptr<ConfigurationInterface> configuration_;
|
||||
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> control_queue_;
|
||||
std::shared_ptr<GNSSFlowgraph> flowgraph_;
|
||||
|
||||
std::thread cmd_interface_thread_;
|
||||
std::thread keyboard_thread_;
|
||||
std::thread sysv_queue_thread_;
|
||||
@@ -156,10 +160,6 @@ private:
|
||||
boost::thread fpga_helper_thread_;
|
||||
#endif
|
||||
|
||||
std::shared_ptr<GNSSFlowgraph> flowgraph_;
|
||||
std::shared_ptr<ConfigurationInterface> configuration_;
|
||||
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> control_queue_;
|
||||
|
||||
// default filename for assistance data
|
||||
const std::string eph_default_xml_filename_ = "./gps_ephemeris.xml";
|
||||
const std::string utc_default_xml_filename_ = "./gps_utc_model.xml";
|
||||
|
||||
@@ -81,6 +81,7 @@ GNSSFlowgraph::GNSSFlowgraph(std::shared_ptr<ConfigurationInterface> configurati
|
||||
|
||||
GNSSFlowgraph::~GNSSFlowgraph()
|
||||
{
|
||||
DLOG(INFO) << "GNSSFlowgraph destructor called";
|
||||
if (connected_)
|
||||
{
|
||||
GNSSFlowgraph::disconnect();
|
||||
|
||||
@@ -176,10 +176,27 @@ private:
|
||||
|
||||
std::vector<std::string> split_string(const std::string& s, char delim);
|
||||
|
||||
gr::top_block_sptr top_block_;
|
||||
|
||||
std::shared_ptr<ConfigurationInterface> configuration_;
|
||||
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
|
||||
|
||||
std::vector<std::shared_ptr<GNSSBlockInterface>> sig_source_;
|
||||
std::vector<std::shared_ptr<GNSSBlockInterface>> sig_conditioner_;
|
||||
std::vector<gr::blocks::null_sink::sptr> null_sinks_;
|
||||
std::vector<std::shared_ptr<ChannelInterface>> channels_;
|
||||
std::shared_ptr<GNSSBlockInterface> observables_;
|
||||
std::shared_ptr<GNSSBlockInterface> pvt_;
|
||||
|
||||
std::map<std::string, gr::basic_block_sptr> acq_resamplers_;
|
||||
std::vector<gr::blocks::null_sink::sptr> null_sinks_;
|
||||
|
||||
gr::basic_block_sptr GnssSynchroMonitor_;
|
||||
channel_status_msg_receiver_sptr channels_status_; // class that receives and stores the current status of the receiver channels
|
||||
gnss_sdr_sample_counter_sptr ch_out_sample_counter_;
|
||||
#if ENABLE_FPGA
|
||||
gnss_sdr_fpga_sample_counter_sptr ch_out_fpga_sample_counter_;
|
||||
#endif
|
||||
|
||||
std::vector<unsigned int> channels_state_;
|
||||
|
||||
std::list<Gnss_Signal> available_GPS_1C_signals_;
|
||||
@@ -207,20 +224,6 @@ private:
|
||||
evBDS_B3
|
||||
};
|
||||
std::map<std::string, StringValue> mapStringValues_;
|
||||
std::map<std::string, gr::basic_block_sptr> acq_resamplers_;
|
||||
|
||||
std::shared_ptr<ConfigurationInterface> configuration_;
|
||||
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
|
||||
std::shared_ptr<GNSSBlockInterface> observables_;
|
||||
std::shared_ptr<GNSSBlockInterface> pvt_;
|
||||
|
||||
gr::top_block_sptr top_block_;
|
||||
gr::basic_block_sptr GnssSynchroMonitor_;
|
||||
channel_status_msg_receiver_sptr channels_status_; // class that receives and stores the current status of the receiver channels
|
||||
gnss_sdr_sample_counter_sptr ch_out_sample_counter_;
|
||||
#if ENABLE_FPGA
|
||||
gnss_sdr_fpga_sample_counter_sptr ch_out_fpga_sample_counter_;
|
||||
#endif
|
||||
|
||||
std::string config_file_;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user