Removing unused queues in PVT

src/algorithms/PVT/adapters/galileo_e1_pvt.cc

@@ -41,12 +41,10 @@ using google::LogMessage;
 GalileoE1Pvt::GalileoE1Pvt(ConfigurationInterface* configuration,
         std::string role,
         unsigned int in_streams,
-        unsigned int out_streams,
+        unsigned int out_streams) :
-        boost::shared_ptr<gr::msg_queue> queue) :
                 role_(role),
                 in_streams_(in_streams),
-                out_streams_(out_streams),
+                out_streams_(out_streams)
-                queue_(queue)
 {
     // dump parameters
     std::string default_dump_filename = "./pvt.dat";
@@ -82,7 +80,7 @@ GalileoE1Pvt::GalileoE1Pvt(ConfigurationInterface* configuration,
     bool flag_rtcm_server;
     flag_rtcm_server = configuration->property(role + ".flag_rtcm_server", false);
     // make PVT object
-    pvt_ = galileo_e1_make_pvt_cc(in_streams_, queue_, dump_, dump_filename_, averaging_depth, flag_averaging, output_rate_ms, display_rate_ms, flag_nmea_tty_port, nmea_dump_filename, nmea_dump_devname, flag_rtcm_server, flag_rtcm_tty_port, rtcm_dump_devname);
+    pvt_ = galileo_e1_make_pvt_cc(in_streams_, dump_, dump_filename_, averaging_depth, flag_averaging, output_rate_ms, display_rate_ms, flag_nmea_tty_port, nmea_dump_filename, nmea_dump_devname, flag_rtcm_server, flag_rtcm_tty_port, rtcm_dump_devname);
     DLOG(INFO) << "pvt(" << pvt_->unique_id() << ")";
 }
 

src/algorithms/PVT/adapters/galileo_e1_pvt.h

@@ -35,7 +35,6 @@
 #define GNSS_SDR_GALILEO_E1_PVT_H_
 
 #include <string>
-#include <gnuradio/msg_queue.h>
 #include "pvt_interface.h"
 #include "galileo_e1_pvt_cc.h"
 
@@ -51,8 +50,7 @@ public:
     GalileoE1Pvt(ConfigurationInterface* configuration,
             std::string role,
             unsigned int in_streams,
-            unsigned int out_streams,
+            unsigned int out_streams);
-            boost::shared_ptr<gr::msg_queue> queue);
 
     virtual ~GalileoE1Pvt();
 
@@ -91,7 +89,6 @@ private:
     std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;
-    boost::shared_ptr<gr::msg_queue> queue_;
 };
 
 #endif

src/algorithms/PVT/adapters/gps_l1_ca_pvt.cc

@@ -40,12 +40,10 @@ using google::LogMessage;
 GpsL1CaPvt::GpsL1CaPvt(ConfigurationInterface* configuration,
         std::string role,
         unsigned int in_streams,
-        unsigned int out_streams,
+        unsigned int out_streams) :
-        boost::shared_ptr<gr::msg_queue> queue) :
                 role_(role),
                 in_streams_(in_streams),
-                out_streams_(out_streams),
+                out_streams_(out_streams)
-                queue_(queue)
 {
     // dump parameters
     std::string default_dump_filename = "./pvt.dat";
@@ -82,7 +80,7 @@ GpsL1CaPvt::GpsL1CaPvt(ConfigurationInterface* configuration,
     flag_rtcm_server = configuration->property(role + ".flag_rtcm_server", false);
 
     // make PVT object
-    pvt_ = gps_l1_ca_make_pvt_cc(in_streams_, queue_, dump_, dump_filename_, averaging_depth, flag_averaging, output_rate_ms, display_rate_ms, flag_nmea_tty_port, nmea_dump_filename, nmea_dump_devname, flag_rtcm_server, flag_rtcm_tty_port, rtcm_dump_devname );
+    pvt_ = gps_l1_ca_make_pvt_cc(in_streams_, dump_, dump_filename_, averaging_depth, flag_averaging, output_rate_ms, display_rate_ms, flag_nmea_tty_port, nmea_dump_filename, nmea_dump_devname, flag_rtcm_server, flag_rtcm_tty_port, rtcm_dump_devname );
     DLOG(INFO) << "pvt(" << pvt_->unique_id() << ")";
 }
 

src/algorithms/PVT/adapters/gps_l1_ca_pvt.h

@@ -37,7 +37,6 @@
 #define GNSS_SDR_GPS_L1_CA_PVT_H_
 
 #include <string>
-#include <gnuradio/msg_queue.h>
 #include "pvt_interface.h"
 #include "gps_l1_ca_pvt_cc.h"
 
@@ -53,8 +52,7 @@ public:
     GpsL1CaPvt(ConfigurationInterface* configuration,
             std::string role,
             unsigned int in_streams,
-            unsigned int out_streams,
+            unsigned int out_streams);
-            boost::shared_ptr<gr::msg_queue> queue);
 
     virtual ~GpsL1CaPvt();
 
