From 0bd233e64210c6605e8a6ec1424fa81f9ea8a681 Mon Sep 17 00:00:00 2001 From: Aaron Rossetto Date: Thu, 17 Oct 2019 08:44:11 -0500 Subject: 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 Co-Authored-By: Aaron Rossetto --- host/lib/usrp/x300/x300_impl.hpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'host/lib/usrp/x300/x300_impl.hpp') diff --git a/host/lib/usrp/x300/x300_impl.hpp b/host/lib/usrp/x300/x300_impl.hpp index 600d224a5..a3276152a 100644 --- a/host/lib/usrp/x300/x300_impl.hpp +++ b/host/lib/usrp/x300/x300_impl.hpp @@ -108,7 +108,8 @@ private: uhd::endianness_t get_endianness(const uhd::rfnoc::device_id_t local_device_id); uhd::rfnoc::device_id_t get_remote_device_id(); std::vector get_local_device_ids(); - uhd::transport::adapter_id_t get_adapter_id(const uhd::rfnoc::device_id_t local_device_id); + uhd::transport::adapter_id_t get_adapter_id( + const uhd::rfnoc::device_id_t local_device_id); void reset_network(); uhd::rfnoc::clock_iface::sptr get_clock_iface(const std::string& clock_name); uhd::rfnoc::chdr_ctrl_xport::sptr make_ctrl_transport( @@ -120,18 +121,21 @@ private: const uhd::rfnoc::sep_id_pair_t& epids, const uhd::rfnoc::sw_buff_t pyld_buff_fmt, const uhd::rfnoc::sw_buff_t mdata_buff_fmt, - const uhd::device_addr_t& xport_args); + const uhd::device_addr_t& xport_args, + const std::string& streamer_id); uhd::rfnoc::chdr_tx_data_xport::uptr make_tx_data_transport( uhd::rfnoc::mgmt::mgmt_portal& mgmt_portal, const uhd::rfnoc::sep_addr_pair_t& addrs, const uhd::rfnoc::sep_id_pair_t& epids, const uhd::rfnoc::sw_buff_t pyld_buff_fmt, const uhd::rfnoc::sw_buff_t mdata_buff_fmt, - const uhd::device_addr_t& xport_args); + const uhd::device_addr_t& xport_args, + const std::string& streamer_id); private: const uhd::rfnoc::device_id_t _remote_dev_id; - std::unordered_map _adapter_map; + std::unordered_map + _adapter_map; uhd::rfnoc::clock_iface::sptr _bus_clk; uhd::rfnoc::clock_iface::sptr _radio_clk; uhd::usrp::x300::conn_manager::sptr _conn_mgr; -- cgit v1.2.3