Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next

2024-12-15 12:40:35 +00:00 · 2019-02-25 00:18:34 +01:00 · 2019-02-25 00:18:34 +01:00 · 577331680e
commit 577331680e
parent 6e24bf31e6 4fe976ba01
26 changed files with 229 additions and 227 deletions
--- a/src/core/receiver/control_thread.cc
+++ b/src/core/receiver/control_thread.cc
@ -58,6 +58,7 @@
 #include <glog/logging.h>
 #include <gnuradio/message.h>
 #include <algorithm>
+#include <chrono>
 #include <cmath>
 #include <iostream>
 #include <limits>
@ -204,7 +205,7 @@ ControlThread::~ControlThread()  // NOLINT(modernize-use-equals-default)

    if (cmd_interface_thread_.joinable())
        {
-            cmd_interface_thread_.join();
+            cmd_interface_thread_.detach();
        }
 }

--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@ -345,7 +345,6 @@ if(ENABLE_UNIT_TESTING)

    target_link_libraries(run_tests
        PUBLIC
-            Boost::chrono
            Boost::filesystem
            Boost::system
            Boost::thread
--- a/src/tests/single_test_main.cc
+++ b/src/tests/single_test_main.cc
@ -40,7 +40,6 @@
 #include "gps_ephemeris.h"
 #include "gps_navigation_message.h"
 #include <boost/filesystem.hpp>
-#include <boost/thread.hpp>
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 #include <gnuradio/msg_queue.h>
--- a/src/tests/test_main.cc
+++ b/src/tests/test_main.cc
@ -48,8 +48,7 @@
 #include "gps_utc_model.h"
 #include "sbas_ephemeris.h"
 #include <boost/filesystem.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/thread.hpp>
+#include <boost/shared_ptr.hpp>
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 #include <gnuradio/msg_queue.h>
--- 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
@ -52,6 +52,7 @@
 #include <gnuradio/blocks/interleaved_char_to_complex.h>
 #include <gnuradio/blocks/skiphead.h>
 #include <gnuradio/top_block.h>
+#include <thread>
 #include <utility>


@ -337,7 +338,7 @@ protected:
    bool stop;

    int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;

    std::string implementation = FLAGS_acq_test_implementation;

@ -395,7 +396,7 @@ void AcquisitionPerformanceTest::init()
 void AcquisitionPerformanceTest::start_queue()
 {
    stop = false;
-    ch_thread = boost::thread(&AcquisitionPerformanceTest::wait_message, this);
+    ch_thread = std::thread(&AcquisitionPerformanceTest::wait_message, this);
 }


@ -647,7 +648,7 @@ int AcquisitionPerformanceTest::run_receiver()

    top_block->run();  // Start threads and wait

-    ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
+    ch_thread.join();

    return 0;
 }
--- 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
@ -30,17 +30,6 @@
 */


-#include <boost/shared_ptr.hpp>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "fir_filter.h"
 #include "galileo_e1_pcps_8ms_ambiguous_acquisition.h"
 #include "gen_signal_source.h"
@ -50,8 +39,20 @@
 #include "in_memory_configuration.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
+#include <chrono>
+#include <thread>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif

 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx;
@ -142,7 +143,7 @@ protected:
    size_t item_size;
    bool stop;
    int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;

    unsigned int integration_time_ms = 0;
    unsigned int fs_in = 0;
@ -339,7 +340,7 @@ void GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test::config_2()
 void GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test::start_queue()
 {
    stop = false;
-    ch_thread = boost::thread(&GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test::wait_message, this);
+    ch_thread = std::thread(&GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test::wait_message, this);
 }


--- 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
@ -143,7 +143,7 @@ protected:
    size_t item_size;
    bool stop;
    int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;

    unsigned int integration_time_ms = 0;
    unsigned int fs_in = 0;