@@ -92,7 +90,6 @@ private:
     std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;
-    boost::shared_ptr<gr::msg_queue> queue_;
 };
 
 #endif

src/algorithms/PVT/adapters/hybrid_pvt.cc

@@ -41,12 +41,10 @@ using google::LogMessage;
 HybridPvt::HybridPvt(ConfigurationInterface* configuration,
         std::string role,
         unsigned int in_streams,
-        unsigned int out_streams,
+        unsigned int out_streams) :
-        boost::shared_ptr<gr::msg_queue> queue) :
                 role_(role),
                 in_streams_(in_streams),
-                out_streams_(out_streams),
+                out_streams_(out_streams)
-                queue_(queue)
 {
     // dump parameters
     std::string default_dump_filename = "./pvt.dat";
@@ -82,7 +80,7 @@ HybridPvt::HybridPvt(ConfigurationInterface* configuration,
     bool flag_rtcm_server;
     flag_rtcm_server = configuration->property(role + ".flag_rtcm_server", false);
     // make PVT object
-    pvt_ = hybrid_make_pvt_cc(in_streams_, queue_, dump_, dump_filename_, averaging_depth, flag_averaging, output_rate_ms, display_rate_ms, flag_nmea_tty_port, nmea_dump_filename, nmea_dump_devname, flag_rtcm_server, flag_rtcm_tty_port, rtcm_dump_devname);
+    pvt_ = hybrid_make_pvt_cc(in_streams_, dump_, dump_filename_, averaging_depth, flag_averaging, output_rate_ms, display_rate_ms, flag_nmea_tty_port, nmea_dump_filename, nmea_dump_devname, flag_rtcm_server, flag_rtcm_tty_port, rtcm_dump_devname);
     DLOG(INFO) << "pvt(" << pvt_->unique_id() << ")";
 }
 

src/algorithms/PVT/adapters/hybrid_pvt.h

@@ -35,7 +35,6 @@
 #define GNSS_SDR_HYBRID_PVT_H_
 
 #include <string>
-#include <gnuradio/msg_queue.h>
 #include "pvt_interface.h"
 #include "hybrid_pvt_cc.h"
 
@@ -51,8 +50,7 @@ public:
     HybridPvt(ConfigurationInterface* configuration,
             std::string role,
             unsigned int in_streams,
-            unsigned int out_streams,
+            unsigned int out_streams);
-            boost::shared_ptr<gr::msg_queue> queue);
 
     virtual ~HybridPvt();
 
@@ -90,7 +88,6 @@ private:
     std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;
-    boost::shared_ptr<gr::msg_queue> queue_;
 };
 
 #endif

src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc

@@ -41,9 +41,9 @@
 using google::LogMessage;
 
 galileo_e1_pvt_cc_sptr
-galileo_e1_make_pvt_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int averaging_depth, bool flag_averaging, int output_rate_ms, int display_rate_ms, bool flag_nmea_tty_port, std::string nmea_dump_filename, std::string nmea_dump_devname, bool flag_rtcm_server, bool flag_rtcm_tty_port, std::string rtcm_dump_devname)
+galileo_e1_make_pvt_cc(unsigned int nchannels, bool dump, std::string dump_filename, int averaging_depth, bool flag_averaging, int output_rate_ms, int display_rate_ms, bool flag_nmea_tty_port, std::string nmea_dump_filename, std::string nmea_dump_devname, bool flag_rtcm_server, bool flag_rtcm_tty_port, std::string rtcm_dump_devname)
 {
-    return galileo_e1_pvt_cc_sptr(new galileo_e1_pvt_cc(nchannels, queue, dump, dump_filename, averaging_depth, flag_averaging, output_rate_ms, display_rate_ms, flag_nmea_tty_port, nmea_dump_filename, nmea_dump_devname, flag_rtcm_server, flag_rtcm_tty_port, rtcm_dump_devname));
+    return galileo_e1_pvt_cc_sptr(new galileo_e1_pvt_cc(nchannels, dump, dump_filename, averaging_depth, flag_averaging, output_rate_ms, display_rate_ms, flag_nmea_tty_port, nmea_dump_filename, nmea_dump_devname, flag_rtcm_server, flag_rtcm_tty_port, rtcm_dump_devname));
 }
 
 
