diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
| commit | bbfc759914da80214fabc70fbbed1edaf39f9e4b (patch) | |
| tree | 712eb6d1d95445bb6535534ce86d7faf1bfe6f90 /gnuradio-runtime/lib/block_executor.cc | |
| parent | 3f469513b94ac992138360caca7e1b53f82214ae (diff) | |
| parent | 597b93798a804cde1783d6d2ab53b348d57c44cd (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gnuradio-runtime/lib/block_executor.cc')
| -rw-r--r-- | gnuradio-runtime/lib/block_executor.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnuradio-runtime/lib/block_executor.cc b/gnuradio-runtime/lib/block_executor.cc index 9be8eaa48d..ded1324fa3 100644 --- a/gnuradio-runtime/lib/block_executor.cc +++ b/gnuradio-runtime/lib/block_executor.cc @@ -193,14 +193,14 @@ namespace gr { int new_alignment = 0; int alignment_state = -1; double rrate; - + block *m = d_block.get(); block_detail *d = m->detail().get(); LOG(*d_log << std::endl << m); max_noutput_items = round_down(d_max_noutput_items, m->output_multiple()); - + if(d->done()){ assert(0); return DONE; @@ -237,7 +237,7 @@ namespace gr { d_output_items.resize (0); d_start_nitems_read.resize(d->ninputs()); LOG(*d_log << " sink\n"); - + max_items_avail = 0; for(int i = 0; i < d->ninputs (); i++) { { @@ -432,7 +432,7 @@ namespace gr { if(d_use_pc) d->start_perf_counters(); #endif /* GR_PERFORMANCE_COUNTERS */ - + // Do the actual work of the block int n = m->general_work(noutput_items, d_ninput_items, d_input_items, d_output_items); |