@ -348,7 +348,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test::config_2()
 void GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test::start_queue()
 {
    stop = false;
-    ch_thread = boost::thread(&GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test::wait_message, this);
+    ch_thread = std::thread(&GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test::wait_message, this);
 }


--- 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
@ -148,7 +148,7 @@ protected:
    size_t item_size;
    bool stop;
    int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;
 };


@ -175,7 +175,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoCTest::init()

 void GalileoE1PcpsAmbiguousAcquisitionGSoCTest::start_queue()
 {
-    ch_thread = boost::thread(&GalileoE1PcpsAmbiguousAcquisitionGSoCTest::wait_message, this);
+    ch_thread = std::thread(&GalileoE1PcpsAmbiguousAcquisitionGSoCTest::wait_message, this);
 }


--- 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
@ -31,18 +31,6 @@
 */


-#include <boost/make_shared.hpp>
-#include <glog/logging.h>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "Galileo_E1.h"
 #include "acquisition_dump_reader.h"
 #include "galileo_e1_pcps_ambiguous_acquisition.h"
@ -54,9 +42,21 @@
 #include "gnuplot_i.h"
 #include "in_memory_configuration.h"
 #include "test_flags.h"
+#include <boost/make_shared.hpp>
+#include <glog/logging.h>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
+#include <chrono>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif

 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx;
--- 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
@ -31,17 +31,6 @@
 */


-#include <boost/shared_ptr.hpp>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "fir_filter.h"
 #include "galileo_e1_pcps_cccwsr_ambiguous_acquisition.h"
 #include "gen_signal_source.h"
@ -51,8 +40,20 @@
 #include "in_memory_configuration.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
+#include <chrono>
+#include <thread>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif

 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx;
@ -143,7 +144,7 @@ protected:
    size_t item_size;
    bool stop;
    int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;

    unsigned int integration_time_ms = 0;
    unsigned int fs_in = 0;
@ -346,7 +347,7 @@ void GalileoE1PcpsCccwsrAmbiguousAcquisitionTest::config_2()
 void GalileoE1PcpsCccwsrAmbiguousAcquisitionTest::start_queue()
 {
    stop = false;
-    ch_thread = boost::thread(&GalileoE1PcpsCccwsrAmbiguousAcquisitionTest::wait_message, this);
+    ch_thread = std::thread(&GalileoE1PcpsCccwsrAmbiguousAcquisitionTest::wait_message, this);
 }


@ -550,7 +551,7 @@ TEST_F(GalileoE1PcpsCccwsrAmbiguousAcquisitionTest, ValidationOfResults)
                }

            ASSERT_NO_THROW({
-                ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
+                ch_thread.join();
            }) << "Failure while waiting the queue to stop";
        }
 }
--- 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
@ -31,20 +31,6 @@
 */


-#include <boost/shared_ptr.hpp>
-#include <glog/logging.h>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <fstream>
-#include <stdexcept>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "fir_filter.h"
 #include "galileo_e1_pcps_quicksync_ambiguous_acquisition.h"
 #include "gen_signal_source.h"
@ -54,7 +40,22 @@
 #include "in_memory_configuration.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
+#include <boost/shared_ptr.hpp>
+#include <glog/logging.h>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
+#include <gnuradio/top_block.h>
+#include <chrono>
+#include <fstream>
+#include <stdexcept>
+#include <thread>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif

 DEFINE_double(e1_value_threshold, 0.3, "Value of the threshold for the acquisition");
 DEFINE_int32(e1_value_CN0_dB_0, 50, "Value for the CN0_dB_0 in channel 0");
@ -152,7 +153,7 @@ protected:
    size_t item_size;
    bool stop;
    int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;

    unsigned int integration_time_ms = 0;
    unsigned int fs_in = 0;
@ -462,7 +463,7 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::config_3()
 void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::start_queue()
 {
    stop = false;
-    ch_thread = boost::thread(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::wait_message, this);
+    ch_thread = std::thread(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::wait_message, this);
 }


