diff options
| author | Josh Blum | 2013-06-09 13:41:27 -0700 |
|---|---|---|
| committer | Josh Blum | 2013-06-09 13:41:27 -0700 |
| commit | 115e9ed0723807c65decc7e8de7d62eec353dab5 (patch) | |
| tree | 1506c67eaf91363e5207d2478905bc6efe9746d5 /lib/gras_impl | |
| parent | 953acfde47963f5ef3da2940d0d02c114127d701 (diff) | |
| download | sandhi-115e9ed0723807c65decc7e8de7d62eec353dab5.tar.gz sandhi-115e9ed0723807c65decc7e8de7d62eec353dab5.tar.bz2 sandhi-115e9ed0723807c65decc7e8de7d62eec353dab5.zip | |
gras: squashed changes to move buffer consumption to post-work
* post-work overhead now covers posting buffers downstream
* tag handler hpp code now inside task main c++ file
Diffstat (limited to 'lib/gras_impl')
| -rw-r--r-- | lib/gras_impl/block_actor.hpp | 3 | ||||
| -rw-r--r-- | lib/gras_impl/block_data.hpp | 1 | ||||
| -rw-r--r-- | lib/gras_impl/input_buffer_queues.hpp | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/lib/gras_impl/block_actor.hpp b/lib/gras_impl/block_actor.hpp index 57f150c..8c9fdf4 100644 --- a/lib/gras_impl/block_actor.hpp +++ b/lib/gras_impl/block_actor.hpp @@ -91,9 +91,6 @@ struct BlockActor : Theron::Actor void task_main(void); void input_fail(const size_t index); void output_fail(const size_t index); - void sort_tags(const size_t index); - void trim_tags(const size_t index); - void trim_msgs(const size_t index); void produce(const size_t index, const size_t items); void consume(const size_t index, const size_t items); void task_kicker(void); diff --git a/lib/gras_impl/block_data.hpp b/lib/gras_impl/block_data.hpp index 9300d9f..170f7c6 100644 --- a/lib/gras_impl/block_data.hpp +++ b/lib/gras_impl/block_data.hpp @@ -64,6 +64,7 @@ struct BlockData std::vector<bool> input_tags_changed; std::vector<std::vector<Tag> > input_tags; std::vector<size_t> num_input_msgs_read; + std::vector<size_t> num_input_bytes_read; std::vector<std::vector<PMCC> > input_msgs; //interruptible thread stuff diff --git a/lib/gras_impl/input_buffer_queues.hpp b/lib/gras_impl/input_buffer_queues.hpp index 8e14ed4..7d31b9a 100644 --- a/lib/gras_impl/input_buffer_queues.hpp +++ b/lib/gras_impl/input_buffer_queues.hpp @@ -332,8 +332,6 @@ GRAS_FORCE_INLINE void InputBufferQueues::push(const size_t i, const SBuffer &bu GRAS_FORCE_INLINE void InputBufferQueues::consume(const size_t i, const size_t bytes_consumed) { - if GRAS_UNLIKELY(bytes_consumed == 0) return; - ASSERT(not _queues[i].empty()); ASSERT((bytes_consumed % _items_sizes[i]) == 0); SBuffer &front = _queues[i].front(); |