From 43c7ef3e7807ad3035a2882d237b0441e6102817 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 5 Jun 2013 22:26:26 -0700 Subject: gras: compiles now with separate data struct --- lib/task_fail.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'lib/task_fail.cpp') diff --git a/lib/task_fail.cpp b/lib/task_fail.cpp index 720e2e1..1168698 100644 --- a/lib/task_fail.cpp +++ b/lib/task_fail.cpp @@ -18,41 +18,41 @@ void Block::mark_input_fail(const size_t which_input) void BlockActor::input_fail(const size_t i) { //input failed, accumulate and try again - if (not this->input_queues.is_accumulated(i)) + if (not data->input_queues.is_accumulated(i)) { - this->input_queues.accumulate(i); + data->input_queues.accumulate(i); this->task_kicker(); return; } //otherwise check for done, else wait for more - if (this->inputs_done[i]) + if (data->inputs_done[i]) { this->mark_done(); return; } //check that the input is not already maxed - if (this->input_queues.is_front_maximal(i)) + if (data->input_queues.is_front_maximal(i)) { throw std::runtime_error("input_fail called on maximum_items buffer in " + name); } //mark fail: not ready until a new buffer appears - this->input_queues.fail(i); + data->input_queues.fail(i); } void BlockActor::output_fail(const size_t i) { - SBuffer &buff = this->output_queues.front(i); + SBuffer &buff = data->output_queues.front(i); //check that the input is not already maxed - const size_t front_items = buff.length/this->output_configs[i].item_size; - if (front_items >= this->output_configs[i].maximum_items) + const size_t front_items = buff.length/data->output_configs[i].item_size; + if (front_items >= data->output_configs[i].maximum_items) { throw std::runtime_error("output_fail called on maximum_items buffer in " + name); } //mark fail: not ready until a new buffer appears - this->output_queues.fail(i); + data->output_queues.fail(i); } -- cgit