--- 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
@ -30,18 +30,6 @@
 * -------------------------------------------------------------------------
 */

-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "configuration_interface.h"
 #include "fir_filter.h"
 #include "galileo_e1_pcps_tong_ambiguous_acquisition.h"
@ -52,9 +40,21 @@
 #include "in_memory_configuration.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
+#include <chrono>
+#include <thread>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif

 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx;
@ -144,7 +144,7 @@ protected:
    size_t item_size;
    bool stop;
    int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;

    unsigned int integration_time_ms = 0;
    unsigned int fs_in = 0;
@ -349,7 +349,7 @@ void GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test::config_2()
 void GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test::start_queue()
 {
    stop = false;
-    ch_thread = boost::thread(&GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test::wait_message, this);
+    ch_thread = std::thread(&GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test::wait_message, this);
 }


--- 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
@ -141,7 +141,7 @@ protected:
    size_t item_size;
    bool stop;
    int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;

    unsigned int integration_time_ms = 0;
    unsigned int fs_in = 0;
@ -426,7 +426,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::config_3()
 void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::start_queue()
 {
    stop = false;
-    ch_thread = boost::thread(&GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::wait_message, this);
+    ch_thread = std::thread(&GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::wait_message, this);
 }


--- 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
@ -31,16 +31,6 @@
 */


-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "configuration_interface.h"
 #include "freq_xlating_fir_filter.h"
 #include "gen_signal_source.h"
@ -52,11 +42,21 @@
 #include "pass_through.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
-#include "boost/shared_ptr.hpp"
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
-
+#include <chrono>
+#include <thread>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif

 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx;
@ -148,7 +148,7 @@ protected:
    size_t item_size;
    bool stop;
    int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;

    unsigned int integration_time_ms = 0;
    unsigned int fs_in = 0;
@ -353,7 +353,7 @@ void GlonassL1CaPcpsAcquisitionGSoC2017Test::config_2()
 void GlonassL1CaPcpsAcquisitionGSoC2017Test::start_queue()
 {
    stop = false;
-    ch_thread = boost::thread(&GlonassL1CaPcpsAcquisitionGSoC2017Test::wait_message, this);
+    ch_thread = std::thread(&GlonassL1CaPcpsAcquisitionGSoC2017Test::wait_message, this);
 }


@ -552,7 +552,7 @@ TEST_F(GlonassL1CaPcpsAcquisitionGSoC2017Test, ValidationOfResults)
                }

            ASSERT_NO_THROW({
-                ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
+                ch_thread.join();
            }) << "Failure while waiting the queue to stop";
        }

@ -642,7 +642,7 @@ TEST_F(GlonassL1CaPcpsAcquisitionGSoC2017Test, ValidationOfResultsProbabilities)
                }

            ASSERT_NO_THROW({
-                ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
+                ch_thread.join();
            }) << "Failure while waiting the queue to stop"
               << std::endl;
        }
--- 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
@ -30,11 +30,20 @@
 * -------------------------------------------------------------------------
 */

-#include <boost/chrono.hpp>
+#include "freq_xlating_fir_filter.h"
+#include "glonass_l1_ca_pcps_acquisition.h"
+#include "gnss_block_factory.h"
+#include "gnss_block_interface.h"
+#include "gnss_sdr_valve.h"
+#include "gnss_synchro.h"
+#include "in_memory_configuration.h"
 #include <boost/make_shared.hpp>
 #include <gnuradio/analog/sig_source_waveform.h>
 #include <gnuradio/blocks/file_source.h>
+#include <gnuradio/blocks/null_sink.h>
+#include <gnuradio/msg_queue.h>
 #include <gnuradio/top_block.h>
+#include <gtest/gtest.h>
 #include <chrono>
 #include <cstdlib>
 #include <utility>
