gras: work on global config that works on hier

1 files changed, 2 insertions, 12 deletions

diff --git a/lib/top_block.cpp b/lib/top_block.cpp
index 0c8572d..dd2fd5d 100644
--- a/lib/top_block.cpp
+++ b/lib/top_block.cpp
@@ -31,16 +31,6 @@ void ElementImpl::top_block_cleanup(void)
     this->executor->commit();
 }
 
-const GlobalBlockConfig &TopBlock::global_config(void) const
-{
-    return (*this)->top_config;
-}
-
-GlobalBlockConfig &TopBlock::global_config(void)
-{
-    return (*this)->top_config;
-}
-
 void TopBlock::commit(void)
 {
     this->start(); //ok to re-start, means update
@@ -62,7 +52,7 @@ void TopBlock::start(void)
     {
         //send the global block config before alloc
         TopConfigMessage message;
-        message.config = (*this)->top_config;
+        message.config = (*this)->global_config;
         (*this)->bcast_prio_msg(message);
     }
     {
@@ -127,7 +117,7 @@ void TopBlock::wait(void)
         }
 
         //loop through blocks looking for non-done blocks with done inputs
-        BOOST_FOREACH(Apology::Worker *w, (*this)->executor->get_workers())
+        BOOST_FOREACH(Apology::Worker *w, (*this)->topology->get_workers())
         {
             BlockActor *actor = dynamic_cast<BlockActor *>(w->get_actor());
             if (actor->data->block_state == BLOCK_STATE_DONE) has_a_done = true;