summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJosh Blum2012-11-22 21:32:20 -0800
committerJosh Blum2012-11-22 21:32:20 -0800
commit784e7dcf40bd3502f228fbc59d023c49110cd09f (patch)
treec47b4164e9c4cabf424a899fa0ca64e218b509c1 /lib
parent284252b1b34c93b6eb2b4344eee285415b96887a (diff)
downloadsandhi-784e7dcf40bd3502f228fbc59d023c49110cd09f.tar.gz
sandhi-784e7dcf40bd3502f228fbc59d023c49110cd09f.tar.bz2
sandhi-784e7dcf40bd3502f228fbc59d023c49110cd09f.zip
extra asserts for sign on consume/produce
Diffstat (limited to 'lib')
-rw-r--r--lib/block.cpp2
-rw-r--r--lib/block_task.cpp1
-rw-r--r--lib/gras_impl/input_buffer_queues.hpp2
3 files changed, 4 insertions, 1 deletions
diff --git a/lib/block.cpp b/lib/block.cpp
index d84cc8b..63edfd0 100644
--- a/lib/block.cpp
+++ b/lib/block.cpp
@@ -90,11 +90,13 @@ void Block::set_output_config(const size_t which_output, const OutputPortConfig
void Block::consume(const size_t which_input, const size_t num_items)
{
+ ASSERT(long(num_items) > 0); //sign bit set? you dont want a negative
(*this)->block->consume(which_input, num_items);
}
void Block::produce(const size_t which_output, const size_t num_items)
{
+ ASSERT(long(num_items) > 0); //sign bit set? you dont want a negative
(*this)->block->produce(which_output, num_items);
}
diff --git a/lib/block_task.cpp b/lib/block_task.cpp
index 192ea40..7f40f47 100644
--- a/lib/block_task.cpp
+++ b/lib/block_task.cpp
@@ -163,6 +163,7 @@ void BlockActor::handle_task(void)
{
ASSERT(this->output_queues.ready(i));
SBuffer &buff = this->output_queues.front(i);
+ ASSERT(buff.length == 0); //assumes it was flushed last call
void *mem = buff.get();
const size_t bytes = buff.get_actual_length() - buff.offset;
size_t items = bytes/this->output_items_sizes[i];
diff --git a/lib/gras_impl/input_buffer_queues.hpp b/lib/gras_impl/input_buffer_queues.hpp
index ff88240..adc4edd 100644
--- a/lib/gras_impl/input_buffer_queues.hpp
+++ b/lib/gras_impl/input_buffer_queues.hpp
@@ -29,7 +29,7 @@ struct InputBufferQueues
return SBuffer(config);
}
- static SBuffer &get_null_buff(void)
+ static SBuffer &get_null_buff(void)
{
static SBuffer null = make_null_buff();
null.offset = 0;