@ -43,16 +52,6 @@
 #else
 #include <gnuradio/analog/sig_source_c.h>
 #endif
-#include "freq_xlating_fir_filter.h"
-#include "glonass_l1_ca_pcps_acquisition.h"
-#include "gnss_block_factory.h"
-#include "gnss_block_interface.h"
-#include "gnss_sdr_valve.h"
-#include "gnss_synchro.h"
-#include "in_memory_configuration.h"
-#include <gnuradio/blocks/null_sink.h>
-#include <gnuradio/msg_queue.h>
-#include <gtest/gtest.h>


 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
--- 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
@ -30,15 +30,6 @@
 */


-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "configuration_interface.h"
 #include "fir_filter.h"
 #include "gen_signal_source.h"
@ -51,10 +42,19 @@
 #include "signal_generator.h"
 #include "signal_generator_c.h"
 #include "boost/shared_ptr.hpp"
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
-
+#include <chrono>
+#include <thread>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif

 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GlonassL2CaPcpsAcquisitionTest_msg_rx;
@ -150,7 +150,7 @@ protected:
    size_t item_size;
    bool stop;
    int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;

    unsigned int integration_time_ms = 0;
    unsigned int fs_in = 0;
@ -351,7 +351,7 @@ void GlonassL2CaPcpsAcquisitionTest::config_2()
 void GlonassL2CaPcpsAcquisitionTest::start_queue()
 {
    stop = false;
-    ch_thread = boost::thread(&GlonassL2CaPcpsAcquisitionTest::wait_message, this);
+    ch_thread = std::thread(&GlonassL2CaPcpsAcquisitionTest::wait_message, this);
 }


@ -551,7 +551,7 @@ TEST_F(GlonassL2CaPcpsAcquisitionTest, ValidationOfResults)
                }

            ASSERT_NO_THROW({
-                ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
+                ch_thread.join();
            }) << "Failure while waiting the queue to stop";
        }

@ -641,7 +641,7 @@ TEST_F(GlonassL2CaPcpsAcquisitionTest, ValidationOfResultsProbabilities)
                }

            ASSERT_NO_THROW({
-                ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
+                ch_thread.join();
            }) << "Failure while waiting the queue to stop";
        }

--- 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
@ -31,16 +31,6 @@
 */


-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "configuration_interface.h"
 #include "fir_filter.h"
 #include "gen_signal_source.h"
@ -52,10 +42,21 @@
 #include "pass_through.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
-#include "boost/shared_ptr.hpp"
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
+#include <chrono>
+#include <thread>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif


 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
@ -147,7 +148,7 @@ protected:
    size_t item_size;
    bool stop;
    int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;

    unsigned int integration_time_ms = 0;
    unsigned int fs_in = 0;
@ -348,7 +349,7 @@ void GpsL1CaPcpsAcquisitionGSoC2013Test::config_2()
 void GpsL1CaPcpsAcquisitionGSoC2013Test::start_queue()
 {
    stop = false;
-    ch_thread = boost::thread(&GpsL1CaPcpsAcquisitionGSoC2013Test::wait_message, this);
+    ch_thread = std::thread(&GpsL1CaPcpsAcquisitionGSoC2013Test::wait_message, this);
 }


@ -545,7 +546,7 @@ TEST_F(GpsL1CaPcpsAcquisitionGSoC2013Test, ValidationOfResults)
                }

            ASSERT_NO_THROW({
-                ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
+                ch_thread.join();
            }) << "Failure while waiting the queue to stop";
        }

@ -635,7 +636,7 @@ TEST_F(GpsL1CaPcpsAcquisitionGSoC2013Test, ValidationOfResultsProbabilities)
                }

            ASSERT_NO_THROW({
-                ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
+                ch_thread.join();
            }) << "Failure while waiting the queue to stop";
        }

--- 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
@ -31,19 +31,6 @@
 */


