From 6b45d4019cef302e5a1268ba416b8eb3e51ad6b0 Mon Sep 17 00:00:00 2001
From: Javier Arribas <javiarribas@gmail.com>
Date: Wed, 13 Apr 2016 17:02:33 +0200
Subject: [PATCH] removed unused queues in observables blocks

---
 .../observables/adapters/galileo_e1_observables.cc       | 8 +++-----
 .../observables/adapters/galileo_e1_observables.h        | 5 +----
 .../observables/adapters/gps_l1_ca_observables.cc        | 8 +++-----
 .../observables/adapters/gps_l1_ca_observables.h         | 5 +----
 .../observables/adapters/hybrid_observables.cc           | 8 +++-----
 src/algorithms/observables/adapters/hybrid_observables.h | 5 +----
 src/algorithms/observables/adapters/mixed_observables.cc | 8 +++-----
 src/algorithms/observables/adapters/mixed_observables.h  | 5 +----
 .../gnuradio_blocks/galileo_e1_observables_cc.cc         | 9 ++++-----
 .../gnuradio_blocks/galileo_e1_observables_cc.h          | 8 +++-----
 .../gnuradio_blocks/gps_l1_ca_observables_cc.cc          | 9 ++++-----
 .../gnuradio_blocks/gps_l1_ca_observables_cc.h           | 8 +++-----
 .../observables/gnuradio_blocks/hybrid_observables_cc.cc | 9 ++++-----
 .../observables/gnuradio_blocks/hybrid_observables_cc.h  | 9 +++------
 .../observables/gnuradio_blocks/mixed_observables_cc.cc  | 7 +++----
 .../observables/gnuradio_blocks/mixed_observables_cc.h   | 8 +++-----
 src/core/receiver/gnss_block_factory.cc                  | 8 ++++----
 17 files changed, 47 insertions(+), 80 deletions(-)

diff --git a/src/algorithms/observables/adapters/galileo_e1_observables.cc b/src/algorithms/observables/adapters/galileo_e1_observables.cc
index f6ddd1321..e8f7218b0 100644
--- a/src/algorithms/observables/adapters/galileo_e1_observables.cc
+++ b/src/algorithms/observables/adapters/galileo_e1_observables.cc
@@ -39,12 +39,10 @@ using google::LogMessage;
 GalileoE1Observables::GalileoE1Observables(ConfigurationInterface* configuration,
         std::string role,
         unsigned int in_streams,
-        unsigned int out_streams,
-        boost::shared_ptr<gr::msg_queue> queue) :
+        unsigned int out_streams) :
                     role_(role),
                     in_streams_(in_streams),
-                    out_streams_(out_streams),
-                    queue_(queue)
+                    out_streams_(out_streams)
 {
     int output_rate_ms;
     output_rate_ms = configuration->property(role + ".output_rate_ms", 500);
@@ -54,7 +52,7 @@ GalileoE1Observables::GalileoE1Observables(ConfigurationInterface* configuration
     flag_averaging = configuration->property(role + ".flag_averaging", false);
     dump_ = configuration->property(role + ".dump", false);
     dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
-    observables_ = galileo_e1_make_observables_cc(in_streams_, queue_, dump_, dump_filename_, output_rate_ms, flag_averaging);
+    observables_ = galileo_e1_make_observables_cc(in_streams_, dump_, dump_filename_, output_rate_ms, flag_averaging);
     DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")";
 }
 
diff --git a/src/algorithms/observables/adapters/galileo_e1_observables.h b/src/algorithms/observables/adapters/galileo_e1_observables.h
index 2c7ce44de..6de5b8b62 100644
--- a/src/algorithms/observables/adapters/galileo_e1_observables.h
+++ b/src/algorithms/observables/adapters/galileo_e1_observables.h
@@ -35,7 +35,6 @@
 #define GNSS_SDR_GALILEO_E1_OBSERVABLES_H_
 
 #include <string>
-#include <gnuradio/msg_queue.h>
 #include "observables_interface.h"
 #include "galileo_e1_observables_cc.h"
 
@@ -51,8 +50,7 @@ public:
 	GalileoE1Observables(ConfigurationInterface* configuration,
                        std::string role,
                        unsigned int in_streams,
-                       unsigned int out_streams,
-                       boost::shared_ptr<gr::msg_queue> queue);
+                       unsigned int out_streams);
     virtual ~GalileoE1Observables();
     std::string role()
     {
@@ -86,7 +84,6 @@ private:
     std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;
-    boost::shared_ptr<gr::msg_queue> queue_;
 };
 
 #endif
