diff options
author | Aaron Rossetto <aaron.rossetto@ni.com> | 2019-10-17 08:44:11 -0500 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2019-11-26 12:21:32 -0800 |
commit | 0bd233e64210c6605e8a6ec1424fa81f9ea8a681 (patch) | |
tree | f97729a7bba21cdfc45ee756bee1ac0489358544 /host/lib/rfnoc/graph_stream_manager.cpp | |
parent | 912ed28b3df13b9f9c33f2fa92867ec0ac7445fd (diff) | |
download | uhd-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/graph_stream_manager.cpp')
-rw-r--r-- | host/lib/rfnoc/graph_stream_manager.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/host/lib/rfnoc/graph_stream_manager.cpp b/host/lib/rfnoc/graph_stream_manager.cpp index dba913998..f8acab9f2 100644 --- a/host/lib/rfnoc/graph_stream_manager.cpp +++ b/host/lib/rfnoc/graph_stream_manager.cpp @@ -189,7 +189,8 @@ public: const sw_buff_t pyld_buff_fmt, const sw_buff_t mdata_buff_fmt, const uhd::transport::adapter_id_t adapter, - const device_addr_t& xport_args) + const device_addr_t& xport_args, + const std::string& streamer_id) { device_id_t dev = _check_dst_and_find_src( src_addr, adapter, uhd::transport::link_type_t::RX_DATA); @@ -198,7 +199,7 @@ public: allocs.rx++; _alloc_map[chosen] = allocs; return _link_mgrs.at(dev)->create_device_to_host_data_stream( - src_addr, pyld_buff_fmt, mdata_buff_fmt, xport_args); + src_addr, pyld_buff_fmt, mdata_buff_fmt, xport_args, streamer_id); } virtual chdr_tx_data_xport::uptr create_host_to_device_data_stream( @@ -206,7 +207,8 @@ public: const sw_buff_t pyld_buff_fmt, const sw_buff_t mdata_buff_fmt, const uhd::transport::adapter_id_t adapter, - const device_addr_t& xport_args) + const device_addr_t& xport_args, + const std::string& streamer_id) { device_id_t dev = _check_dst_and_find_src( dst_addr, adapter, uhd::transport::link_type_t::TX_DATA); @@ -215,7 +217,7 @@ public: allocs.tx++; _alloc_map[chosen] = allocs; return _link_mgrs.at(dev)->create_host_to_device_data_stream( - dst_addr, pyld_buff_fmt, mdata_buff_fmt, xport_args); + dst_addr, pyld_buff_fmt, mdata_buff_fmt, xport_args, streamer_id); } std::vector<uhd::transport::adapter_id_t> get_adapters(sep_addr_t addr) const |