mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-31 11:19:18 +00:00
Code Issues Releases Wiki Activity

convert from vector to stream

Browse Source
This commit is contained in:
Jim Melton 2022-09-14 11:57:48 -06:00
parent 615b214b55
commit 36a1e4c18d
No known key found for this signature in database
GPG Key ID: C46392D9AACAB216
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/algorithms/signal_source/adapters/zmq_signal_source.cc
View File

@ -18,7 +18,6 @@
#include "configuration_interface.h" #include "configuration_interface.h"
#include "gnss_sdr_string_literals.h" #include "gnss_sdr_string_literals.h"
#include <glog/logging.h> #include <glog/logging.h>
#include <vector>
using namespace std::string_literals; using namespace std::string_literals;
@ -39,18 +38,23 @@ ZmqSignalSource::ZmqSignalSource(const ConfigurationInterface* configuration,
auto property = role + ".endpoint"s; auto property = role + ".endpoint"s;
auto endpoint = configuration->property(property, ""s); auto endpoint = configuration->property(property, ""s);
std::vector<char> address(endpoint.c_str(), endpoint.c_str() + endpoint.size() + 1);
if (!endpoint.empty()) if (!endpoint.empty())
{ {
LOG(INFO) << "Connecting to ZMQ pub at " << endpoint; LOG(INFO) << "Connecting to ZMQ pub at " << endpoint;
d_source_block = gr::zeromq::sub_source::make(d_item_size, vlen, address.data(), timeout_ms, pass_tags, hwm); // work around gnuradio interface deficiency
d_source_block = gr::zeromq::sub_source::make(d_item_size, vlen, const_cast<char*>(endpoint.data()), timeout_ms, pass_tags, hwm);
} }
else else
{ {
std::cerr << "For ZMQ_Signal_Source " << property << " must be defined" << std::endl; std::cerr << "For ZMQ_Signal_Source " << property << " must be defined" << std::endl;
throw std::invalid_argument(property + ": undefined"); throw std::invalid_argument(property + ": undefined");
} }
if (vlen > 1)
{
d_vec_block = gr::blocks::vector_to_stream::make(item_size(), vlen);
}
} }
@ -59,10 +63,14 @@ auto ZmqSignalSource::item_size() -> size_t { return d_item_size; }
auto ZmqSignalSource::connect(gr::top_block_sptr top_block) -> void auto ZmqSignalSource::connect(gr::top_block_sptr top_block) -> void
{ {
if (d_vec_block)
{
top_block->connect(d_source_block, 0, d_vec_block, 0);
}
if (d_dump) if (d_dump)
{ {
d_dump_sink = gr::blocks::file_sink::make(item_size(), d_dump_filename.data()); d_dump_sink = gr::blocks::file_sink::make(item_size(), d_dump_filename.data());
top_block->connect(d_source_block, 0, d_dump_sink, 0); top_block->connect(get_right_block(), 0, d_dump_sink, 0);
} }
} }
@ -73,10 +81,22 @@ auto ZmqSignalSource::disconnect(gr::top_block_sptr top_block) -> void
{ {
top_block->disconnect(d_dump_sink); top_block->disconnect(d_dump_sink);
} }
if (d_vec_block)
{
top_block->disconnect(d_vec_block);
}
} }
auto ZmqSignalSource::get_right_block() -> gr::basic_block_sptr auto ZmqSignalSource::get_right_block() -> gr::basic_block_sptr
{ {
return d_source_block; auto result = gr::basic_block_sptr();
if (d_vec_block)
result = d_vec_block; // NOLINT
else
result = d_source_block; // NOLINT
return result;
} }

2
src/algorithms/signal_source/adapters/zmq_signal_source.h
View File

@ -21,6 +21,7 @@
// //
#include "concurrent_queue.h" #include "concurrent_queue.h"
#include <gnuradio/blocks/file_sink.h> // for dump #include <gnuradio/blocks/file_sink.h> // for dump
#include <gnuradio/blocks/vector_to_stream.h>
#include <gnuradio/zeromq/sub_source.h> #include <gnuradio/zeromq/sub_source.h>
#include <pmt/pmt.h> #include <pmt/pmt.h>
#include <string> #include <string>
@ -66,6 +67,7 @@ public:
private: private:
gr::zeromq::sub_source::sptr d_source_block; gr::zeromq::sub_source::sptr d_source_block;
gr::blocks::vector_to_stream::sptr d_vec_block;
gr::blocks::file_sink::sptr d_dump_sink; gr::blocks::file_sink::sptr d_dump_sink;
size_t d_item_size; size_t d_item_size;