diff options
author | Martin Braun <martin.braun@ettus.com> | 2016-10-28 10:04:49 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2016-10-28 10:04:49 -0700 |
commit | f9ef7bda990591962a740aa3ab249aee30451ed9 (patch) | |
tree | fedc09bd1aae24c915bd8825292a9d42d583318f /host/lib/experts/expert_container.cpp | |
parent | 248377a1db9f2761fd984528cde11ab66555ebfb (diff) | |
parent | 0786a04bbe584c60817288e51f4ac530c57a8f38 (diff) | |
download | uhd-f9ef7bda990591962a740aa3ab249aee30451ed9.tar.gz uhd-f9ef7bda990591962a740aa3ab249aee30451ed9.tar.bz2 uhd-f9ef7bda990591962a740aa3ab249aee30451ed9.zip |
Merge branch 'maint'
Diffstat (limited to 'host/lib/experts/expert_container.cpp')
-rw-r--r-- | host/lib/experts/expert_container.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/host/lib/experts/expert_container.cpp b/host/lib/experts/expert_container.cpp index edfc2ebe3..78c783790 100644 --- a/host/lib/experts/expert_container.cpp +++ b/host/lib/experts/expert_container.cpp @@ -92,23 +92,28 @@ public: boost::lock_guard<boost::recursive_mutex> resolve_lock(_resolve_mutex); boost::lock_guard<boost::mutex> lock(_mutex); EX_LOG(0, str(boost::format("resolve_all(%s)") % (force?"force":""))); + // Do a full resolve of the graph _resolve_helper("", "", force); } - void resolve_from(const std::string& node_name) + void resolve_from(const std::string&) { boost::lock_guard<boost::recursive_mutex> resolve_lock(_resolve_mutex); boost::lock_guard<boost::mutex> lock(_mutex); EX_LOG(0, str(boost::format("resolve_from(%s)") % node_name)); - _resolve_helper(node_name, "", false); + // Do a full resolve of the graph + // Not optimizing the traversal using node_name to reduce experts complexity + _resolve_helper("", "", false); } - void resolve_to(const std::string& node_name) + void resolve_to(const std::string&) { boost::lock_guard<boost::recursive_mutex> resolve_lock(_resolve_mutex); boost::lock_guard<boost::mutex> lock(_mutex); EX_LOG(0, str(boost::format("resolve_to(%s)") % node_name)); - _resolve_helper("", node_name, false); + // Do a full resolve of the graph + // Not optimizing the traversal using node_name to reduce experts complexity + _resolve_helper("", "", false); } dag_vertex_t& retrieve(const std::string& name) const |