From 837b89e2ec6be2735cede0a8ecc55caeff302b7f Mon Sep 17 00:00:00 2001 From: Ciro Nishiguchi Date: Thu, 7 Nov 2019 16:19:01 -0600 Subject: rfnoc: Rename thread affinity args Rename thread affinity args such that they do not end with an integer. Arg names ending with an integer are interpreted as being targeted at a specific motherboard index in device_addr methods. --- .../include/uhdlib/usrp/common/io_service_args.hpp | 45 ++++++++++------------ 1 file changed, 21 insertions(+), 24 deletions(-) (limited to 'host/lib/include/uhdlib/usrp/common/io_service_args.hpp') diff --git a/host/lib/include/uhdlib/usrp/common/io_service_args.hpp b/host/lib/include/uhdlib/usrp/common/io_service_args.hpp index a8e46d8c3..bdf1fa592 100644 --- a/host/lib/include/uhdlib/usrp/common/io_service_args.hpp +++ b/host/lib/include/uhdlib/usrp/common/io_service_args.hpp @@ -8,7 +8,7 @@ #define INCLUDED_LIBUHD_IO_SERVICE_ARGS_HPP #include -#include +#include namespace uhd { namespace usrp { @@ -29,20 +29,20 @@ namespace uhd { namespace usrp { * always go to the offload thread containing the fewest * connections, with lowest numbered thread as a second * criterion. The default is 1. - * recv_offload_cpu_: an integer to specify cpu affinity of the offload thread. - * N indicates the thread instance, starting with 0 for each - * streamer and ending with the number of transport adapters - * minus one. Only used if the I/O service is configured to - * block. - * send_offload_cpu_: an integer to specify cpu affinity of the offload thread. - * N indicates the thread instance, starting with 0 for each - * streamer and ending with the number of transport adapters - * minus one. Only used if the I/O service is configured to - * block. - * poll_offload_cpu_: an integer to specify cpu affinity of the offload thread. - * N indicates the thread instance, starting with 0 and up to - * num_poll_offload_threads minus 1. Only used if the I/O - * service is configured to poll. + * recv_offload_thread__cpu: an integer to specify cpu affinity of the offload + * thread. N indicates the thread instance, starting + * with 0 for each streamer and ending with the number + * of transport adapters minus one. Only used if the + * I/O service is configured to block. + * send_offload_thread__cpu: an integer to specify cpu affinity of the offload + * thread. N indicates the thread instance, starting + * with 0 for each streamer and ending with the number + * of transport adapters minus one. Only used if the + * I/O service is configured to block. + * poll_offload_thread__cpu: an integer to specify cpu affinity of the offload + * thread. N indicates the thread instance, starting + * with 0 and up to num_poll_offload_threads minus 1. + * Only used if the I/O service is configured to poll. */ struct io_service_args_t { @@ -63,17 +63,14 @@ struct io_service_args_t //! Number of polling threads to use, if wait_mode is set to POLL size_t num_poll_offload_threads = 1; - //! CPU affinity of offload threads, if wait_mode is set to BLOCK (one item - //! per thread) - std::vector> recv_offload_thread_cpu; + //! CPU affinity of offload threads, if wait_mode is set to BLOCK + std::map recv_offload_thread_cpu; - //! CPU affinity of offload threads, if wait_mode is set to BLOCK (one item - //! per thread) - std::vector> send_offload_thread_cpu; + //! CPU affinity of offload threads, if wait_mode is set to BLOCK + std::map send_offload_thread_cpu; - //! CPU affinity of offload threads, if wait_mode is set to POLL (one item - //! per thread) - std::vector> poll_offload_thread_cpu; + //! CPU affinity of offload threads, if wait_mode is set to POLL + std::map poll_offload_thread_cpu; }; /*! Reads I/O service args from provided dictionary -- cgit v1.2.3