diff --git a/src/algorithms/observables/adapters/gps_l1_ca_observables.cc b/src/algorithms/observables/adapters/gps_l1_ca_observables.cc
index ef8b3247a..c5c0b17ef 100644
--- a/src/algorithms/observables/adapters/gps_l1_ca_observables.cc
+++ b/src/algorithms/observables/adapters/gps_l1_ca_observables.cc
@@ -39,12 +39,10 @@ using google::LogMessage;
 GpsL1CaObservables::GpsL1CaObservables(ConfigurationInterface* configuration,
         std::string role,
         unsigned int in_streams,
-        unsigned int out_streams,
-        boost::shared_ptr<gr::msg_queue> queue) :
+        unsigned int out_streams) :
                     role_(role),
                     in_streams_(in_streams),
-                    out_streams_(out_streams),
-                    queue_(queue)
+                    out_streams_(out_streams)
 {
     int output_rate_ms;
     output_rate_ms = configuration->property(role + ".output_rate_ms", 500);
@@ -54,7 +52,7 @@ GpsL1CaObservables::GpsL1CaObservables(ConfigurationInterface* configuration,
     flag_averaging = configuration->property(role + ".flag_averaging", false);
     dump_ = configuration->property(role + ".dump", false);
     dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
-    observables_ = gps_l1_ca_make_observables_cc(in_streams_, queue_, dump_, dump_filename_, output_rate_ms, flag_averaging);
+    observables_ = gps_l1_ca_make_observables_cc(in_streams_, dump_, dump_filename_, output_rate_ms, flag_averaging);
     DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")";
 }
 
diff --git a/src/algorithms/observables/adapters/gps_l1_ca_observables.h b/src/algorithms/observables/adapters/gps_l1_ca_observables.h
index 8e8f49f40..cf83be10d 100644
--- a/src/algorithms/observables/adapters/gps_l1_ca_observables.h
+++ b/src/algorithms/observables/adapters/gps_l1_ca_observables.h
@@ -34,7 +34,6 @@
 #define GNSS_SDR_GPS_L1_CA_OBSERVABLES_H_
 
 #include <string>
-#include <gnuradio/msg_queue.h>
 #include "observables_interface.h"
 #include "gps_l1_ca_observables_cc.h"
 
@@ -50,8 +49,7 @@ public:
     GpsL1CaObservables(ConfigurationInterface* configuration,
                        std::string role,
                        unsigned int in_streams,
-                       unsigned int out_streams,
-                       boost::shared_ptr<gr::msg_queue> queue);
+                       unsigned int out_streams);
     virtual ~GpsL1CaObservables();
     std::string role()
     {
@@ -86,7 +84,6 @@ private:
     std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;
-    boost::shared_ptr<gr::msg_queue> queue_;
 };
 
 #endif
diff --git a/src/algorithms/observables/adapters/hybrid_observables.cc b/src/algorithms/observables/adapters/hybrid_observables.cc
index 4eda3df3f..30832f771 100644
--- a/src/algorithms/observables/adapters/hybrid_observables.cc
+++ b/src/algorithms/observables/adapters/hybrid_observables.cc
@@ -39,12 +39,10 @@ using google::LogMessage;
 HybridObservables::HybridObservables(ConfigurationInterface* configuration,
         std::string role,
         unsigned int in_streams,
-        unsigned int out_streams,
-        boost::shared_ptr<gr::msg_queue> queue) :
+        unsigned int out_streams) :
                     role_(role),
                     in_streams_(in_streams),
