1 files changed, 6 insertions, 7 deletions
diff --git a/lib/gras_impl/block_actor.hpp b/lib/gras_impl/block_actor.hpp
index d204ec4..afc248e 100644
--- a/lib/gras_impl/block_actor.hpp
+++ b/lib/gras_impl/block_actor.hpp
@@ -46,15 +46,16 @@ struct BlockActor : Apology::Worker
         this->RegisterHandler(this, &BlockActor::handle_input_token);
         this->RegisterHandler(this, &BlockActor::handle_input_check);
         this->RegisterHandler(this, &BlockActor::handle_input_alloc);
+        this->RegisterHandler(this, &BlockActor::handle_input_update);
 
         this->RegisterHandler(this, &BlockActor::handle_output_buffer);
         this->RegisterHandler(this, &BlockActor::handle_output_token);
         this->RegisterHandler(this, &BlockActor::handle_output_check);
         this->RegisterHandler(this, &BlockActor::handle_output_hint);
         this->RegisterHandler(this, &BlockActor::handle_output_alloc);
+        this->RegisterHandler(this, &BlockActor::handle_output_update);
 
         this->RegisterHandler(this, &BlockActor::handle_self_kick);
-        this->RegisterHandler(this, &BlockActor::handle_update_inputs);
     }
 
     //handlers
@@ -72,15 +73,16 @@ struct BlockActor : Apology::Worker
     void handle_input_token(const InputTokenMessage &, const Theron::Address);
     void handle_input_check(const InputCheckMessage &, const Theron::Address);
     void handle_input_alloc(const InputAllocMessage &, const Theron::Address);
+    void handle_input_update(const InputUpdateMessage &, const Theron::Address);
 
     void handle_output_buffer(const OutputBufferMessage &, const Theron::Address);
     void handle_output_token(const OutputTokenMessage &, const Theron::Address);
     void handle_output_check(const OutputCheckMessage &, const Theron::Address);
     void handle_output_hint(const OutputHintMessage &, const Theron::Address);
     void handle_output_alloc(const OutputAllocMessage &, const Theron::Address);
+    void handle_output_update(const OutputUpdateMessage &, const Theron::Address);
 
     void handle_self_kick(const SelfKickMessage &, const Theron::Address);
-    void handle_update_inputs(const UpdateInputsMessage &, const Theron::Address);
 
     //helpers
     void buffer_returner(const size_t index, SBuffer &buffer);
@@ -93,7 +95,7 @@ struct BlockActor : Apology::Worker
     void produce(const size_t index, const size_t items);
     void consume(const size_t index, const size_t items);
     void produce_buffer(const size_t index, const SBuffer &buffer);
-    void flush_output(const size_t index, const bool force_pop = false);
+    void flush_output(const size_t index);
     bool is_work_allowed(void);
 
     GRAS_FORCE_INLINE bool is_input_done(const size_t i)
@@ -122,11 +124,10 @@ struct BlockActor : Apology::Worker
     BitSet inputs_done;
     BitSet outputs_done;
     std::set<Token> token_pool;
-    std::vector<SBufferToken> output_buffer_tokens;
 
     //buffer queues and ready conditions
     InputBufferQueues input_queues;
-    OutputBufferQueues<SBuffer> output_queues;
+    OutputBufferQueues output_queues;
     BitSet inputs_available;
 
     //tag tracking
@@ -155,8 +156,6 @@ struct BlockActor : Apology::Worker
     long buffer_affinity;
 
     std::vector<std::vector<OutputHintMessage> > output_allocation_hints;
-
-    bool topology_init;
 };
 
 } //namespace gras