aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/common/io_service_args.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/usrp/common/io_service_args.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/usrp/common/io_service_args.cpp')
-rw-r--r--host/lib/usrp/common/io_service_args.cpp101
1 files changed, 101 insertions, 0 deletions
diff --git a/host/lib/usrp/common/io_service_args.cpp b/host/lib/usrp/common/io_service_args.cpp
new file mode 100644
index 000000000..09af74f36
--- /dev/null
+++ b/host/lib/usrp/common/io_service_args.cpp
@@ -0,0 +1,101 @@
+//
+// Copyright 2019 Ettus Research, a National Instruments brand
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+//
+
+#include <uhd/utils/log.hpp>
+#include <uhdlib/usrp/common/io_service_args.hpp>
+#include <uhdlib/usrp/constrained_device_args.hpp>
+#include <string>
+
+static const std::string LOG_ID = "IO_SRV";
+static const size_t MAX_NUM_XPORT_ADAPTERS = 2;
+
+namespace uhd { namespace usrp {
+
+namespace {
+
+bool get_bool_arg(const device_addr_t& args, const std::string& key, const bool def)
+{
+ constrained_device_args_t::bool_arg arg(key, def);
+ if (args.has_key(key)) {
+ arg.parse(args[key]);
+ }
+ return arg.get();
+}
+
+io_service_args_t::wait_mode_t get_wait_mode_arg(const device_addr_t& args,
+ const std::string& key,
+ const io_service_args_t::wait_mode_t def)
+{
+ constrained_device_args_t::enum_arg<io_service_args_t::wait_mode_t> arg(key,
+ def,
+ {{"poll", io_service_args_t::POLL}, {"block", io_service_args_t::BLOCK}});
+
+ if (args.has_key(key)) {
+ arg.parse(args[key]);
+ }
+ return arg.get();
+}
+
+}; // namespace
+
+io_service_args_t read_io_service_args(
+ const device_addr_t& args, const io_service_args_t& defaults)
+{
+ io_service_args_t io_srv_args;
+ std::string tmp_str, default_str;
+
+ io_srv_args.recv_offload = get_bool_arg(args, "recv_offload", defaults.recv_offload);
+ io_srv_args.send_offload = get_bool_arg(args, "send_offload", defaults.send_offload);
+
+ io_srv_args.recv_offload_wait_mode = get_wait_mode_arg(
+ args, "recv_offload_wait_mode", defaults.recv_offload_wait_mode);
+ io_srv_args.send_offload_wait_mode = get_wait_mode_arg(
+ args, "send_offload_wait_mode", defaults.send_offload_wait_mode);
+
+ io_srv_args.num_poll_offload_threads =
+ args.cast<size_t>("num_poll_offload_threads", defaults.num_poll_offload_threads);
+ if (io_srv_args.num_poll_offload_threads == 0) {
+ UHD_LOG_WARNING(LOG_ID,
+ "Invalid value for num_poll_offload_threads. "
+ "Value must be greater than 0.");
+ io_srv_args.num_poll_offload_threads = 1;
+ }
+
+ auto create_key = [](const std::string& base, size_t index) {
+ return base + "_" + std::to_string(index);
+ };
+
+ for (size_t i = 0; i < MAX_NUM_XPORT_ADAPTERS; i++) {
+ std::string key = create_key("recv_offload_thread_cpu", i);
+ if (args.has_key(key)) {
+ io_srv_args.recv_offload_thread_cpu.push_back(args.cast<size_t>(key, 0));
+ } else {
+ io_srv_args.recv_offload_thread_cpu.push_back({});
+ }
+ }
+
+ for (size_t i = 0; i < MAX_NUM_XPORT_ADAPTERS; i++) {
+ std::string key = create_key("send_offload_thread_cpu", i);
+ if (args.has_key(key)) {
+ io_srv_args.send_offload_thread_cpu.push_back(args.cast<size_t>(key, 0));
+ } else {
+ io_srv_args.send_offload_thread_cpu.push_back({});
+ }
+ }
+
+ for (size_t i = 0; i < io_srv_args.num_poll_offload_threads; i++) {
+ std::string key = create_key("poll_offload_thread_cpu", i);
+ if (args.has_key(key)) {
+ io_srv_args.poll_offload_thread_cpu.push_back(args.cast<size_t>(key, 0));
+ } else {
+ io_srv_args.poll_offload_thread_cpu.push_back({});
+ }
+ }
+
+ return io_srv_args;
+}
+
+}} // namespace uhd::usrp