[Commit-gnuradio] [gnuradio] 01/11: cleaned up the way setup_rpc() is called, and now is called for all blocks, not just those with stream connections

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 080bbf3dfcef968a2141714852bf691ba442bb2f
Author: Jacob Gilbert <address@hidden>
Date:   Wed Nov 23 06:33:43 2016 -0800

    cleaned up the way setup_rpc() is called, and now is called for all blocks, 
not just those with stream connections
---
 gnuradio-runtime/lib/hier_block2_detail.cc | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc 
b/gnuradio-runtime/lib/hier_block2_detail.cc
index 0d0ddf55..49eb34a 100644
--- a/gnuradio-runtime/lib/hier_block2_detail.cc
+++ b/gnuradio-runtime/lib/hier_block2_detail.cc
@@ -594,12 +594,6 @@ namespace gr {
       basic_block_sptr b;
       b = p->src().block();
 
-      if(ctrlport_on) {
-        if(!b->is_rpc_set()) {
-          b->setup_rpc();
-          b->rpc_set();
-        }
-      }
       if(set_all_min_buff){
         //sets the min buff for every block within hier_block2
         if(min_buff != 0){
@@ -656,12 +650,6 @@ namespace gr {
       }
 
       b = p->dst().block();
-      if(ctrlport_on) {
-        if(!b->is_rpc_set()) {
-          b->setup_rpc();
-          b->rpc_set();
-        }
-      }
       if(set_all_min_buff){
         //sets the min buff for every block within hier_block2
         if(min_buff != 0){
@@ -797,8 +785,16 @@ namespace gr {
 
     // First add the list of singleton blocks
     std::vector<basic_block_sptr>::const_iterator b;   // Because flatten_aux 
is const
-    for(b = d_blocks.begin(); b != d_blocks.end(); b++)
+    for(b = d_blocks.begin(); b != d_blocks.end(); b++) {
       tmp.push_back(*b);
+      // for every block, attempt to setup RPC
+      if(ctrlport_on) {
+        if(!(*b)->is_rpc_set()) {
+          (*b)->setup_rpc();
+          (*b)->rpc_set();
+        }
+      }
+    }
 
     // Now add the list of connected input blocks
     std::stringstream msg;