diff options
| m--------- | gnuradio | 0 | ||||
| -rw-r--r-- | lib/block.cpp | 2 | ||||
| -rw-r--r-- | lib/block_task.cpp | 1 | ||||
| -rw-r--r-- | lib/gras_impl/input_buffer_queues.hpp | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/gnuradio b/gnuradio -Subproject 74a4b20e13093c253ce2f80ae567d44910f2f03 +Subproject 6f492b84208c789a288ec67eea035534f19af0a 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; |