mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-09-10 06:46:03 +00:00
Migrate msg_queue boost smart pointers to gr sptr
This commit is contained in:
@@ -40,7 +40,7 @@ using google::LogMessage;
|
|||||||
Channel::Channel(ConfigurationInterface *configuration, unsigned int channel,
|
Channel::Channel(ConfigurationInterface *configuration, unsigned int channel,
|
||||||
std::shared_ptr<GNSSBlockInterface> pass_through, std::shared_ptr<AcquisitionInterface> acq,
|
std::shared_ptr<GNSSBlockInterface> pass_through, std::shared_ptr<AcquisitionInterface> acq,
|
||||||
std::shared_ptr<TrackingInterface> trk, std::shared_ptr<TelemetryDecoderInterface> nav,
|
std::shared_ptr<TrackingInterface> trk, std::shared_ptr<TelemetryDecoderInterface> nav,
|
||||||
std::string role, std::string implementation, boost::shared_ptr<gr::msg_queue> queue)
|
std::string role, std::string implementation, gr::msg_queue::sptr queue)
|
||||||
{
|
{
|
||||||
pass_through_ = pass_through;
|
pass_through_ = pass_through;
|
||||||
acq_ = acq;
|
acq_ = acq;
|
||||||
|
@@ -105,7 +105,7 @@ private:
|
|||||||
bool connected_;
|
bool connected_;
|
||||||
bool repeat_;
|
bool repeat_;
|
||||||
ChannelFsm channel_fsm_;
|
ChannelFsm channel_fsm_;
|
||||||
boost::shared_ptr<gr::msg_queue> queue_;
|
gr::msg_queue::sptr queue_;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*GNSS_SDR_CHANNEL_H_*/
|
#endif /*GNSS_SDR_CHANNEL_H_*/
|
||||||
|
@@ -194,7 +194,7 @@ void ChannelFsm::set_tracking(std::shared_ptr<TrackingInterface> tracking)
|
|||||||
trk_ = tracking;
|
trk_ = tracking;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ChannelFsm::set_queue(boost::shared_ptr<gr::msg_queue> queue)
|
void ChannelFsm::set_queue(gr::msg_queue::sptr queue)
|
||||||
{
|
{
|
||||||
queue_ = queue;
|
queue_ = queue;
|
||||||
}
|
}
|
||||||
|
@@ -59,7 +59,7 @@ public:
|
|||||||
|
|
||||||
void set_acquisition(std::shared_ptr<AcquisitionInterface> acquisition);
|
void set_acquisition(std::shared_ptr<AcquisitionInterface> acquisition);
|
||||||
void set_tracking(std::shared_ptr<TrackingInterface> tracking);
|
void set_tracking(std::shared_ptr<TrackingInterface> tracking);
|
||||||
void set_queue(boost::shared_ptr<gr::msg_queue> queue);
|
void set_queue(gr::msg_queue::sptr queue);
|
||||||
void set_channel(unsigned int channel);
|
void set_channel(unsigned int channel);
|
||||||
void start_acquisition();
|
void start_acquisition();
|
||||||
void start_tracking();
|
void start_tracking();
|
||||||
@@ -77,7 +77,7 @@ public:
|
|||||||
private:
|
private:
|
||||||
std::shared_ptr<AcquisitionInterface> acq_;
|
std::shared_ptr<AcquisitionInterface> acq_;
|
||||||
std::shared_ptr<TrackingInterface> trk_;
|
std::shared_ptr<TrackingInterface> trk_;
|
||||||
boost::shared_ptr<gr::msg_queue> queue_;
|
gr::msg_queue::sptr queue_;
|
||||||
unsigned int channel_;
|
unsigned int channel_;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -44,18 +44,18 @@ ControlMessageFactory::~ControlMessageFactory()
|
|||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
||||||
boost::shared_ptr<gr::message> ControlMessageFactory::GetQueueMessage(unsigned int who, unsigned int what)
|
gr::message::sptr ControlMessageFactory::GetQueueMessage(unsigned int who, unsigned int what)
|
||||||
{
|
{
|
||||||
std::shared_ptr<ControlMessage> control_message = std::make_shared<ControlMessage>();
|
std::shared_ptr<ControlMessage> control_message = std::make_shared<ControlMessage>();
|
||||||
control_message->who = who;
|
control_message->who = who;
|
||||||
control_message->what = what;
|
control_message->what = what;
|
||||||
boost::shared_ptr<gr::message> queue_message = gr::message::make(0, 0, 0, sizeof(ControlMessage));
|
gr::message::sptr queue_message = gr::message::make(0, 0, 0, sizeof(ControlMessage));
|
||||||
memcpy(queue_message->msg(), control_message.get(), sizeof(ControlMessage));
|
memcpy(queue_message->msg(), control_message.get(), sizeof(ControlMessage));
|
||||||
return queue_message;
|
return queue_message;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
std::shared_ptr<std::vector<std::shared_ptr<ControlMessage>>> ControlMessageFactory::GetControlMessages(boost::shared_ptr<gr::message> queue_message)
|
std::shared_ptr<std::vector<std::shared_ptr<ControlMessage>>> ControlMessageFactory::GetControlMessages(gr::message::sptr queue_message)
|
||||||
{
|
{
|
||||||
std::shared_ptr<std::vector<std::shared_ptr<ControlMessage>>> control_messages = std::make_shared<std::vector<std::shared_ptr<ControlMessage>>>();
|
std::shared_ptr<std::vector<std::shared_ptr<ControlMessage>>> control_messages = std::make_shared<std::vector<std::shared_ptr<ControlMessage>>>();
|
||||||
unsigned int control_messages_count = queue_message->length() / sizeof(ControlMessage);
|
unsigned int control_messages_count = queue_message->length() / sizeof(ControlMessage);
|
||||||
|
@@ -58,7 +58,7 @@ public:
|
|||||||
//! Virtual destructor
|
//! Virtual destructor
|
||||||
virtual ~ControlMessageFactory();
|
virtual ~ControlMessageFactory();
|
||||||
|
|
||||||
boost::shared_ptr<gr::message> GetQueueMessage(unsigned int who, unsigned int what);
|
gr::message::sptr GetQueueMessage(unsigned int who, unsigned int what);
|
||||||
std::shared_ptr<std::vector<std::shared_ptr<ControlMessage>>> GetControlMessages(gr::message::sptr queue_message);
|
std::shared_ptr<std::vector<std::shared_ptr<ControlMessage>>> GetControlMessages(gr::message::sptr queue_message);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -158,7 +158,7 @@ void ControlThread::run()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ControlThread::set_control_queue(boost::shared_ptr<gr::msg_queue> control_queue)
|
void ControlThread::set_control_queue(gr::msg_queue::sptr control_queue)
|
||||||
{
|
{
|
||||||
if (flowgraph_->running())
|
if (flowgraph_->running())
|
||||||
{
|
{
|
||||||
@@ -445,7 +445,7 @@ void ControlThread::init()
|
|||||||
void ControlThread::read_control_messages()
|
void ControlThread::read_control_messages()
|
||||||
{
|
{
|
||||||
DLOG(INFO) << "Reading control messages from queue";
|
DLOG(INFO) << "Reading control messages from queue";
|
||||||
boost::shared_ptr<gr::message> queue_message = control_queue_->delete_head();
|
gr::message::sptr queue_message = control_queue_->delete_head();
|
||||||
if (queue_message != 0)
|
if (queue_message != 0)
|
||||||
{
|
{
|
||||||
control_messages_ = control_message_factory_->GetControlMessages(queue_message);
|
control_messages_ = control_message_factory_->GetControlMessages(queue_message);
|
||||||
|
@@ -89,7 +89,7 @@ public:
|
|||||||
*
|
*
|
||||||
* \param[in] boost::shared_ptr<gr::msg_queue> control_queue
|
* \param[in] boost::shared_ptr<gr::msg_queue> control_queue
|
||||||
*/
|
*/
|
||||||
void set_control_queue(boost::shared_ptr<gr::msg_queue> control_queue);
|
void set_control_queue(gr::msg_queue::sptr control_queue);
|
||||||
|
|
||||||
|
|
||||||
unsigned int processed_control_messages()
|
unsigned int processed_control_messages()
|
||||||
@@ -146,7 +146,7 @@ private:
|
|||||||
void apply_action(unsigned int what);
|
void apply_action(unsigned int what);
|
||||||
std::shared_ptr<GNSSFlowgraph> flowgraph_;
|
std::shared_ptr<GNSSFlowgraph> flowgraph_;
|
||||||
std::shared_ptr<ConfigurationInterface> configuration_;
|
std::shared_ptr<ConfigurationInterface> configuration_;
|
||||||
boost::shared_ptr<gr::msg_queue> control_queue_;
|
gr::msg_queue::sptr control_queue_;
|
||||||
std::shared_ptr<ControlMessageFactory> control_message_factory_;
|
std::shared_ptr<ControlMessageFactory> control_message_factory_;
|
||||||
std::shared_ptr<std::vector<std::shared_ptr<ControlMessage>>> control_messages_;
|
std::shared_ptr<std::vector<std::shared_ptr<ControlMessage>>> control_messages_;
|
||||||
bool stop_;
|
bool stop_;
|
||||||
|
@@ -51,8 +51,7 @@
|
|||||||
|
|
||||||
using google::LogMessage;
|
using google::LogMessage;
|
||||||
|
|
||||||
GNSSFlowgraph::GNSSFlowgraph(std::shared_ptr<ConfigurationInterface> configuration,
|
GNSSFlowgraph::GNSSFlowgraph(std::shared_ptr<ConfigurationInterface> configuration, gr::msg_queue::sptr queue)
|
||||||
boost::shared_ptr<gr::msg_queue> queue)
|
|
||||||
{
|
{
|
||||||
connected_ = false;
|
connected_ = false;
|
||||||
running_ = false;
|
running_ = false;
|
||||||
|
@@ -139,7 +139,7 @@ private:
|
|||||||
std::vector<std::shared_ptr<ChannelInterface>> channels_;
|
std::vector<std::shared_ptr<ChannelInterface>> channels_;
|
||||||
gnss_sdr_sample_counter_sptr ch_out_sample_counter;
|
gnss_sdr_sample_counter_sptr ch_out_sample_counter;
|
||||||
gr::top_block_sptr top_block_;
|
gr::top_block_sptr top_block_;
|
||||||
boost::shared_ptr<gr::msg_queue> queue_;
|
gr::msg_queue::sptr queue_;
|
||||||
std::list<Gnss_Signal> available_GNSS_signals_;
|
std::list<Gnss_Signal> available_GNSS_signals_;
|
||||||
std::vector<unsigned int> channels_state_;
|
std::vector<unsigned int> channels_state_;
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user