summaryrefslogtreecommitdiff
path: root/lib/element_impl.hpp
diff options
context:
space:
mode:
authorJosh Blum2013-09-15 22:18:03 -0700
committerJosh Blum2013-09-15 22:18:03 -0700
commit4f50f9d0c52b1efd09d1f7ed7aadbfef94949eb2 (patch)
tree9de5be6ce362241ba53aec8d393dc24f13f69252 /lib/element_impl.hpp
parent4f00d9b66ff6813da0e9fc986fb6fe5d7c693e52 (diff)
parentadfedc68b7f4348a0aad7e5e63a74b0c412ec128 (diff)
downloadsandhi-4f50f9d0c52b1efd09d1f7ed7aadbfef94949eb2.tar.gz
sandhi-4f50f9d0c52b1efd09d1f7ed7aadbfef94949eb2.tar.bz2
sandhi-4f50f9d0c52b1efd09d1f7ed7aadbfef94949eb2.zip
Merge branch 'gr_update'
Diffstat (limited to 'lib/element_impl.hpp')
-rw-r--r--lib/element_impl.hpp6
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);