From 69382ea010dab3cc218774a17cafacfec0dde86d Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Fri, 1 Mar 2013 03:06:22 -0600
Subject: gras: use new flag for marking produce

This way we dont produce stuff when the user gets access to the internal buffer,
but only when the user is calling produce.
---
 gnuradio                      |  2 +-
 grextras                      |  2 +-
 lib/block_task.cpp            | 11 ++++++++---
 lib/gras_impl/block_actor.hpp |  1 +
 lib/topology_handler.cpp      |  1 +
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/gnuradio b/gnuradio
index c60a6dc..e0e4eaf 160000
--- a/gnuradio
+++ b/gnuradio
@@ -1 +1 @@
-Subproject commit c60a6dc8b61c26c37874b27e4440c02e573dca27
+Subproject commit e0e4eafabfc61ff492a30ee05aceebbf9cb27bcf
diff --git a/grextras b/grextras
index 1ebef1d..a90030d 160000
--- a/grextras
+++ b/grextras
@@ -1 +1 @@
-Subproject commit 1ebef1dfa208ea00dd67376cafde89988e0a845c
+Subproject commit a90030d340c64159de8ee23fafbac6640e2efe07
diff --git a/lib/block_task.cpp b/lib/block_task.cpp
index 56d89fb..4d85aaf 100644
--- a/lib/block_task.cpp
+++ b/lib/block_task.cpp
@@ -244,6 +244,7 @@ void BlockActor::produce(const size_t i, const size_t items)
     this->stats.items_produced[i] += items;
     const size_t bytes = items*this->output_configs[i].item_size;
     buff.length += bytes;
+    this->produce_outputs[i] = true;
 }
 
 void BlockActor::produce_buffer(const size_t i, const SBuffer &buffer)
@@ -260,9 +261,13 @@ GRAS_FORCE_INLINE void BlockActor::flush_output(const size_t i)
 {
     if GRAS_UNLIKELY(this->output_queues.empty(i) or this->output_queues.front(i).length == 0) return;
     SBuffer &buff = this->output_queues.front(i);
-    InputBufferMessage buff_msg;
-    buff_msg.buffer = buff;
-    this->post_downstream(i, buff_msg);
+    if GRAS_LIKELY(this->produce_outputs[i])
+    {
+        this->produce_outputs[i] = false;
+        InputBufferMessage buff_msg;
+        buff_msg.buffer = buff;
+        this->post_downstream(i, buff_msg);
+    }
 
     //increment buffer for next use
     buff.offset += buff.length;
diff --git a/lib/gras_impl/block_actor.hpp b/lib/gras_impl/block_actor.hpp
index 8bea03c..d40152a 100644
--- a/lib/gras_impl/block_actor.hpp
+++ b/lib/gras_impl/block_actor.hpp
@@ -140,6 +140,7 @@ struct BlockActor : Apology::Worker
     InputBufferQueues input_queues;
     OutputBufferQueues output_queues;
     BitSet inputs_available;
+    std::vector<bool> produce_outputs;
 
     //tag tracking
     std::vector<bool> input_tags_changed;
diff --git a/lib/topology_handler.cpp b/lib/topology_handler.cpp
index f0a8b21..a3d7e6a 100644
--- a/lib/topology_handler.cpp
+++ b/lib/topology_handler.cpp
@@ -46,6 +46,7 @@ void BlockActor::handle_topology(
     this->input_queues.resize(num_inputs);
     this->output_queues.resize(num_outputs);
     this->inputs_available.resize(num_inputs);
+    this->produce_outputs.resize(num_outputs, false);
     if (num_inputs == 0) this->inputs_available.resize(1, true); //so its always "available"
 
     this->input_tokens.resize(num_inputs);
-- 
cgit