@@ -93,14 +93,13 @@ void galileo_e1_pvt_cc::msg_handler_telemetry(pmt::pmt_t msg)
         LOG(WARNING) << "msg_handler_telemetry Bad any cast!\n";
      }
 }
-galileo_e1_pvt_cc::galileo_e1_pvt_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int averaging_depth, bool flag_averaging, int output_rate_ms, int display_rate_ms, bool flag_nmea_tty_port, std::string nmea_dump_filename, std::string nmea_dump_devname, bool flag_rtcm_server, bool flag_rtcm_tty_port, std::string rtcm_dump_devname) :
+galileo_e1_pvt_cc::galileo_e1_pvt_cc(unsigned int nchannels, bool dump, std::string dump_filename, int averaging_depth, bool flag_averaging, int output_rate_ms, int display_rate_ms, bool flag_nmea_tty_port, std::string nmea_dump_filename, std::string nmea_dump_devname, bool flag_rtcm_server, bool flag_rtcm_tty_port, std::string rtcm_dump_devname) :
 		                		                gr::block("galileo_e1_pvt_cc", gr::io_signature::make(nchannels, nchannels,  sizeof(Gnss_Synchro)),
 		                		                        gr::io_signature::make(0, 0, sizeof(gr_complex)))
 {
 
     d_output_rate_ms = output_rate_ms;
     d_display_rate_ms = display_rate_ms;
-    d_queue = queue;
     d_dump = dump;
     d_nchannels = nchannels;
     d_dump_filename = dump_filename;

src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.h

@@ -35,7 +35,6 @@
 #include <string>
 #include <utility>
 #include <gnuradio/block.h>
-#include <gnuradio/msg_queue.h>
 #include "nmea_printer.h"
 #include "kml_printer.h"
 #include "rinex_printer.h"
@@ -49,7 +48,6 @@ class galileo_e1_pvt_cc;
 typedef boost::shared_ptr<galileo_e1_pvt_cc> galileo_e1_pvt_cc_sptr;
 
 galileo_e1_pvt_cc_sptr galileo_e1_make_pvt_cc(unsigned int n_channels,
-                                              boost::shared_ptr<gr::msg_queue> queue,
                                               bool dump,
                                               std::string dump_filename,
                                               int averaging_depth,
@@ -70,7 +68,6 @@ class galileo_e1_pvt_cc : public gr::block
 {
 private:
     friend galileo_e1_pvt_cc_sptr galileo_e1_make_pvt_cc(unsigned int nchannels,
-                                                         boost::shared_ptr<gr::msg_queue> queue,
                                                          bool dump,
                                                          std::string dump_filename,
                                                          int averaging_depth,
@@ -84,7 +81,6 @@ private:
                                                          bool flag_rtcm_tty_port,
                                                          std::string rtcm_dump_devname);
     galileo_e1_pvt_cc(unsigned int nchannels,
-                      boost::shared_ptr<gr::msg_queue> queue,
                       bool dump, std::string dump_filename,
                       int averaging_depth,
                       bool flag_averaging,
@@ -99,7 +95,6 @@ private:
 
     void msg_handler_telemetry(pmt::pmt_t msg);
 
-    boost::shared_ptr<gr::msg_queue> d_queue;
     bool d_dump;
     bool b_rinex_header_writen;
     bool b_rinex_header_updated;

src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc

@@ -43,9 +43,9 @@
 using google::LogMessage;
 
 gps_l1_ca_pvt_cc_sptr
-gps_l1_ca_make_pvt_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int averaging_depth, bool flag_averaging, int output_rate_ms, int display_rate_ms, bool flag_nmea_tty_port, std::string nmea_dump_filename, std::string nmea_dump_devname, bool flag_rtcm_server, bool flag_rtcm_tty_port, std::string rtcm_dump_devname)
+gps_l1_ca_make_pvt_cc(unsigned int nchannels, bool dump, std::string dump_filename, int averaging_depth, bool flag_averaging, int output_rate_ms, int display_rate_ms, bool flag_nmea_tty_port, std::string nmea_dump_filename, std::string nmea_dump_devname, bool flag_rtcm_server, bool flag_rtcm_tty_port, std::string rtcm_dump_devname)
 {
-    return gps_l1_ca_pvt_cc_sptr(new gps_l1_ca_pvt_cc(nchannels, queue, dump, dump_filename, averaging_depth, flag_averaging, output_rate_ms, display_rate_ms, flag_nmea_tty_port, nmea_dump_filename, nmea_dump_devname, flag_rtcm_server, flag_rtcm_tty_port, rtcm_dump_devname));
+    return gps_l1_ca_pvt_cc_sptr(new gps_l1_ca_pvt_cc(nchannels, dump, dump_filename, averaging_depth, flag_averaging, output_rate_ms, display_rate_ms, flag_nmea_tty_port, nmea_dump_filename, nmea_dump_devname, flag_rtcm_server, flag_rtcm_tty_port, rtcm_dump_devname));
 }
 
 
@@ -140,7 +140,6 @@ void gps_l1_ca_pvt_cc::msg_handler_telemetry(pmt::pmt_t msg)
 }
 
 gps_l1_ca_pvt_cc::gps_l1_ca_pvt_cc(unsigned int nchannels,
-        boost::shared_ptr<gr::msg_queue> queue,
         bool dump, std::string dump_filename,
         int averaging_depth,
         bool flag_averaging,
@@ -157,7 +156,6 @@ gps_l1_ca_pvt_cc::gps_l1_ca_pvt_cc(unsigned int nchannels,
 {
     d_output_rate_ms = output_rate_ms;
     d_display_rate_ms = display_rate_ms;
-    d_queue = queue;
     d_dump = dump;
     d_nchannels = nchannels;
     d_dump_filename = dump_filename;

src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h

@@ -33,7 +33,6 @@
 #include <fstream>
 #include <string>
 #include <gnuradio/block.h>
-#include <gnuradio/msg_queue.h>
 #include "nmea_printer.h"
 #include "kml_printer.h"
 #include "rinex_printer.h"
@@ -47,7 +46,6 @@ class gps_l1_ca_pvt_cc;
 typedef boost::shared_ptr<gps_l1_ca_pvt_cc> gps_l1_ca_pvt_cc_sptr;
 
 gps_l1_ca_pvt_cc_sptr gps_l1_ca_make_pvt_cc(unsigned int n_channels,
-                                            boost::shared_ptr<gr::msg_queue> queue,
                                             bool dump,
                                             std::string dump_filename,
                                             int averaging_depth,
@@ -69,7 +67,6 @@ class gps_l1_ca_pvt_cc : public gr::block
 {
 private:
     friend gps_l1_ca_pvt_cc_sptr gps_l1_ca_make_pvt_cc(unsigned int nchannels,
-                                                       boost::shared_ptr<gr::msg_queue> queue,
                                                        bool dump,
                                                        std::string dump_filename,
                                                        int averaging_depth,
@@ -83,7 +80,6 @@ private:
                                                        bool flag_rtcm_tty_port,
                                                        std::string rtcm_dump_devname);
     gps_l1_ca_pvt_cc(unsigned int nchannels,
-                     boost::shared_ptr<gr::msg_queue> queue,
                      bool dump,
                      std::string dump_filename,
                      int averaging_depth,
@@ -99,7 +95,6 @@ private:
 
     void msg_handler_telemetry(pmt::pmt_t msg);
 
-    boost::shared_ptr<gr::msg_queue> d_queue;
     bool d_dump;
     bool b_rinex_header_writen;
     bool b_rinex_sbs_header_writen;

src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc

@@ -41,9 +41,9 @@
 using google::LogMessage;
 
 hybrid_pvt_cc_sptr
-hybrid_make_pvt_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int averaging_depth, bool flag_averaging, int output_rate_ms, int display_rate_ms, bool flag_nmea_tty_port, std::string nmea_dump_filename, std::string nmea_dump_devname, bool flag_rtcm_server, bool flag_rtcm_tty_port, std::string rtcm_dump_devname)
+hybrid_make_pvt_cc(unsigned int nchannels, bool dump, std::string dump_filename, int averaging_depth, bool flag_averaging, int output_rate_ms, int display_rate_ms, bool flag_nmea_tty_port, std::string nmea_dump_filename, std::string nmea_dump_devname, bool flag_rtcm_server, bool flag_rtcm_tty_port, std::string rtcm_dump_devname)
 {
-    return hybrid_pvt_cc_sptr(new hybrid_pvt_cc(nchannels, queue, dump, dump_filename, averaging_depth, flag_averaging, output_rate_ms, display_rate_ms, flag_nmea_tty_port, nmea_dump_filename, nmea_dump_devname, flag_rtcm_server, flag_rtcm_tty_port, rtcm_dump_devname));
+    return hybrid_pvt_cc_sptr(new hybrid_pvt_cc(nchannels, dump, dump_filename, averaging_depth, flag_averaging, output_rate_ms, display_rate_ms, flag_nmea_tty_port, nmea_dump_filename, nmea_dump_devname, flag_rtcm_server, flag_rtcm_tty_port, rtcm_dump_devname));
 }
 
 
@@ -128,14 +128,13 @@ void hybrid_pvt_cc::msg_handler_telemetry(pmt::pmt_t msg)
 }
 
 
-hybrid_pvt_cc::hybrid_pvt_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int averaging_depth, bool flag_averaging, int output_rate_ms, int display_rate_ms, bool flag_nmea_tty_port, std::string nmea_dump_filename, std::string nmea_dump_devname, bool flag_rtcm_server, bool flag_rtcm_tty_port, std::string rtcm_dump_devname) :
+hybrid_pvt_cc::hybrid_pvt_cc(unsigned int nchannels, bool dump, std::string dump_filename, int averaging_depth, bool flag_averaging, int output_rate_ms, int display_rate_ms, bool flag_nmea_tty_port, std::string nmea_dump_filename, std::string nmea_dump_devname, bool flag_rtcm_server, bool flag_rtcm_tty_port, std::string rtcm_dump_devname) :
 		                		                        gr::block("hybrid_pvt_cc", gr::io_signature::make(nchannels, nchannels,  sizeof(Gnss_Synchro)),
 		                		                        gr::io_signature::make(0, 0, sizeof(gr_complex)))
 {
 
     d_output_rate_ms = output_rate_ms;
     d_display_rate_ms = display_rate_ms;
-    d_queue = queue;
     d_dump = dump;
     d_nchannels = nchannels;
     d_dump_filename = dump_filename;

src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h

@@ -35,7 +35,6 @@
 #include <utility>
 #include <string>
 #include <gnuradio/block.h>
-#include <gnuradio/msg_queue.h>
 #include "nmea_printer.h"
 #include "kml_printer.h"
 #include "geojson_printer.h"
@@ -49,7 +48,6 @@ class hybrid_pvt_cc;
 typedef boost::shared_ptr<hybrid_pvt_cc> hybrid_pvt_cc_sptr;
 
 hybrid_pvt_cc_sptr hybrid_make_pvt_cc(unsigned int n_channels,
-                                              boost::shared_ptr<gr::msg_queue> queue,
                                               bool dump,
                                               std::string dump_filename,
                                               int averaging_depth,
@@ -70,7 +68,6 @@ class hybrid_pvt_cc : public gr::block
 {
 private:
     friend hybrid_pvt_cc_sptr hybrid_make_pvt_cc(unsigned int nchannels,
-                                                         boost::shared_ptr<gr::msg_queue> queue,
                                                          bool dump,
                                                          std::string dump_filename,
                                                          int averaging_depth,
@@ -84,7 +81,6 @@ private:
                                                          bool flag_rtcm_tty_port,
                                                          std::string rtcm_dump_devname);
     hybrid_pvt_cc(unsigned int nchannels,
-                      boost::shared_ptr<gr::msg_queue> queue,
                       bool dump, std::string dump_filename,
                       int averaging_depth,
                       bool flag_averaging,
@@ -99,7 +95,6 @@ private:
 
     void msg_handler_telemetry(pmt::pmt_t msg);
 
-    boost::shared_ptr<gr::msg_queue> d_queue;
     bool d_dump;
     bool b_rinex_header_writen;
     bool b_rinex_header_updated;

src/core/receiver/gnss_block_factory.cc

@@ -1392,19 +1392,19 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
     else if (implementation.compare("GPS_L1_CA_PVT") == 0)
         {
             std::unique_ptr<GNSSBlockInterface> block_(new GpsL1CaPvt(configuration.get(), role, in_streams,
-                    out_streams, queue));
+                    out_streams));
             block = std::move(block_);
         }
     else if (implementation.compare("GALILEO_E1_PVT") == 0)
         {
             std::unique_ptr<GNSSBlockInterface> block_(new GalileoE1Pvt(configuration.get(), role, in_streams,
-                    out_streams, queue));
+                    out_streams));
             block = std::move(block_);
         }
     else if (implementation.compare("Hybrid_PVT") == 0)
         {
             std::unique_ptr<GNSSBlockInterface> block_(new HybridPvt(configuration.get(), role, in_streams,
-                    out_streams, queue));
+                    out_streams));
             block = std::move(block_);
         }
     else