-#include <boost/filesystem.hpp>
-#include <boost/make_shared.hpp>
-#include <glog/logging.h>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "GPS_L1_CA.h"
 #include "acquisition_dump_reader.h"
 #include "gnss_block_factory.h"
@ -54,9 +41,22 @@
 #include "gps_l1_ca_pcps_acquisition.h"
 #include "in_memory_configuration.h"
 #include "test_flags.h"
+#include <boost/filesystem.hpp>
+#include <boost/make_shared.hpp>
+#include <glog/logging.h>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
+#include <chrono>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif


 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
@ -29,30 +29,30 @@
 * -------------------------------------------------------------------------
 */

-#include <boost/make_shared.hpp>
-#include <boost/thread.hpp>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <cstdlib>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "gnss_block_factory.h"
 #include "gnss_block_interface.h"
 #include "gnss_sdr_valve.h"
 #include "gnss_synchro.h"
 #include "gps_l1_ca_pcps_acquisition_fpga.h"
 #include "in_memory_configuration.h"
+#include <boost/make_shared.hpp>
+#include <boost/thread.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/blocks/throttle.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
+#include <chrono>
+#include <cstdlib>
 #include <unistd.h>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif

 #define DMA_ACQ_TRANSFER_SIZE 2046               // DMA transfer size for the acquisition
 #define RX_SIGNAL_MAX_VALUE 127                  // 2^7 - 1 for 8-bit signed values
--- 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
@ -31,16 +31,6 @@
 */


-#include <boost/shared_ptr.hpp>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "configuration_interface.h"
 #include "fir_filter.h"
 #include "gen_signal_source.h"
@ -51,8 +41,19 @@
 #include "in_memory_configuration.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
+#include <chrono>
+#include <thread>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif

 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx;
@ -147,7 +148,7 @@ protected:
    size_t item_size;
    bool stop;
    int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;

    unsigned int integration_time_ms = 0;
    unsigned int fs_in = 0;
@ -348,7 +349,7 @@ void GpsL1CaPcpsOpenClAcquisitionGSoC2013Test::config_2()
 void GpsL1CaPcpsOpenClAcquisitionGSoC2013Test::start_queue()
 {
    stop = false;
-    ch_thread = boost::thread(&GpsL1CaPcpsOpenClAcquisitionGSoC2013Test::wait_message, this);
+    ch_thread = std::thread(&GpsL1CaPcpsOpenClAcquisitionGSoC2013Test::wait_message, this);
 }


--- 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
@ -31,18 +31,6 @@
 */


-#include <glog/logging.h>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <stdexcept>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "gnss_block_factory.h"
 #include "gnss_block_interface.h"
 #include "gnss_sdr_valve.h"
@ -51,9 +39,22 @@
 #include "in_memory_configuration.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
+#include <glog/logging.h>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
+#include <chrono>
+#include <stdexcept>
+#include <thread>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif

 DEFINE_double(value_threshold, 1, "Value of the threshold for the acquisition");
 DEFINE_int32(value_CN0_dB_0, 44, "Value for the CN0_dB_0 in channel 0");
@ -150,7 +151,7 @@ protected:
    size_t item_size;
    bool stop;
    int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;

    unsigned int integration_time_ms = 0;
    unsigned int fs_in = 0;
@ -454,7 +455,7 @@ void GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test::config_3()
 void GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test::start_queue()
 {
    stop = false;
-    ch_thread = boost::thread(&GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test::wait_message, this);
+    ch_thread = std::thread(&GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test::wait_message, this);
 }


--- 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
@ -31,17 +31,6 @@
 */


-#include <boost/shared_ptr.hpp>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "configuration_interface.h"
 #include "fir_filter.h"
 #include "gen_signal_source.h"
@ -52,9 +41,21 @@
 #include "in_memory_configuration.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
+#include <chrono>
+#include <thread>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif

 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx;