-                    out_streams_(out_streams),
-                    queue_(queue)
+                    out_streams_(out_streams)
 {
     int output_rate_ms;
     output_rate_ms = configuration->property(role + ".output_rate_ms", 500);
@@ -54,7 +52,7 @@ HybridObservables::HybridObservables(ConfigurationInterface* configuration,
     flag_averaging = configuration->property(role + ".flag_averaging", false);
     dump_ = configuration->property(role + ".dump", false);
     dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
-    observables_ = hybrid_make_observables_cc(in_streams_, queue_, dump_, dump_filename_, output_rate_ms, flag_averaging);
+    observables_ = hybrid_make_observables_cc(in_streams_, dump_, dump_filename_, output_rate_ms, flag_averaging);
     DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")";
 }
 
diff --git a/src/algorithms/observables/adapters/hybrid_observables.h b/src/algorithms/observables/adapters/hybrid_observables.h
index 49fa99f32..105bcbe04 100644
--- a/src/algorithms/observables/adapters/hybrid_observables.h
+++ b/src/algorithms/observables/adapters/hybrid_observables.h
@@ -35,7 +35,6 @@
 #define GNSS_SDR_hybrid_observables_H_
 
 #include <string>
-#include <gnuradio/msg_queue.h>
 #include "observables_interface.h"
 #include "hybrid_observables_cc.h"
 
@@ -51,8 +50,7 @@ public:
 	HybridObservables(ConfigurationInterface* configuration,
                        std::string role,
                        unsigned int in_streams,
-                       unsigned int out_streams,
-                       boost::shared_ptr<gr::msg_queue> queue);
+                       unsigned int out_streams);
     virtual ~HybridObservables();
     std::string role()
     {
@@ -86,7 +84,6 @@ private:
     std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;
-    boost::shared_ptr<gr::msg_queue> queue_;
 };
 
 #endif
diff --git a/src/algorithms/observables/adapters/mixed_observables.cc b/src/algorithms/observables/adapters/mixed_observables.cc
index 94dedc353..22fc1c780 100644
--- a/src/algorithms/observables/adapters/mixed_observables.cc
+++ b/src/algorithms/observables/adapters/mixed_observables.cc
@@ -39,12 +39,10 @@ using google::LogMessage;
 MixedObservables::MixedObservables(ConfigurationInterface* configuration,
         std::string role,
         unsigned int in_streams,
-        unsigned int out_streams,
-        boost::shared_ptr<gr::msg_queue> queue) :
+        unsigned int out_streams) :
                     role_(role),
                     in_streams_(in_streams),
-                    out_streams_(out_streams),
-                    queue_(queue)
+                    out_streams_(out_streams)
 {
     int output_rate_ms;
     output_rate_ms = configuration->property(role + ".output_rate_ms", 500);
@@ -54,7 +52,7 @@ MixedObservables::MixedObservables(ConfigurationInterface* configuration,
     flag_averaging = configuration->property(role + ".flag_averaging", false);
     dump_ = configuration->property(role + ".dump", false);
     dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
-    observables_ = mixed_make_observables_cc(in_streams_, queue_, dump_, dump_filename_, output_rate_ms, flag_averaging);
+    observables_ = mixed_make_observables_cc(in_streams_, dump_, dump_filename_, output_rate_ms, flag_averaging);
     DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")";
 }
 
diff --git a/src/algorithms/observables/adapters/mixed_observables.h b/src/algorithms/observables/adapters/mixed_observables.h
index cb7ad2892..661f630b3 100644
--- a/src/algorithms/observables/adapters/mixed_observables.h
+++ b/src/algorithms/observables/adapters/mixed_observables.h
@@ -33,7 +33,6 @@
 #define GNSS_SDR_MIXED_OBSERVABLES_H_
 
 #include <string>
-#include <gnuradio/msg_queue.h>
 #include "observables_interface.h"
 #include "mixed_observables_cc.h"
 
@@ -49,8 +48,7 @@ public:
     MixedObservables(ConfigurationInterface* configuration,
                        std::string role,
                        unsigned int in_streams,
-                       unsigned int out_streams,
-                       boost::shared_ptr<gr::msg_queue> queue);
+                       unsigned int out_streams);
     virtual ~MixedObservables();
     std::string role()
     {
@@ -85,7 +83,6 @@ private:
     std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;
-    boost::shared_ptr<gr::msg_queue> queue_;
 };
 
 #endif
