diff options
| author | Josh Blum | 2012-10-14 20:00:49 -0700 |
|---|---|---|
| committer | Josh Blum | 2012-10-14 20:00:49 -0700 |
| commit | abc6715098cc5ca4d83d1227b2c9ca98e33b4a86 (patch) | |
| tree | 304234322d66954c841908b0e51fba75143b9b2f /lib/block_task.cpp | |
| parent | 7962eb546821ddd98f57fa4fb60a8192bf4e34df (diff) | |
| download | sandhi-abc6715098cc5ca4d83d1227b2c9ca98e33b4a86.tar.gz sandhi-abc6715098cc5ca4d83d1227b2c9ca98e33b4a86.tar.bz2 sandhi-abc6715098cc5ca4d83d1227b2c9ca98e33b4a86.zip | |
input_buffer_queues logic cleanup for accumulate implementation
Diffstat (limited to 'lib/block_task.cpp')
| -rw-r--r-- | lib/block_task.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/block_task.cpp b/lib/block_task.cpp index 935f148..69e99a3 100644 --- a/lib/block_task.cpp +++ b/lib/block_task.cpp @@ -104,8 +104,8 @@ void BlockActor::handle_task(void) this->sort_tags(i); ASSERT(this->input_queues.ready(i)); - bool potential_inline; - const SBuffer buff = this->input_queues.front(i, potential_inline); + this->input_queues.accumulate(i, this->input_items_sizes[i]); + const SBuffer &buff = this->input_queues.front(i); void *mem = buff.get(); size_t items = buff.length/this->input_items_sizes[i]; @@ -132,7 +132,7 @@ void BlockActor::handle_task(void) //inline dealings, how and when input buffers can be inlined into output buffers //continue; if ( - potential_inline and + buff.unique() and input_configs[i].inline_buffer and output_inline_index < num_outputs and buff.get_affinity() == this->buffer_affinity @@ -188,7 +188,7 @@ void BlockActor::handle_task(void) //------------------------------------------------------------------ //-- forecast //------------------------------------------------------------------ - VAR(work_noutput_items); + //VAR(work_noutput_items); if (this->forecast_enable) { forecast_again_you_jerk: @@ -217,8 +217,7 @@ void BlockActor::handle_task(void) //------------------------------------------------------------------ //-- the work //------------------------------------------------------------------ - VAR(work_noutput_items); - if (num_inputs) VAR(work_ninput_items[0]); + //VAR(work_noutput_items); this->work_ret = -1; if (this->interruptible_thread) { @@ -229,7 +228,7 @@ void BlockActor::handle_task(void) this->task_work(); } const size_t noutput_items = size_t(work_ret); - VAR(work_ret); + //VAR(work_ret); if (work_ret == Block::WORK_DONE) { |