From 2d110b1deda68351fdfbf6a8b7cc0c62897d57bc Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 5 Nov 2019 10:10:33 -0800 Subject: rfnoc_graph: Modify find_blocks() to sort return value With this patch, the elements of of the return value of find_blocks() are sorted lexicographically (specifically, using uhd::rfnoc::block_id_it::operator<()). The underlying block_container class stores the blocks in an unordered set, so the return value for find_blocks() was always sorted randomly. multi_usrp_rfnoc had to sort the return values every time find_blocks() was used to get a useful return value. Because find_blocks() had no contract for the order of returned blocks, this change simply sorts the return value before returning it. multi_usrp_rfnoc is modified to remove all the sorts that are now superfluous. A good way to see the change is to run uhd_usrp_probe, which will now contain content like this: | _____________________________________________________ | / | | RFNoC blocks on this device: | | | | * 0/DDC#0 | | * 0/DDC#1 | | * 0/DUC#0 | | * 0/DUC#1 | | * 0/DmaFIFO#0 | | * 0/Radio#0 | | * 0/Radio#1 Assuming the blocks don't change, the order of this list will always be the same following this patch. Note that the order is unrelated to the order on the control crossbar, which it never was. --- host/include/uhd/rfnoc_graph.hpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'host/include') diff --git a/host/include/uhd/rfnoc_graph.hpp b/host/include/uhd/rfnoc_graph.hpp index 34091ddbd..c62eaf558 100644 --- a/host/include/uhd/rfnoc_graph.hpp +++ b/host/include/uhd/rfnoc_graph.hpp @@ -57,17 +57,23 @@ public: * Block Discovery/Retrieval ******************************************/ /*! Returns the block ids of all blocks that match the specified hint + * * Uses block_id_t::match() internally. * If no matching block is found, it returns an empty vector. * - * To access specialized block controller classes (i.e. derived from noc_block_base), - * use the templated version of this function, e.g. + * The returned vector is sorted lexicographically. + * + * To access specialized block controller classes (i.e. derived from + * uhd::rfnoc::noc_block_base), use the templated version of this function: * \code{.cpp} * // Assume DEV is an rfnoc_graph::sptr - * auto null_blocks = DEV->find_blocks("NullSrcSink"); + * auto null_blocks = DEV->find_blocks("NullSrcSink"); * if (null_blocks.empty()) { cout << "No null blocks found!" << endl; } * \endcode + * * \note this access is not thread safe if performed during block enumeration + * + * \returns A sorted list of block IDs that match the hint */ virtual std::vector find_blocks( const std::string& block_id_hint) const = 0; -- cgit v1.2.3