Improve target design

src/algorithms/signal_source/libs/CMakeLists.txt

@@ -49,12 +49,14 @@ endif()
 set(SIGNAL_SOURCE_LIB_SOURCES
     rtl_tcp_commands.cc
     rtl_tcp_dongle_info.cc
+    gnss_sdr_valve.cc
     ${OPT_SIGNAL_SOURCE_LIB_SOURCES}
 )
 
 set(SIGNAL_SOURCE_LIB_HEADERS
     rtl_tcp_commands.h
     rtl_tcp_dongle_info.h
+    gnss_sdr_valve.h
     ${OPT_SIGNAL_SOURCE_LIB_HEADERS}
 )
 
@@ -68,9 +70,11 @@ add_library(signal_source_lib ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_H
 target_link_libraries(signal_source_lib
     PUBLIC
         Boost::boost
+        Gnuradio::runtime
     PRIVATE
         Gflags::gflags
         Glog::glog
+        gnss_rx
 )
 
 if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)

src/algorithms/signal_source/libs/gnss_sdr_valve.cc

@@ -0,0 +1,105 @@
+/*!
+ * \file gnss_sdr_valve.cc
+ * \brief Implementation of a GNU Radio block that sends a STOP message to the
+ * control queue right after a specific number of samples have passed through it.
+ * \author Javier Arribas, 2018. jarribas(at)cttc.es
+ * \author Carlos Aviles, 2010. carlos.avilesr(at)googlemail.com
+ *
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2018  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#include "gnss_sdr_valve.h"
+#include "control_message_factory.h"
+#include <glog/logging.h>
+#include <gnuradio/io_signature.h>
+#include <algorithm>  // for min
+#include <cstring>    // for memcpy
+#include <utility>
+
+gnss_sdr_valve::gnss_sdr_valve(size_t sizeof_stream_item,
+    uint64_t nitems,
+    gr::msg_queue::sptr queue,
+    bool stop_flowgraph) : gr::sync_block("valve",
+                               gr::io_signature::make(1, 1, sizeof_stream_item),
+                               gr::io_signature::make(1, 1, sizeof_stream_item)),
+                           d_nitems(nitems),
+                           d_ncopied_items(0),
+                           d_queue(std::move(queue)),
+                           d_stop_flowgraph(stop_flowgraph)
+{
+    d_open_valve = false;
+}
+
+
+boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item, uint64_t nitems, gr::msg_queue::sptr queue, bool stop_flowgraph)
+{
+    boost::shared_ptr<gnss_sdr_valve> valve_(new gnss_sdr_valve(sizeof_stream_item, nitems, std::move(queue), stop_flowgraph));
+    return valve_;
+}
+
+
+boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item, uint64_t nitems, gr::msg_queue::sptr queue)
+{
+    boost::shared_ptr<gnss_sdr_valve> valve_(new gnss_sdr_valve(sizeof_stream_item, nitems, std::move(queue), true));
+    return valve_;
+}
+
+
+void gnss_sdr_valve::open_valve()
+{
+    d_open_valve = true;
+}
+
+
+int gnss_sdr_valve::work(int noutput_items,
+    gr_vector_const_void_star &input_items,
+    gr_vector_void_star &output_items)
+{
+    if (d_open_valve == false)
+        {
+            if (d_ncopied_items >= d_nitems)
+                {
+                    auto *cmf = new ControlMessageFactory();
+                    d_queue->handle(cmf->GetQueueMessage(200, 0));
+                    LOG(INFO) << "Stopping receiver, " << d_ncopied_items << " samples processed";
+                    delete cmf;
+                    if (d_stop_flowgraph)
+                        {
+                            return -1;  // Done!
+                        }
+                    usleep(1000000);
+                    return 0;  // do not produce or consume
+                }
+            uint64_t n = std::min(d_nitems - d_ncopied_items, static_cast<uint64_t>(noutput_items));
+            if (n == 0) return 0;
+            memcpy(output_items[0], input_items[0], n * input_signature()->sizeof_stream_item(0));
+            d_ncopied_items += n;
+            return n;
+        }
+
+    memcpy(output_items[0], input_items[0], noutput_items * input_signature()->sizeof_stream_item(0));
+    return noutput_items;
+}

src/algorithms/signal_source/libs/gnss_sdr_valve.h

@@ -0,0 +1,82 @@
+/*!
+ * \file gnss_sdr_valve.h
+ * \brief  Interface of a GNU Radio block that sends a STOP message to the
+ * control queue right after a specific number of samples have passed through it.
+ * \author Javier Arribas, 2018. jarribas(at)cttc.es
+ * \author Carlos Aviles, 2010. carlos.avilesr(at)googlemail.com
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2018  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+
+#ifndef GNSS_SDR_GNSS_SDR_VALVE_H_
+#define GNSS_SDR_GNSS_SDR_VALVE_H_
+
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/msg_queue.h>
+#include <gnuradio/sync_block.h>
+#include <cstdint>
+
+boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item,
+    uint64_t nitems,
+    gr::msg_queue::sptr queue);
+
+boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item,
+    uint64_t nitems,
+    gr::msg_queue::sptr queue,
+    bool stop_flowgraph);
+
+/*!
+ * \brief Implementation of a GNU Radio block that sends a STOP message to the
+ * control queue right after a specific number of samples have passed through it.
+ */
+class gnss_sdr_valve : public gr::sync_block
+{
+    friend boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item,
+        uint64_t nitems,
+        gr::msg_queue::sptr queue);
+    friend boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item,
+        uint64_t nitems,
+        gr::msg_queue::sptr queue,
+        bool stop_flowgraph);
+
+    uint64_t d_nitems;
+    uint64_t d_ncopied_items;
+    gr::msg_queue::sptr d_queue;
+    bool d_stop_flowgraph;
+    bool d_open_valve;
+
+public:
+    gnss_sdr_valve(size_t sizeof_stream_item,
+        uint64_t nitems,
+        gr::msg_queue::sptr queue, bool stop_flowgraph);
+    void open_valve();
+
+    int work(int noutput_items,
+        gr_vector_const_void_star &input_items,
+        gr_vector_void_star &output_items);
+};
+
+#endif /*GNSS_SDR_GNSS_SDR_VALVE_H_*/