diff options
author | Josh Blum | 2013-09-15 22:01:30 -0700 |
---|---|---|
committer | Josh Blum | 2013-09-15 22:01:30 -0700 |
commit | c4b43b3521f373bc91cd3165b96ced0cb9cf65c1 (patch) | |
tree | 68254ad7bd602e3de98b441ff7e22f050dd73dee /lib/element_impl.hpp | |
parent | 3cf31976f415aaa3799edd307e40bc2e25f3e690 (diff) | |
parent | 75d2c6cc485714efe4b136ade34e78a7b0fb2744 (diff) | |
download | sandhi-c4b43b3521f373bc91cd3165b96ced0cb9cf65c1.tar.gz sandhi-c4b43b3521f373bc91cd3165b96ced0cb9cf65c1.tar.bz2 sandhi-c4b43b3521f373bc91cd3165b96ced0cb9cf65c1.zip |
Merge branch 'config_work' into gr_update
Diffstat (limited to 'lib/element_impl.hpp')
-rw-r--r-- | lib/element_impl.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/element_impl.hpp b/lib/element_impl.hpp index 91497ed..dca7963 100644 --- a/lib/element_impl.hpp +++ b/lib/element_impl.hpp @@ -38,7 +38,7 @@ struct ElementImpl //top block stuff SharedThreadGroup thread_group; Token token; - GlobalBlockConfig top_config; + GlobalBlockConfig global_config; //element tree stuff Element parent; @@ -63,14 +63,14 @@ struct ElementImpl void bcast_prio_msg(const MessageType &msg) { Theron::Receiver receiver; - 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()); MessageType message = msg; message.prio_token = actor->prio_token; actor->GetFramework().Send(message, receiver.GetAddress(), actor->GetAddress()); } - size_t outstandingCount(this->executor->get_workers().size()); + size_t outstandingCount(this->topology->get_workers().size()); while (outstandingCount != 0) { outstandingCount -= receiver.Wait(outstandingCount); |