diff options
| author | Jacob Gilbert <mrjacobagilbert@gmail.com> | 2017-10-04 07:30:36 -0700 |
|---|---|---|
| committer | Jacob Gilbert <mrjacobagilbert@gmail.com> | 2017-10-04 07:30:36 -0700 |
| commit | aa2308eba953289d2058d01cee927ed26cdf1c09 (patch) | |
| tree | ec88a9614bb4fd75ee3e646b6e06a17dae86b888 /gnuradio-runtime/lib/hier_block2_detail.cc | |
| parent | bbed667ecc7ff1ced67fbc87ac66f2b5299a4dc0 (diff) | |
runtime: Moved block-by-block setup_rpc() calls to the end of the flatten_aux() function where the blocks are all identified. Also removed a workaround to the simple_copy example that is no longer relevant with this fix
Diffstat (limited to 'gnuradio-runtime/lib/hier_block2_detail.cc')
| -rw-r--r-- | gnuradio-runtime/lib/hier_block2_detail.cc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc index 49eb34a6d1..f488c25de5 100644 --- a/gnuradio-runtime/lib/hier_block2_detail.cc +++ b/gnuradio-runtime/lib/hier_block2_detail.cc @@ -787,13 +787,6 @@ namespace gr { std::vector<basic_block_sptr>::const_iterator b; // Because flatten_aux is const 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 @@ -901,6 +894,17 @@ namespace gr { std::cout << "flatten_aux finished in top_block" << std::endl; sfg->dump(); } + + // if ctrlport is enabled, call setup RPC for all blocks in the flowgraph + if(ctrlport_on) { + for(b = blocks.begin(); b != blocks.end(); b++) { + if(!(*b)->is_rpc_set()) { + (*b)->setup_rpc(); + (*b)->rpc_set(); + //std::cout << "\t- setup_rpc was run for block " << (*b)->alias() << std::endl; + } + } + } } void |