aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/rfnoc/rfnoc_graph.cpp
diff options
context:
space:
mode:
authorAaron Rossetto <aaron.rossetto@ni.com>2019-10-17 08:44:11 -0500
committerMartin Braun <martin.braun@ettus.com>2019-11-26 12:21:32 -0800
commit0bd233e64210c6605e8a6ec1424fa81f9ea8a681 (patch)
treef97729a7bba21cdfc45ee756bee1ac0489358544 /host/lib/rfnoc/rfnoc_graph.cpp
parent912ed28b3df13b9f9c33f2fa92867ec0ac7445fd (diff)
downloaduhd-0bd233e64210c6605e8a6ec1424fa81f9ea8a681.tar.gz
uhd-0bd233e64210c6605e8a6ec1424fa81f9ea8a681.tar.bz2
uhd-0bd233e64210c6605e8a6ec1424fa81f9ea8a681.zip
uhd: Introduce I/O service manager
- Implement I/O service detach link methods - The I/O service manager instantiates new I/O services or connects links to existing I/O services based on options provided by the user in stream_args. - Add a streamer ID parameter to methods to create transports so that the I/O service manager can group transports appropriately when using offload threads. - Change X300 and MPMD to use I/O service manager to connect links to I/O services. - There is now a single I/O service manager per rfnoc_graph (and it is also stored in the graph) - The I/O service manager now also knows the device args for the rfnoc_graph it was created with, and can make decisions based upon those (e.g, use a specific I/O service for DPDK, share cores between streamers, etc.) - The I/O Service Manager does not get any decision logic with this commit, though - The MB ifaces for mpmd and x300 now access this global I/O service manager - Add configuration of link parameters with overrides Co-Authored-By: Martin Braun <martin.braun@ettus.com> Co-Authored-By: Aaron Rossetto <aaron.rossetto@ni.com>
Diffstat (limited to 'host/lib/rfnoc/rfnoc_graph.cpp')
-rw-r--r--host/lib/rfnoc/rfnoc_graph.cpp21
1 files changed, 18 insertions, 3 deletions
diff --git a/host/lib/rfnoc/rfnoc_graph.cpp b/host/lib/rfnoc/rfnoc_graph.cpp
index 929ce518d..6ebfe8612 100644
--- a/host/lib/rfnoc/rfnoc_graph.cpp
+++ b/host/lib/rfnoc/rfnoc_graph.cpp
@@ -18,6 +18,7 @@
#include <uhdlib/rfnoc/rfnoc_device.hpp>
#include <uhdlib/rfnoc/rfnoc_rx_streamer.hpp>
#include <uhdlib/rfnoc/rfnoc_tx_streamer.hpp>
+#include <uhdlib/usrp/common/io_service_mgr.hpp>
#include <uhdlib/utils/narrow.hpp>
#include <memory>
@@ -50,6 +51,7 @@ public:
_graph(std::make_unique<uhd::rfnoc::detail::graph_t>()) {
_mb_controllers.reserve(_num_mboards);
// Now initialize all subsystems:
+ _init_io_srv_mgr(dev_addr); // Global I/O Service Manager
_init_mb_controllers();
_init_gsm(); // Graph Stream Manager
try {
@@ -252,11 +254,12 @@ public:
pyld_fmt,
mdata_fmt,
adapter_id,
- rfnoc_streamer->get_stream_args().args);
+ rfnoc_streamer->get_stream_args().args,
+ rfnoc_streamer->get_unique_id());
rfnoc_streamer->connect_channel(strm_port, std::move(xport));
- //// If this worked, then also connect the streamer in the BGL graph
+ // If this worked, then also connect the streamer in the BGL graph
auto dst = get_block(dst_blk);
graph_edge_t edge_info(strm_port, dst_port, graph_edge_t::TX_STREAM, true);
_graph->connect(rfnoc_streamer.get(), dst.get(), edge_info);
@@ -308,7 +311,8 @@ public:
pyld_fmt,
mdata_fmt,
adapter_id,
- rfnoc_streamer->get_stream_args().args);
+ rfnoc_streamer->get_stream_args().args,
+ rfnoc_streamer->get_unique_id());
rfnoc_streamer->connect_channel(strm_port, std::move(xport));
@@ -457,6 +461,14 @@ private:
/**************************************************************************
* Device Setup
*************************************************************************/
+ void _init_io_srv_mgr(const uhd::device_addr_t& dev_addr)
+ {
+ _io_srv_mgr = usrp::io_service_mgr::make(dev_addr);
+ for (size_t mb_idx = 0; mb_idx < _num_mboards; mb_idx++) {
+ _device->get_mb_iface(mb_idx).set_io_srv_mgr(_io_srv_mgr);
+ }
+ }
+
void _init_mb_controllers()
{
UHD_LOG_TRACE(LOG_ID, "Initializing MB controllers...");
@@ -834,6 +846,9 @@ private:
// easy lookups.
size_t _num_mboards;
+ //! Reference to the global I/O Service Manager
+ uhd::usrp::io_service_mgr::sptr _io_srv_mgr;
+
//! Registry for the blocks (it's a separate class)
std::unique_ptr<detail::block_container_t> _block_registry;