diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-05-10 05:45:12 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-05-10 05:45:12 -0700 |
| commit | e4f0319eced22c112f7e6a4cc45bc2036d285332 (patch) | |
| tree | 92baa4254f47fd0b62d1d3f69e3b1ddb96dd32d3 /gnuradio-runtime/lib/gr_block_executor.cc | |
| parent | 5fd6b62702369e45ef01a02e12bec1afc5b57200 (diff) | |
| parent | 3e052d303874a07237c4e0c31eef3f7f7a192835 (diff) | |
Merged in 'next' branch.
Diffstat (limited to 'gnuradio-runtime/lib/gr_block_executor.cc')
| -rw-r--r-- | gnuradio-runtime/lib/gr_block_executor.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnuradio-runtime/lib/gr_block_executor.cc b/gnuradio-runtime/lib/gr_block_executor.cc index cfef406412..bb781c90a1 100644 --- a/gnuradio-runtime/lib/gr_block_executor.cc +++ b/gnuradio-runtime/lib/gr_block_executor.cc @@ -91,7 +91,7 @@ min_available_space (gr_block_detail *d, int output_multiple, int min_noutput_it static bool propagate_tags(gr_block::tag_propagation_policy_t policy, gr_block_detail *d, const std::vector<uint64_t> &start_nitems_read, double rrate, - std::vector<gr_tag_t> &rtags) + std::vector<gr_tag_t> &rtags, long block_id) { // Move tags downstream // if a sink, we don't need to move downstream @@ -107,7 +107,7 @@ propagate_tags(gr_block::tag_propagation_policy_t policy, gr_block_detail *d, // every tag on every input propogates to everyone downstream for(int i = 0; i < d->ninputs(); i++) { d->get_tags_in_range(rtags, i, start_nitems_read[i], - d->nitems_read(i)); + d->nitems_read(i), block_id); std::vector<gr_tag_t>::iterator t; if(rrate == 1.0) { @@ -133,7 +133,7 @@ propagate_tags(gr_block::tag_propagation_policy_t policy, gr_block_detail *d, if(d->ninputs() == d->noutputs()) { for(int i = 0; i < d->ninputs(); i++) { d->get_tags_in_range(rtags, i, start_nitems_read[i], - d->nitems_read(i)); + d->nitems_read(i), block_id); std::vector<gr_tag_t>::iterator t; for(t = rtags.begin(); t != rtags.end(); t++) { @@ -450,7 +450,7 @@ gr_block_executor::run_one_iteration() if(!propagate_tags(m->tag_propagation_policy(), d, d_start_nitems_read, m->relative_rate(), - d_returned_tags)) + d_returned_tags, m->unique_id())) goto were_done; if (n == gr_block::WORK_DONE) |