diff --git a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc
index 7f96fd253..48506cbbf 100644
--- a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc
@@ -50,18 +50,17 @@ using google::LogMessage;
 
 
 galileo_e1_observables_cc_sptr
-galileo_e1_make_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging)
+galileo_e1_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging)
 {
-    return galileo_e1_observables_cc_sptr(new galileo_e1_observables_cc(nchannels, queue, dump, dump_filename, output_rate_ms, flag_averaging));
+    return galileo_e1_observables_cc_sptr(new galileo_e1_observables_cc(nchannels, dump, dump_filename, output_rate_ms, flag_averaging));
 }
 
 
-galileo_e1_observables_cc::galileo_e1_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) :
+galileo_e1_observables_cc::galileo_e1_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) :
 		                        gr::block("galileo_e1_observables_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)),
 		                        gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)))
 {
     // initialize internal vars
-    d_queue = queue;
     d_dump = dump;
     d_nchannels = nchannels;
     d_output_rate_ms = output_rate_ms;
@@ -86,7 +85,7 @@ galileo_e1_observables_cc::galileo_e1_observables_cc(unsigned int nchannels, boo
                             d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
                             LOG(INFO) << "Observables dump enabled Log file: " << d_dump_filename.c_str();
                     }
-                    catch (std::ifstream::failure e)
+                    catch (const std::ifstream::failure & e)
                     {
                             LOG(WARNING) << "Exception opening observables dump file " << e.what();
                     }
diff --git a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h
index a16d9cfbe..b17fa1323 100644
--- a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h
@@ -37,7 +37,6 @@
 #include <fstream>
 #include <string>
 #include <gnuradio/block.h>
-#include <gnuradio/msg_queue.h>
 
 
 class galileo_e1_observables_cc;
@@ -45,7 +44,7 @@ class galileo_e1_observables_cc;
 typedef boost::shared_ptr<galileo_e1_observables_cc> galileo_e1_observables_cc_sptr;
 
 galileo_e1_observables_cc_sptr
-galileo_e1_make_observables_cc(unsigned int n_channels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
+galileo_e1_make_observables_cc(unsigned int n_channels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
 
 /*!
  * \brief This class implements a block that computes Galileo observables
@@ -60,8 +59,8 @@ public:
 
 private:
     friend galileo_e1_observables_cc_sptr
-    galileo_e1_make_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
-    galileo_e1_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
+    galileo_e1_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
+    galileo_e1_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
 
     //Tracking observable history
     std::vector<std::deque<double>> d_acc_carrier_phase_queue_rads;
@@ -69,7 +68,6 @@ private:
     std::vector<std::deque<double>> d_symbol_TOW_queue_s;
 
     // class private vars
-    boost::shared_ptr<gr::msg_queue> d_queue;
     bool d_dump;
     bool d_flag_averaging;
     unsigned int d_nchannels;
diff --git a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
index bde660b90..8e59da836 100644
--- a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
@@ -47,18 +47,17 @@ using google::LogMessage;
 
 
 gps_l1_ca_observables_cc_sptr
-gps_l1_ca_make_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging)
+gps_l1_ca_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging)
 {
-    return gps_l1_ca_observables_cc_sptr(new gps_l1_ca_observables_cc(nchannels, queue, dump, dump_filename, output_rate_ms, flag_averaging));
+    return gps_l1_ca_observables_cc_sptr(new gps_l1_ca_observables_cc(nchannels, dump, dump_filename, output_rate_ms, flag_averaging));
 }
 
 
-gps_l1_ca_observables_cc::gps_l1_ca_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) :
+gps_l1_ca_observables_cc::gps_l1_ca_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) :
 		                        gr::block("gps_l1_ca_observables_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)),
 		                        gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)))
 {
     // initialize internal vars
-    d_queue = queue;
     d_dump = dump;
     d_nchannels = nchannels;
     d_output_rate_ms = output_rate_ms;
@@ -83,7 +82,7 @@ gps_l1_ca_observables_cc::gps_l1_ca_observables_cc(unsigned int nchannels, boost
                             d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
                             LOG(INFO) << "Observables dump enabled Log file: " << d_dump_filename.c_str() << std::endl;
                     }
-                    catch (std::ifstream::failure e)
+                    catch (const std::ifstream::failure & e)
                     {
                             LOG(WARNING) << "Exception opening observables dump file " << e.what() << std::endl;
                     }
diff --git a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h
index 174f38b85..f3b05e24b 100644
--- a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h
@@ -37,7 +37,6 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/block.h>
-#include <gnuradio/msg_queue.h>
 
 
 class gps_l1_ca_observables_cc;
@@ -45,7 +44,7 @@ class gps_l1_ca_observables_cc;
 typedef boost::shared_ptr<gps_l1_ca_observables_cc> gps_l1_ca_observables_cc_sptr;
 
 gps_l1_ca_observables_cc_sptr
-gps_l1_ca_make_observables_cc(unsigned int n_channels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
+gps_l1_ca_make_observables_cc(unsigned int n_channels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
 
 /*!
  * \brief This class implements a block that computes GPS L1 C/A observables
@@ -60,8 +59,8 @@ public:
 
 private:
     friend gps_l1_ca_observables_cc_sptr
-    gps_l1_ca_make_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
-    gps_l1_ca_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
+    gps_l1_ca_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
+    gps_l1_ca_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
 
 
     //Tracking observable history
@@ -70,7 +69,6 @@ private:
     std::vector<std::deque<double>> d_symbol_TOW_queue_s;
 
     // class private vars
-    boost::shared_ptr<gr::msg_queue> d_queue;
     bool d_dump;
     bool d_flag_averaging;
     unsigned int d_nchannels;
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
index 52cac4e54..e3a55d79c 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
@@ -48,18 +48,17 @@ using google::LogMessage;
 
 
 hybrid_observables_cc_sptr
-hybrid_make_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging)
+hybrid_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging)
 {
-    return hybrid_observables_cc_sptr(new hybrid_observables_cc(nchannels, queue, dump, dump_filename, output_rate_ms, flag_averaging));
+    return hybrid_observables_cc_sptr(new hybrid_observables_cc(nchannels, dump, dump_filename, output_rate_ms, flag_averaging));
 }
 
 
-hybrid_observables_cc::hybrid_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) :
+hybrid_observables_cc::hybrid_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) :
 		                        gr::block("hybrid_observables_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)),
 		                        gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)))
 {
     // initialize internal vars
-    d_queue = queue;
     d_dump = dump;
     d_nchannels = nchannels;
     d_output_rate_ms = output_rate_ms;
@@ -77,7 +76,7 @@ hybrid_observables_cc::hybrid_observables_cc(unsigned int nchannels, boost::shar
                             d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
                             LOG(INFO) << "Observables dump enabled Log file: " << d_dump_filename.c_str();
                     }
-                    catch (std::ifstream::failure e)
+                    catch (const std::ifstream::failure & e)
                     {
                             LOG(WARNING) << "Exception opening observables dump file " << e.what();
                     }
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
index d1c049ed0..fcad2afea 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
@@ -36,7 +36,6 @@
 #include <fstream>
 #include <string>
 #include <gnuradio/block.h>
-#include <gnuradio/msg_queue.h>
 
 
 class hybrid_observables_cc;
@@ -44,7 +43,7 @@ class hybrid_observables_cc;
 typedef boost::shared_ptr<hybrid_observables_cc> hybrid_observables_cc_sptr;
 
 hybrid_observables_cc_sptr
-hybrid_make_observables_cc(unsigned int n_channels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
+hybrid_make_observables_cc(unsigned int n_channels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
 
 /*!
  * \brief This class implements a block that computes Galileo observables
@@ -53,17 +52,15 @@ class hybrid_observables_cc : public gr::block
 {
 public:
     ~hybrid_observables_cc ();
-    //void set_fs_in(unsigned long int fs_in) {d_fs_in = fs_in;};
     int general_work (int noutput_items, gr_vector_int &ninput_items,
             gr_vector_const_void_star &input_items, gr_vector_void_star &output_items);
 
 private:
     friend hybrid_observables_cc_sptr
-    hybrid_make_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
-    hybrid_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
+    hybrid_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
+    hybrid_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
 
     // class private vars
-    boost::shared_ptr<gr::msg_queue> d_queue;
     bool d_dump;
     bool d_flag_averaging;
     unsigned int d_nchannels;
diff --git a/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.cc
index b041b2a63..b4d0f9bac 100644
--- a/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.cc
@@ -46,18 +46,17 @@ using google::LogMessage;
 
 
 mixed_observables_cc_sptr
-mixed_make_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging)
+mixed_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging)
 {
-    return mixed_observables_cc_sptr(new mixed_observables_cc(nchannels, queue, dump, dump_filename, output_rate_ms, flag_averaging));
+    return mixed_observables_cc_sptr(new mixed_observables_cc(nchannels, dump, dump_filename, output_rate_ms, flag_averaging));
 }
 
 
-mixed_observables_cc::mixed_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) :
+mixed_observables_cc::mixed_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) :
 		                        gr::block("mixed_observables_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)),
 		                        gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)))
 {
     // initialize internal vars
-    d_queue = queue;
     d_dump = dump;
     d_nchannels = nchannels;
     d_output_rate_ms = output_rate_ms;
diff --git a/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.h
index 884b412bf..b278835fe 100644
--- a/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.h
@@ -34,7 +34,6 @@
 #include <fstream>
 #include <string>
 #include <gnuradio/block.h>
-#include <gnuradio/msg_queue.h>
 
 
 class mixed_observables_cc;
@@ -42,7 +41,7 @@ class mixed_observables_cc;
 typedef boost::shared_ptr<mixed_observables_cc> mixed_observables_cc_sptr;
 
 mixed_observables_cc_sptr
-mixed_make_observables_cc(unsigned int n_channels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
+mixed_make_observables_cc(unsigned int n_channels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
 
 /*!
  * \brief This class implements a block that computes MIXED observables (Multi-frequency and Multi-system)
@@ -56,11 +55,10 @@ public:
 
 private:
     friend mixed_observables_cc_sptr
-    mixed_make_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
-    mixed_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
+    mixed_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
+    mixed_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
 
     // class private vars
-    boost::shared_ptr<gr::msg_queue> d_queue;
     bool d_dump;
     bool d_flag_averaging;
     unsigned int d_nchannels;
diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index eb88a025f..388b6d7b8 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -1366,26 +1366,26 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
     else if (implementation.compare("GPS_L1_CA_Observables") == 0)
         {
             std::unique_ptr<GNSSBlockInterface> block_(new GpsL1CaObservables(configuration.get(), role, in_streams,
-                    out_streams, queue));
+                    out_streams));
             block = std::move(block_);
         }
 
     else if (implementation.compare("Galileo_E1B_Observables") == 0)
         {
             std::unique_ptr<GNSSBlockInterface> block_(new GalileoE1Observables(configuration.get(), role, in_streams,
-                    out_streams, queue));
+                    out_streams));
             block = std::move(block_);
         }
     else if (implementation.compare("Hybrid_Observables") == 0)
         {
             std::unique_ptr<GNSSBlockInterface> block_(new HybridObservables(configuration.get(), role, in_streams,
-                    out_streams, queue));
+                    out_streams));
             block = std::move(block_);
         }
     else if (implementation.compare("Mixed_Observables") == 0)
         {
             std::unique_ptr<GNSSBlockInterface> block_(new MixedObservables(configuration.get(), role, in_streams,
-                    out_streams, queue));
+                    out_streams));
             block = std::move(block_);
         }
     // PVT -------------------------------------------------------------------------