diff options
| author | Josh Blum | 2012-10-04 20:09:59 -0700 |
|---|---|---|
| committer | Josh Blum | 2012-10-04 20:09:59 -0700 |
| commit | 12170824b70fa127fe8ed0ac1b81c627c06bd851 (patch) | |
| tree | cbe9c7a79c09ff23eda48ff62151924b820d27c8 /lib/block_task.cpp | |
| parent | d889b683cd36d5ec679fcfcc35e3ebd731846abb (diff) | |
| parent | 3b26ff66074621c1fd1dc26b616ec1583c2fb024 (diff) | |
| download | sandhi-12170824b70fa127fe8ed0ac1b81c627c06bd851.tar.gz sandhi-12170824b70fa127fe8ed0ac1b81c627c06bd851.tar.bz2 sandhi-12170824b70fa127fe8ed0ac1b81c627c06bd851.zip | |
Merge branch 'master' into port_config
Diffstat (limited to 'lib/block_task.cpp')
| -rw-r--r-- | lib/block_task.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/block_task.cpp b/lib/block_task.cpp index 960b41e..a64b3d7 100644 --- a/lib/block_task.cpp +++ b/lib/block_task.cpp @@ -244,14 +244,11 @@ void BlockActor::handle_task(void) GRAS_FORCE_INLINE void BlockActor::conclusion(void) { - + //missing at least one upstream provider? //since nothing else is coming in, its safe to mark done - if (this->inputs_done.all()) //no upstream providers + if (this->any_inputs_done() or this->forecast_fail) { - if (not this->input_queues.all_ready() or this->forecast_fail) - { - this->mark_done(); - } + this->mark_done(); } //still have IO ready? kick off another task |