@ -142,7 +143,7 @@ protected:
    size_t item_size;
    bool stop;
    int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;

    unsigned int integration_time_ms = 0;
    unsigned int fs_in = 0;
@ -343,7 +344,7 @@ void GpsL1CaPcpsTongAcquisitionGSoC2013Test::config_2()
 void GpsL1CaPcpsTongAcquisitionGSoC2013Test::start_queue()
 {
    stop = false;
-    ch_thread = boost::thread(&GpsL1CaPcpsTongAcquisitionGSoC2013Test::wait_message, this);
+    ch_thread = std::thread(&GpsL1CaPcpsTongAcquisitionGSoC2013Test::wait_message, this);
 }


--- 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
@ -31,18 +31,6 @@
 */


-#include <boost/filesystem.hpp>
-#include <boost/make_shared.hpp>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "GPS_L2C.h"
 #include "acquisition_dump_reader.h"
 #include "gnss_block_factory.h"
@ -53,11 +41,23 @@
 #include "gps_l2_m_pcps_acquisition.h"
 #include "in_memory_configuration.h"
 #include "test_flags.h"
+#include <boost/filesystem.hpp>
+#include <boost/make_shared.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
 #include <gnuradio/blocks/char_to_short.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/interleaved_short_to_complex.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
+#include <chrono>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif


 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
--- a/src/utils/front-end-cal/CMakeLists.txt
+++ b/src/utils/front-end-cal/CMakeLists.txt
@ -38,12 +38,11 @@ target_link_libraries(front_end_cal_lib
        core_receiver
        core_libs
    PRIVATE
+        Boost::boost
        Gflags::gflags
        Glog::glog
        Gnuradio::blocks
        Gnuradio::runtime
-        Boost::serialization
-        Boost::thread
 )

 if(ENABLE_CLANG_TIDY)
@ -65,8 +64,9 @@ target_link_libraries(front-end-cal
        front_end_cal_lib
        gnss_sdr_flags
    PRIVATE
+        Boost::filesystem
+        Gflags::gflags
        Glog::glog
-        Armadillo::armadillo
 )

 target_compile_definitions(front-end-cal
--- a/src/utils/front-end-cal/front_end_cal.cc
+++ b/src/utils/front-end-cal/front_end_cal.cc
@ -38,10 +38,7 @@
 #include "gps_iono.h"
 #include "gps_navigation_message.h"
 #include "gps_utc_model.h"
-#include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <glog/logging.h>
 #include <cmath>
 #include <exception>
--- a/src/utils/front-end-cal/main.cc
+++ b/src/utils/front-end-cal/main.cc
@ -57,7 +57,6 @@
 #include <boost/exception/detail/exception_ptr.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
-#include <boost/thread.hpp>
 #include <glog/logging.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/file_source.h>
@ -73,6 +72,7 @@
 #include <exception>
 #include <memory>
 #include <queue>
+#include <thread>
 #include <utility>
 #include <vector>

@ -398,7 +398,7 @@ int main(int argc, char** argv)
    std::map<int, double> doppler_measurements_map;
    std::map<int, double> cn0_measurements_map;

-    boost::thread ch_thread;
+    std::thread ch_thread;

    // record startup time
    std::chrono::time_point<std::chrono::system_clock> start, end;
@ -417,9 +417,9 @@ int main(int argc, char** argv)
            stop = false;
            try
                {
-                    ch_thread = boost::thread(wait_message);
+                    ch_thread = std::thread(wait_message);
                }
-            catch (const boost::thread_resource_error& e)
+            catch (const std::exception& e)
                {
                    LOG(INFO) << "Exception caught (thread resource error)";
                }
@ -457,7 +457,7 @@ int main(int argc, char** argv)
                {
                    ch_thread.join();
                }
-            catch (const boost::thread_resource_error& e)
+            catch (const std::exception& e)
                {
                    LOG(INFO) << "Exception caught while joining threads.";
                }