diff options
| author | Josh Blum | 2013-05-05 17:38:32 -0700 |
|---|---|---|
| committer | Josh Blum | 2013-05-05 17:38:32 -0700 |
| commit | 9e486336d789addc2b9ad215485dc01751613e05 (patch) | |
| tree | 7d4dfcdb0dcb2e56569ea758f63afd627df7ecaf /lib/gras_impl/block_actor.hpp | |
| parent | 16b78fc6828e7a42cdf28fb2d22d288c94f62649 (diff) | |
| parent | 1b84453cc51b07eb9106bcd6731a321ff1924d74 (diff) | |
| download | sandhi-9e486336d789addc2b9ad215485dc01751613e05.tar.gz sandhi-9e486336d789addc2b9ad215485dc01751613e05.tar.bz2 sandhi-9e486336d789addc2b9ad215485dc01751613e05.zip | |
Merge branch 'master' into theron6_work
Diffstat (limited to 'lib/gras_impl/block_actor.hpp')
| -rw-r--r-- | lib/gras_impl/block_actor.hpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gras_impl/block_actor.hpp b/lib/gras_impl/block_actor.hpp index 502f974..170ee1f 100644 --- a/lib/gras_impl/block_actor.hpp +++ b/lib/gras_impl/block_actor.hpp @@ -184,7 +184,9 @@ GRAS_FORCE_INLINE void BlockActor::update_input_avail(const size_t i) GRAS_FORCE_INLINE bool BlockActor::is_input_done(const size_t i) { - return this->inputs_done[i] and not this->inputs_available[i]; + const bool force_done = this->input_configs[i].force_done; + if GRAS_LIKELY(force_done) return this->inputs_done[i] and not this->inputs_available[i]; + return this->inputs_done.all() and this->inputs_available.none(); } GRAS_FORCE_INLINE bool BlockActor::is_work_allowed(void) |