From 3502881d73d79ff9b9c610ace5f231046decfe34 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Wed, 8 Feb 2023 15:59:54 +0100 Subject: [PATCH] #276: Update calls to sendMsg and broadcastMsg --- examples/callback/callback.cc | 2 +- examples/collection/transpose.cc | 4 +-- examples/group/group_collective.cc | 2 +- examples/group/group_rooted.cc | 4 +-- .../hello_world_virtual_context.cc | 2 +- examples/hello_world/ring.cc | 2 +- examples/rdma/rdma_simple_get.cc | 2 +- examples/rdma/rdma_simple_get_direct.cc | 2 +- examples/rdma/rdma_simple_put.cc | 4 +-- examples/rdma/rdma_simple_put_direct.cc | 6 ++-- .../termination/termination_collective.cc | 4 +-- examples/termination/termination_rooted.cc | 4 +-- src/vt/collective/reduce/reduce.impl.h | 4 +-- src/vt/collective/scatter/scatter.cc | 2 +- src/vt/collective/scatter/scatter.impl.h | 2 +- src/vt/event/event.cc | 4 +-- .../collective/group_collective_finished.cc | 2 +- .../group/collective/group_info_collective.cc | 30 +++++++++---------- src/vt/group/global/group_default.impl.h | 2 +- src/vt/group/group_info.impl.h | 4 +-- src/vt/objgroup/proxy/proxy_objgroup.impl.h | 2 +- .../objgroup/proxy/proxy_objgroup_elm.impl.h | 2 +- src/vt/parameterization/parameterization.h | 4 +-- .../pipe/callback/anon/callback_anon.impl.h | 4 +-- src/vt/pipe/callback/anon/callback_anon_tl.cc | 2 +- src/vt/pipe/callback/callback_handler_bcast.h | 2 +- src/vt/rdma/collection/rdma_collection.cc | 2 +- src/vt/rdma/rdma.cc | 18 +++++------ src/vt/termination/dijkstra-scholten/comm.cc | 4 +-- src/vt/termination/termination.cc | 16 +++++----- src/vt/topos/location/location.impl.h | 8 ++--- src/vt/trace/trace_user_event.cc | 6 ++-- src/vt/vrt/context/context_vrtmanager.impl.h | 4 +-- tests/perf/comm_cost_curve.cc | 4 +-- tests/perf/ping_pong_am.cc | 6 ++-- tests/unit/active/test_active_bcast_put.cc | 2 +- tests/unit/active/test_active_broadcast.cc | 2 +- tests/unit/active/test_active_send.cc | 8 ++--- tests/unit/active/test_active_send_large.cc | 2 +- tests/unit/active/test_active_send_put.cc | 2 +- tests/unit/active/test_pending_send.cc | 6 ++-- tests/unit/collectives/test_mpi_collective.cc | 2 +- tests/unit/group/test_group.cc | 6 ++-- tests/unit/group/test_group.extended.cc | 2 +- tests/unit/lb/test_lb_data_comm.cc | 12 ++++---- tests/unit/location/test_location.cc | 2 +- tests/unit/mapping/test_mapping_registry.cc | 4 +-- tests/unit/memory/test_memory_active.cc | 4 +-- tests/unit/memory/test_memory_lifetime.cc | 8 ++--- tests/unit/pipe/test_callback_bcast.cc | 6 ++-- ...test_callback_bcast_collection.extended.cc | 4 +-- tests/unit/pipe/test_callback_func.cc | 2 +- tests/unit/pipe/test_callback_func_ctx.cc | 2 +- tests/unit/pipe/test_callback_send.cc | 6 ++-- .../test_callback_send_collection.extended.cc | 4 +-- tests/unit/pipe/test_signal_cleanup.cc | 4 +-- tests/unit/runtime/test_mpi_access_guards.cc | 2 +- tests/unit/scheduler/test_scheduler_loop.cc | 4 +-- tests/unit/termination/test_epoch_guard.cc | 4 +-- tests/unit/termination/test_term_chaining.cc | 12 ++++---- tests/unit/termination/test_term_cleanup.cc | 8 ++--- .../test_termination_action_common.impl.h | 2 +- .../test_termination_channel_counting.impl.h | 4 +-- .../termination/test_termination_reset.cc | 4 +-- tutorial/tutorial_1b.h | 2 +- tutorial/tutorial_1c.h | 2 +- tutorial/tutorial_1e.h | 2 +- tutorial/tutorial_1f.h | 2 +- tutorial/tutorial_1g.h | 8 ++--- tutorial/tutorial_3a.h | 4 +-- 70 files changed, 161 insertions(+), 161 deletions(-) diff --git a/examples/callback/callback.cc b/examples/callback/callback.cc index df734afcaf..c262118616 100644 --- a/examples/callback/callback.cc +++ b/examples/callback/callback.cc @@ -116,7 +116,7 @@ void colHan(TestMsg* msg, MyCol* col) { void bounceCallback(vt::Callback cb) { auto msg = vt::makeMessage(cb); - vt::theMsg()->sendMsg(1, msg); + vt::theMsg()->sendMsg(1, msg); } int main(int argc, char** argv) { diff --git a/examples/collection/transpose.cc b/examples/collection/transpose.cc index 32b1074880..0a4c1ad965 100644 --- a/examples/collection/transpose.cc +++ b/examples/collection/transpose.cc @@ -165,7 +165,7 @@ struct Block : vt::Collection { ); auto const from_idx = getIndex().x(); auto data_msg = vt::makeMessage(data_,from_idx); - vt::theMsg()->sendMsg( + vt::theMsg()->sendMsg( requesting_node, data_msg ); } @@ -313,7 +313,7 @@ static void solveGroupSetup(vt::NodeType this_node, vt::VirtualProxyType coll_pr if (this_node == 1) { auto msg = vt::makeMessage(coll_proxy); vt::envelopeSetGroup(msg->env, group_id); - vt::theMsg()->broadcastMsg(msg); + vt::theMsg()->broadcastMsg(msg); } }, true ); diff --git a/examples/group/group_collective.cc b/examples/group/group_collective.cc index f75ea2664a..e43a4b0e5e 100644 --- a/examples/group/group_collective.cc +++ b/examples/group/group_collective.cc @@ -91,7 +91,7 @@ int main(int argc, char** argv) { if (this_node == 1) { auto msg = vt::makeMessage(); vt::envelopeSetGroup(msg->env, group); - vt::theMsg()->broadcastMsg(msg); + vt::theMsg()->broadcastMsg(msg); } } ); diff --git a/examples/group/group_rooted.cc b/examples/group/group_rooted.cc index bd3f3777ef..094da60fe9 100644 --- a/examples/group/group_rooted.cc +++ b/examples/group/group_rooted.cc @@ -71,7 +71,7 @@ int main(int argc, char** argv) { if (this_node == 0) { auto msg = vt::makeMessage(this_node); - vt::theMsg()->broadcastMsg(msg); + vt::theMsg()->broadcastMsg(msg); using RangeType = vt::group::region::Range; auto list = std::make_unique(num_nodes / 2, num_nodes); @@ -79,7 +79,7 @@ int main(int argc, char** argv) { vt::theGroup()->newGroup(std::move(list), [=](vt::GroupType group){ auto gmsg = vt::makeMessage(this_node); vt::envelopeSetGroup(gmsg->env, group); - vt::theMsg()->broadcastMsg(gmsg); + vt::theMsg()->broadcastMsg(gmsg); }); } diff --git a/examples/hello_world/hello_world_virtual_context.cc b/examples/hello_world/hello_world_virtual_context.cc index 0153a5097e..8058287785 100644 --- a/examples/hello_world/hello_world_virtual_context.cc +++ b/examples/hello_world/hello_world_virtual_context.cc @@ -105,7 +105,7 @@ int main(int argc, char** argv) { // send out the proxy to all the nodes auto msg = vt::makeMessage(proxy); - vt::theMsg()->broadcastMsg(msg); + vt::theMsg()->broadcastMsg(msg); } vt::finalize(); diff --git a/examples/hello_world/ring.cc b/examples/hello_world/ring.cc index b955c930f6..2488dbf24f 100644 --- a/examples/hello_world/ring.cc +++ b/examples/hello_world/ring.cc @@ -75,7 +75,7 @@ static void sendToNext() { vt::NodeType next_node = this_node + 1 >= num_nodes ? 0 : this_node + 1; auto msg = vt::makeMessage(this_node); - vt::theMsg()->sendMsg(next_node, msg); + vt::theMsg()->sendMsg(next_node, msg); } int main(int argc, char** argv) { diff --git a/examples/rdma/rdma_simple_get.cc b/examples/rdma/rdma_simple_get.cc index 6ae5587d49..79d92ceb07 100644 --- a/examples/rdma/rdma_simple_get.cc +++ b/examples/rdma/rdma_simple_get.cc @@ -112,7 +112,7 @@ int main(int argc, char** argv) { auto msg = vt::makeMessage(this_node); msg->han = my_handle; - vt::theMsg()->broadcastMsg(msg); + vt::theMsg()->broadcastMsg(msg); } vt::finalize(); diff --git a/examples/rdma/rdma_simple_get_direct.cc b/examples/rdma/rdma_simple_get_direct.cc index ae4a9e00e7..5a720caab6 100644 --- a/examples/rdma/rdma_simple_get_direct.cc +++ b/examples/rdma/rdma_simple_get_direct.cc @@ -87,7 +87,7 @@ int main(int argc, char** argv) { auto msg = vt::makeMessage(this_node); msg->han = my_handle; - vt::theMsg()->broadcastMsg(msg); + vt::theMsg()->broadcastMsg(msg); } vt::finalize(); diff --git a/examples/rdma/rdma_simple_put.cc b/examples/rdma/rdma_simple_put.cc index 854e3d11e5..b9f24bb036 100644 --- a/examples/rdma/rdma_simple_put.cc +++ b/examples/rdma/rdma_simple_put.cc @@ -88,7 +88,7 @@ static void put_data_fn(HandleMsg* msg) { fmt::print("{}: after put: sending msg back to 0\n", this_node); auto msg2 = vt::makeMessage(this_node); msg2->han = handle; - vt::theMsg()->sendMsg(0, msg2); + vt::theMsg()->sendMsg(0, msg2); } ); } @@ -144,7 +144,7 @@ int main(int argc, char** argv) { auto msg = vt::makeMessage(this_node); msg->han = my_handle; - vt::theMsg()->broadcastMsg(msg, false); + vt::theMsg()->broadcastMsg(msg, false); } vt::finalize(); diff --git a/examples/rdma/rdma_simple_put_direct.cc b/examples/rdma/rdma_simple_put_direct.cc index 7463b0a959..eba91a7c25 100644 --- a/examples/rdma/rdma_simple_put_direct.cc +++ b/examples/rdma/rdma_simple_put_direct.cc @@ -84,7 +84,7 @@ static void putDataFn(HandleMsg* msg) { ); auto back = vt::makeMessage(han); - vt::theMsg()->sendMsg(0, back); + vt::theMsg()->sendMsg(0, back); }); } } @@ -117,8 +117,8 @@ int main(int argc, char** argv) { auto msg1 = vt::makeMessage(my_handle); auto msg2 = vt::makeMessage(my_handle); - vt::theMsg()->sendMsg(1, msg1); - vt::theMsg()->sendMsg(2, msg2); + vt::theMsg()->sendMsg(1, msg1); + vt::theMsg()->sendMsg(2, msg2); } vt::finalize(); diff --git a/examples/termination/termination_collective.cc b/examples/termination/termination_collective.cc index 09ecfa6a4a..90f4ef68f1 100644 --- a/examples/termination/termination_collective.cc +++ b/examples/termination/termination_collective.cc @@ -63,7 +63,7 @@ static void test_handler(TestMsg* msg) { num--; if (num > 0) { auto msg_send = vt::makeMessage(); - vt::theMsg()->sendMsg(nextNode(), msg_send); + vt::theMsg()->sendMsg(nextNode(), msg_send); } } @@ -89,7 +89,7 @@ int main(int argc, char** argv) { { auto msg = vt::makeMessage(); vt::envelopeSetEpoch(msg->env, epoch); - vt::theMsg()->sendMsg(nextNode(), msg); + vt::theMsg()->sendMsg(nextNode(), msg); } vt::theTerm()->finishedEpoch(epoch); diff --git a/examples/termination/termination_rooted.cc b/examples/termination/termination_rooted.cc index 08c3977b2f..3eb2c752d0 100644 --- a/examples/termination/termination_rooted.cc +++ b/examples/termination/termination_rooted.cc @@ -63,7 +63,7 @@ static void test_handler(TestMsg* msg) { num--; if (num > 0) { auto msg_send = vt::makeMessage(); - vt::theMsg()->sendMsg(nextNode(), msg_send); + vt::theMsg()->sendMsg(nextNode(), msg_send); } } @@ -88,7 +88,7 @@ int main(int argc, char** argv) { auto msg = vt::makeMessage(); vt::envelopeSetEpoch(msg->env, epoch); - vt::theMsg()->sendMsg(nextNode(), msg); + vt::theMsg()->sendMsg(nextNode(), msg); vt::theTerm()->finishedEpoch(epoch); } diff --git a/src/vt/collective/reduce/reduce.impl.h b/src/vt/collective/reduce/reduce.impl.h index f9a6d4d4bf..ccd37b57c4 100644 --- a/src/vt/collective/reduce/reduce.impl.h +++ b/src/vt/collective/reduce/reduce.impl.h @@ -282,7 +282,7 @@ void Reduce::startReduce(detail::ReduceStamp id, bool use_num_contrib) { scope_.str(), detail::stringizeStamp(id), root, this_node ); - theMsg()->sendMsg>(root, typed_msg); + theMsg()->sendMsg>(root, typed_msg); } else { vt_debug_print( normal, reduce, @@ -300,7 +300,7 @@ void Reduce::startReduce(detail::ReduceStamp id, bool use_num_contrib) { scope_.str(), detail::stringizeStamp(id), parent ); - theMsg()->sendMsg>(parent, typed_msg); + theMsg()->sendMsg>(parent, typed_msg); } } } diff --git a/src/vt/collective/scatter/scatter.cc b/src/vt/collective/scatter/scatter.cc index 370672f88a..1d9ee9dde0 100644 --- a/src/vt/collective/scatter/scatter.cc +++ b/src/vt/collective/scatter/scatter.cc @@ -112,7 +112,7 @@ void Scatter::scatterIn(ScatterMsg* msg) { ); std::memcpy(ptr, in_ptr, child_bytes_size); in_ptr += child_bytes_size; - theMsg()->sendMsg( + theMsg()->sendMsg( child, child_msg ); }); diff --git a/src/vt/collective/scatter/scatter.impl.h b/src/vt/collective/scatter/scatter.impl.h index 0e757b67fb..8423d08177 100644 --- a/src/vt/collective/scatter/scatter.impl.h +++ b/src/vt/collective/scatter/scatter.impl.h @@ -93,7 +93,7 @@ void Scatter::scatter( auto const& this_node = theContext()->getNode(); scatter_msg->user_han = handler; if (this_node != root_node) { - theMsg()->sendMsg( + theMsg()->sendMsg( root_node, scatter_msg ); } else { diff --git a/src/vt/event/event.cc b/src/vt/event/event.cc index f9b8dd7653..59737386cc 100644 --- a/src/vt/event/event.cc +++ b/src/vt/event/event.cc @@ -123,7 +123,7 @@ EventType AsyncEvent::attachAction(EventType const& event, ActionType callable) event, event_id, static_cast(event_state), this_node ); - theMsg()->sendMsg( + theMsg()->sendMsg( owning_node, msg ); @@ -162,7 +162,7 @@ EventType AsyncEvent::attachAction(EventType const& event, ActionType callable) vtAssertExpr(send_back == msg->sent_from_node_); auto msg_send = makeMessage(event, msg->event_back_); - theMsg()->sendMsg( + theMsg()->sendMsg( send_back, msg_send ); }; diff --git a/src/vt/group/collective/group_collective_finished.cc b/src/vt/group/collective/group_collective_finished.cc index 2b7b1864e6..a327676f17 100644 --- a/src/vt/group/collective/group_collective_finished.cc +++ b/src/vt/group/collective/group_collective_finished.cc @@ -68,7 +68,7 @@ void InfoColl::CollSetupFinished::operator()(FinishedReduceMsg* msg) { auto nmsg = makeMessage( msg->getGroup(),info->new_tree_cont_ ); - theMsg()->sendMsg( + theMsg()->sendMsg( info->known_root_node_, nmsg ); } else { diff --git a/src/vt/group/collective/group_info_collective.cc b/src/vt/group/collective/group_info_collective.cc index 248c02deda..7c7075eb67 100644 --- a/src/vt/group/collective/group_info_collective.cc +++ b/src/vt/group/collective/group_info_collective.cc @@ -227,7 +227,7 @@ void InfoColl::setupCollective() { auto msg = makeMessage( group_, up_tree_cont_, in_group, size, child ); - theMsg()->sendMsg(parent, msg); + theMsg()->sendMsg(parent, msg); } } @@ -336,7 +336,7 @@ void InfoColl::upTree() { auto msg = makeMessage( group,new_root_cont_,true,subtree_zero,root_node,0,extra ); - theMsg()->sendMsg(root_node, msg); + theMsg()->sendMsg(root_node, msg); for (std::size_t i = 1; i < msg_list.size(); i++) { vt_debug_print( @@ -347,7 +347,7 @@ void InfoColl::upTree() { msg_list[i]->setOpID(down_tree_cont_); auto pmsg = promoteMsg(msg_list[i]); - theMsg()->sendMsg(root_node, pmsg); + theMsg()->sendMsg(root_node, pmsg); ++send_down_; } in_phase_two_ = true; @@ -377,7 +377,7 @@ void InfoColl::upTree() { auto cmsg = makeMessage( group,op,is_in_group,total_subtree,child,level ); - theMsg()->sendMsg(p, cmsg); + theMsg()->sendMsg(p, cmsg); for (auto&& msg : msg_in_group) { span_children_.push_back(msg->getChild()); @@ -406,14 +406,14 @@ void InfoColl::upTree() { auto msg = makeMessage( group,op,is_in_group,static_cast(subtree_),child,0,extra ); - theMsg()->sendMsg(p, msg); + theMsg()->sendMsg(p, msg); /* * Forward all the children messages up the tree (up to 2 of them) */ for (std::size_t i = 0; i < msg_in_group.size(); i++) { // new MsgPtr to avoid thief of original in collection auto msg_out = promoteMsg(msg_in_group[i].get()); - theMsg()->sendMsg(p, msg_out); + theMsg()->sendMsg(p, msg_out); } } else if (is_in_group && msg_in_group.size() == 1) { /* @@ -438,10 +438,10 @@ void InfoColl::upTree() { auto msg = makeMessage( group,op,is_in_group,total_subtree,child,0,extra ); - theMsg()->sendMsg(p, msg); + theMsg()->sendMsg(p, msg); // new MsgPtr to avoid thief of original in collection auto msg_out = promoteMsg(msg_in_group[0].get()); - theMsg()->sendMsg(p, msg_out); + theMsg()->sendMsg(p, msg_out); } else { vtAssertExpr(msg_in_group.size() > 2); @@ -478,7 +478,7 @@ void InfoColl::upTree() { auto msg = makeMessage( group,op,is_in_group,total_subtree,child,0,extra ); - theMsg()->sendMsg(p, msg); + theMsg()->sendMsg(p, msg); vt_debug_print( verbose, group, @@ -494,7 +494,7 @@ void InfoColl::upTree() { GroupCollectiveMsg* tmsg = *iter; c[i] = tmsg->getChild(); auto pmsg = promoteMsg(tmsg); - theMsg()->sendMsg(p, pmsg); + theMsg()->sendMsg(p, pmsg); iter++; } @@ -503,7 +503,7 @@ void InfoColl::upTree() { GroupCollectiveMsg* tmsg = *iter; tmsg->setOpID(down_tree_cont_); auto pmsg = promoteMsg(tmsg); - theMsg()->sendMsg(c[i % extra], pmsg); + theMsg()->sendMsg(c[i % extra], pmsg); ++send_down_; ++iter; } @@ -639,13 +639,13 @@ void InfoColl::downTree(GroupCollectiveMsg* msg) { auto const& num = collective_->span_children_.size(); auto const& child = collective_->span_children_[msg->getChild() % num]; auto nmsg = makeMessage(*msg); - theMsg()->sendMsg(child, nmsg); + theMsg()->sendMsg(child, nmsg); ++send_down_; } auto const& group_ = getGroupID(); auto nmsg = makeMessage(group_,down_tree_fin_cont_); - theMsg()->sendMsg(from, nmsg); + theMsg()->sendMsg(from, nmsg); } void InfoColl::newTree(NodeType const& parent) { @@ -686,7 +686,7 @@ void InfoColl::sendDownNewTree() { group_, c ); auto msg = makeMessage(group_,new_tree_cont_); - theMsg()->sendMsg(c, msg); + theMsg()->sendMsg(c, msg); } } @@ -727,7 +727,7 @@ void InfoColl::finalize() { auto msg = makeMessage( group_,finalize_cont_,known_root_node_,is_default_group_ ); - theMsg()->sendMsg(c, msg); + theMsg()->sendMsg(c, msg); } if (!is_in_group) { diff --git a/src/vt/group/global/group_default.impl.h b/src/vt/group/global/group_default.impl.h index 57ec37eca8..8d50239776 100644 --- a/src/vt/group/global/group_default.impl.h +++ b/src/vt/group/global/group_default.impl.h @@ -65,7 +65,7 @@ template * handler> } else { auto msg = makeMessage(); envelopeSetTag(msg->env, phase); - theMsg()->sendMsg(node, msg); + theMsg()->sendMsg(node, msg); } } diff --git a/src/vt/group/group_info.impl.h b/src/vt/group/group_info.impl.h index ba8ca3113b..10fdfd5794 100644 --- a/src/vt/group/group_info.impl.h +++ b/src/vt/group/group_info.impl.h @@ -115,7 +115,7 @@ template if (op_id != no_op_id) { // Send back message auto retmsg = makeMessage(group, op_id); - theMsg()->sendMsg( + theMsg()->sendMsg( parent, retmsg ); } @@ -151,7 +151,7 @@ template auto contmsg = makeMessage(group, op_id); if (parent != this_node) { - theMsg()->sendMsg( + theMsg()->sendMsg( parent, contmsg ); } else { diff --git a/src/vt/objgroup/proxy/proxy_objgroup.impl.h b/src/vt/objgroup/proxy/proxy_objgroup.impl.h index 78a9b30ece..078e65231c 100644 --- a/src/vt/objgroup/proxy/proxy_objgroup.impl.h +++ b/src/vt/objgroup/proxy/proxy_objgroup.impl.h @@ -217,7 +217,7 @@ messaging::PendingSend Proxy::broadcast(Args&&... args) const { template * f> messaging::PendingSend Proxy::broadcastMsg(messaging::MsgPtrThief msg, TagType tag) const { - return theMsg()->broadcastMsg(msg, true, tag); + return theMsg()->broadcastMsg(msg, true, tag); } template diff --git a/src/vt/objgroup/proxy/proxy_objgroup_elm.impl.h b/src/vt/objgroup/proxy/proxy_objgroup_elm.impl.h index 9570f60dc7..4641f718bc 100644 --- a/src/vt/objgroup/proxy/proxy_objgroup_elm.impl.h +++ b/src/vt/objgroup/proxy/proxy_objgroup_elm.impl.h @@ -116,7 +116,7 @@ inline ProxyElm::ProxyElm(NodeType in_node) : node_{in_node} {} template * f, typename... Args> void ProxyElm::send(Args&&... args) const { - vt::theMsg()->sendMsg( + vt::theMsg()->sendMsg( node_, vt::makeMessage(std::forward(args)...)); } diff --git a/src/vt/parameterization/parameterization.h b/src/vt/parameterization/parameterization.h index eb0fa73191..31363577ee 100644 --- a/src/vt/parameterization/parameterization.h +++ b/src/vt/parameterization/parameterization.h @@ -150,7 +150,7 @@ struct Param : runtime::component::Component { auto m = makeMessage>( han, std::forward>(tup) ); - theMsg()->sendMsg, dataMessageHandler>(dest, m); + theMsg()->sendMsg(dest, m); } template @@ -169,7 +169,7 @@ struct Param : runtime::component::Component { MsgSharedPtr m ) { auto pmsg = promoteMsg(m.get()); - theMsg()->sendMsg(dest, pmsg); + theMsg()->sendMsg(dest, pmsg); } template diff --git a/src/vt/pipe/callback/anon/callback_anon.impl.h b/src/vt/pipe/callback/anon/callback_anon.impl.h index 83a84f7dd1..04378a0a29 100644 --- a/src/vt/pipe/callback/anon/callback_anon.impl.h +++ b/src/vt/pipe/callback/anon/callback_anon.impl.h @@ -80,7 +80,7 @@ CallbackAnon::triggerDispatch(SignalDataType* data, PipeType const& pid) { triggerPipe(pid); } else { auto msg = makeMessage(pid); - theMsg()->sendMsg(pipe_node, msg); + theMsg()->sendMsg(pipe_node, msg); } } @@ -105,7 +105,7 @@ CallbackAnon::triggerDispatch(SignalDataType* data, PipeType const& pid) { */ setPipeType(data->env); envelopeSetGroup(data->env,pid); - theMsg()->sendMsg(pipe_node, data); + theMsg()->sendMsg(pipe_node, data); } } diff --git a/src/vt/pipe/callback/anon/callback_anon_tl.cc b/src/vt/pipe/callback/anon/callback_anon_tl.cc index dc2b2aab8a..02f76bb1c0 100644 --- a/src/vt/pipe/callback/anon/callback_anon_tl.cc +++ b/src/vt/pipe/callback/anon/callback_anon_tl.cc @@ -65,7 +65,7 @@ void CallbackAnonTypeless::triggerVoid(PipeType const& pipe) { theCB()->triggerPipe(pipe); } else { auto msg = makeMessage(pipe,true); - theMsg()->sendMsg(pipe_node, msg); + theMsg()->sendMsg(pipe_node, msg); } } diff --git a/src/vt/pipe/callback/callback_handler_bcast.h b/src/vt/pipe/callback/callback_handler_bcast.h index 411042b205..b53e5cdf03 100644 --- a/src/vt/pipe/callback/callback_handler_bcast.h +++ b/src/vt/pipe/callback/callback_handler_bcast.h @@ -62,7 +62,7 @@ struct CallbackBcast : CallbackBase> { private: void trigger_(SignalDataType* data) override { - theMsg()->broadcastMsg(data); + theMsg()->broadcastMsg(data); } }; diff --git a/src/vt/rdma/collection/rdma_collection.cc b/src/vt/rdma/collection/rdma_collection.cc index 04085d3c83..c8565a1b9a 100644 --- a/src/vt/rdma/collection/rdma_collection.cc +++ b/src/vt/rdma/collection/rdma_collection.cc @@ -125,7 +125,7 @@ namespace vt { namespace rdma { if (tag != no_tag) { envelopeSetTag(msg->env, tag); } - theMsg()->sendMsg( + theMsg()->sendMsg( default_node, msg ); diff --git a/src/vt/rdma/rdma.cc b/src/vt/rdma/rdma.cc index d451bc8eda..522bec52f3 100644 --- a/src/vt/rdma/rdma.cc +++ b/src/vt/rdma/rdma.cc @@ -187,7 +187,7 @@ RDMAManager::RDMAManager() ); if (send_back != uninitialized_destination) { auto new_msg = makeMessage(op_id); - theMsg()->sendMsg(send_back, new_msg); + theMsg()->sendMsg(send_back, new_msg); } }, false, recv_node ); @@ -228,7 +228,7 @@ RDMAManager::RDMAManager() ); if (send_back != uninitialized_destination) { auto new_msg = makeMessage(op_id); - theMsg()->sendMsg( + theMsg()->sendMsg( send_back, new_msg ); } @@ -250,7 +250,7 @@ RDMAManager::RDMAManager() ); if (send_back) { auto new_msg = makeMessage(op_id); - theMsg()->sendMsg( + theMsg()->sendMsg( send_back, new_msg ); } @@ -669,7 +669,7 @@ void RDMAManager::putData( envelopeSetTag(msg->env, tag); } - theMsg()->sendMsg( + theMsg()->sendMsg( put_node, msg, no_tag ); @@ -965,7 +965,7 @@ void RDMAManager::getDataIntoBuf( if (tag != no_tag) { envelopeSetTag(msg->env, tag); } - theMsg()->sendMsg(getNode, msg); + theMsg()->sendMsg(getNode, msg); pending_ops_.emplace( std::piecewise_construct, @@ -1002,7 +1002,7 @@ void RDMAManager::getData( if (tag != no_tag) { envelopeSetTag(msg->env, tag); } - theMsg()->sendMsg(getNode, msg); + theMsg()->sendMsg(getNode, msg); pending_ops_.emplace( std::piecewise_construct, @@ -1095,7 +1095,7 @@ void RDMAManager::setupChannelWithRemote( auto msg = makeMessage( type, han, num_bytes, tag, cb, dest, override_target ); - theMsg()->sendMsg(other_node, msg); + theMsg()->sendMsg(other_node, msg); return createDirectChannelInternal( type, han, dest, nullptr, target, tag, num_bytes @@ -1295,7 +1295,7 @@ void RDMAManager::createDirectChannelInternal( auto msg = makeMessage( type, han, unique_channel_tag, target, this_node, cb ); - theMsg()->sendMsg(target, msg); + theMsg()->sendMsg(target, msg); } else { return createDirectChannelFinish( type, han, non_target, action, channel_tag, is_target, num_bytes, @@ -1337,7 +1337,7 @@ void RDMAManager::removeDirectChannel( auto msg = makeMessage( RDMA_TypeType::Get, han, no_byte, no_tag, cb ); - theMsg()->sendMsg(target, msg); + theMsg()->sendMsg(target, msg); } else { auto iter = channels_.find( makeChannelLookup(han,RDMA_TypeType::Get,target,this_node) diff --git a/src/vt/termination/dijkstra-scholten/comm.cc b/src/vt/termination/dijkstra-scholten/comm.cc index 998429afdb..3788348429 100644 --- a/src/vt/termination/dijkstra-scholten/comm.cc +++ b/src/vt/termination/dijkstra-scholten/comm.cc @@ -66,7 +66,7 @@ namespace vt { namespace term { namespace ds { vtAssertExpr(successor != node); auto msg = makeMessage(epoch,node,successor,count); theMsg()->markAsTermMessage(msg); - theMsg()->sendMsg(successor, msg); + theMsg()->sendMsg(successor, msg); } /*static*/ void StateDS::acknowledge( @@ -81,7 +81,7 @@ namespace vt { namespace term { namespace ds { vtAssertExpr(predecessor != node); auto msg = makeMessage(epoch,node,predecessor,count); theMsg()->markAsTermMessage(msg); - theMsg()->sendMsg(predecessor, msg); + theMsg()->sendMsg(predecessor, msg); } /*static*/ void StateDS::rootTerminated(EpochType epoch) { diff --git a/src/vt/termination/termination.cc b/src/vt/termination/termination.cc index d0af8168c4..a8a5db7dd7 100644 --- a/src/vt/termination/termination.cc +++ b/src/vt/termination/termination.cc @@ -365,7 +365,7 @@ bool TerminationDetector::propagateEpoch(TermStateType& state) { parent, print_ptr(msg.get()), state.getEpoch(), state.getCurWave() ); - theMsg()->sendMsg(parent, msg); + theMsg()->sendMsg(parent, msg); } else /*if (is_root) */ { is_term = state.g_prod1 == state.g_cons1 and @@ -404,7 +404,7 @@ bool TerminationDetector::propagateEpoch(TermStateType& state) { if (is_term) { auto msg = makeMessage(state.getEpoch()); theMsg()->markAsTermMessage(msg); - theMsg()->broadcastMsg(msg, false); + theMsg()->broadcastMsg(msg, false); vt_debug_print( terse, term, @@ -441,7 +441,7 @@ bool TerminationDetector::propagateEpoch(TermStateType& state) { auto msg = makeMessage(state.getEpoch(), state.getCurWave()); theMsg()->markAsTermMessage(msg); - theMsg()->broadcastMsg(msg, false); + theMsg()->broadcastMsg(msg, false); } } @@ -520,7 +520,7 @@ void TerminationDetector::countsConstant(TermStateType& state) { if (not theConfig()->vt_no_detect_hang) { auto msg = makeMessage(); theMsg()->markAsTermMessage(msg.get()); - theMsg()->broadcastMsg(msg, false); + theMsg()->broadcastMsg(msg, false); hangCheckHandler(nullptr); } } @@ -537,7 +537,7 @@ void TerminationDetector::startEpochGraphBuild() { if (theConfig()->vt_epoch_graph_on_hang) { auto msg = makeMessage(); theMsg()->markAsTermMessage(msg.get()); - theMsg()->broadcastMsg(msg, false); + theMsg()->broadcastMsg(msg, false); buildLocalGraphHandler(nullptr); } } @@ -705,7 +705,7 @@ void TerminationDetector::inquireTerminated( bool const is_ready = true; auto msg = makeMessage(epoch,is_ready); - theMsg()->sendMsg(from, msg); + theMsg()->sendMsg(from, msg); }); } @@ -773,7 +773,7 @@ TermStatusEnum TerminationDetector::testEpochTerminated(EpochType epoch) { * terminated or not */ auto msg = makeMessage(epoch,this_node_); - theMsg()->sendMsg(root, msg); + theMsg()->sendMsg(root, msg); epoch_wait_status_.insert(epoch); } status = TermStatusEnum::Remote; @@ -957,7 +957,7 @@ void TerminationDetector::initializeRootedWaveEpoch( */ auto msg = makeMessage(epoch); theMsg()->markAsTermMessage(msg); - theMsg()->broadcastMsg(msg, false); + theMsg()->broadcastMsg(msg, false); /* * Setup the new rooted epoch locally on the root node (this node) diff --git a/src/vt/topos/location/location.impl.h b/src/vt/topos/location/location.impl.h index 7ffeaa7efa..b0f065f3ad 100644 --- a/src/vt/topos/location/location.impl.h +++ b/src/vt/topos/location/location.impl.h @@ -174,7 +174,7 @@ void EntityLocationCoord::registerEntity( ); msg->setResolvedNode(this_node); theMsg()->markAsLocationMessage(msg); - theMsg()->sendMsg::updateLocation>(home, msg); + theMsg()->sendMsg<&EntityLocationCoord::updateLocation>(home, msg); } } } @@ -424,7 +424,7 @@ void EntityLocationCoord::getLocation( this_inst, id, event_id, this_node, home_node ); theMsg()->markAsLocationMessage(msg); - theMsg()->sendMsg::getLocationHandler>(home_node, msg); + theMsg()->sendMsg<&EntityLocationCoord::getLocationHandler>(home_node, msg); // save a pending action when information about location arrives pending_actions_.emplace( std::piecewise_construct, @@ -497,7 +497,7 @@ void EntityLocationCoord::sendEagerUpdate( auto msg = makeMessage( this_inst, id, ask_node, home_node, deliver_node ); - theMsg()->sendMsg::recvEagerUpdate>(ask_node, msg); + theMsg()->sendMsg<&EntityLocationCoord::recvEagerUpdate>(ask_node, msg); } } @@ -892,7 +892,7 @@ template ); msg2->setResolvedNode(node); theMsg()->markAsLocationMessage(msg2); - theMsg()->sendMsg::updateLocation>(ask_node, msg2); + theMsg()->sendMsg<&EntityLocationCoord::updateLocation>(ask_node, msg2); }); theMsg()->popEpoch(epoch); theTerm()->consume(epoch); diff --git a/src/vt/trace/trace_user_event.cc b/src/vt/trace/trace_user_event.cc index 3d7e74a9bd..483f0dec80 100644 --- a/src/vt/trace/trace_user_event.cc +++ b/src/vt/trace/trace_user_event.cc @@ -87,7 +87,7 @@ UserEventIDType UserEventRegistry::hash(std::string const& in_event_name) { auto const node = theContext()->getNode(); if (node != 0) { auto msg = makeMessage(false, id, in_event_name); - theMsg()->sendMsg(0, msg); + theMsg()->sendMsg(0, msg); } } return id; @@ -99,7 +99,7 @@ UserEventIDType UserEventRegistry::rooted(std::string const& in_event_name) { auto const node = theContext()->getNode(); if (node != 0) { auto msg = makeMessage(false, id, in_event_name); - theMsg()->sendMsg(0, msg); + theMsg()->sendMsg(0, msg); } return id; } @@ -112,7 +112,7 @@ UserEventIDType UserEventRegistry::user( auto const node = theContext()->getNode(); if (node != 0) { auto msg = makeMessage(true, id, in_event_name); - theMsg()->sendMsg(0, msg); + theMsg()->sendMsg(0, msg); } return id; } diff --git a/src/vt/vrt/context/context_vrtmanager.impl.h b/src/vt/vrt/context/context_vrtmanager.impl.h index 5f75805da7..39d3bad273 100644 --- a/src/vt/vrt/context/context_vrtmanager.impl.h +++ b/src/vt/vrt/context/context_vrtmanager.impl.h @@ -105,7 +105,7 @@ template auto send_msg = makeMessage( cons_node, req_node, request_id, new_proxy ); - theMsg()->sendMsg( + theMsg()->sendMsg( req_node, send_msg ); } @@ -218,7 +218,7 @@ VirtualProxyType VirtualContextManager::makeVirtualRemote( sys_msg->info = *info.get(); - theMsg()->sendMsg>(dest, sys_msg); + theMsg()->sendMsg>(dest, sys_msg); return return_proxy; } diff --git a/tests/perf/comm_cost_curve.cc b/tests/perf/comm_cost_curve.cc index d7cca1e673..c5366e4478 100644 --- a/tests/perf/comm_cost_curve.cc +++ b/tests/perf/comm_cost_curve.cc @@ -78,7 +78,7 @@ static void handler(PingMsg*) { count++; if (count == pings) { auto msg = vt::makeMessage(1); - vt::theMsg()->sendMsg(0, msg); + vt::theMsg()->sendMsg(0, msg); count = 0; } } @@ -88,7 +88,7 @@ void sender() { auto start = vt::timing::getCurrentTime(); for (int i = 0; i < pings; i++) { auto msg = vt::makeMessage(bytes); - vt::theMsg()->sendMsg(1, msg); + vt::theMsg()->sendMsg(1, msg); } vt::theSched()->runSchedulerWhile([]{return !is_done; }); diff --git a/tests/perf/ping_pong_am.cc b/tests/perf/ping_pong_am.cc index 182685840f..cecb2445ab 100644 --- a/tests/perf/ping_pong_am.cc +++ b/tests/perf/ping_pong_am.cc @@ -66,7 +66,7 @@ void handlerFinished(MyMsg* msg); void handler(MyMsg* in_msg) { auto msg = makeMessage(); - theMsg()->sendMsg(0, msg); + theMsg()->sendMsg<&handlerFinished>(0, msg); } struct NodeObj { @@ -88,7 +88,7 @@ struct NodeObj { void perfPingPong(MyMsg* in_msg) { test_obj_->StartTimer(fmt::format("{} ping-pong", i)); auto msg = makeMessage(); - theMsg()->sendMsg(1, msg); + theMsg()->sendMsg<&handler>(1, msg); } private: @@ -104,7 +104,7 @@ void handlerFinished(MyMsg* msg) { } else { i++; auto msg = makeMessage(); - theMsg()->sendMsg(1, msg); + theMsg()->sendMsg<&handler>(1, msg); } } diff --git a/tests/unit/active/test_active_bcast_put.cc b/tests/unit/active/test_active_bcast_put.cc index 78a6ba4e21..046eb1f0cf 100644 --- a/tests/unit/active/test_active_bcast_put.cc +++ b/tests/unit/active/test_active_bcast_put.cc @@ -127,7 +127,7 @@ TEST_P(TestActiveBroadcastPut, test_type_safe_active_fn_bcast2) { for (int i = 0; i < num_msg_sent; i++) { auto msg = makeMessage(); msg->setPut(put_payload.data(), put_size * sizeof(int)); - theMsg()->broadcastMsg(msg); + theMsg()->broadcastMsg(msg); } } }); diff --git a/tests/unit/active/test_active_broadcast.cc b/tests/unit/active/test_active_broadcast.cc index 8eeeecc7ab..274ba5846a 100644 --- a/tests/unit/active/test_active_broadcast.cc +++ b/tests/unit/active/test_active_broadcast.cc @@ -104,7 +104,7 @@ TEST_P(TestActiveBroadcast, test_type_safe_active_fn_bcast2) { auto msg = makeMessage(); auto msg_hold = promoteMsg(msg.get()); - theMsg()->broadcastMsg(msg); + theMsg()->broadcastMsg(msg); EXPECT_TRUE(envelopeIsLocked(msg_hold->env)) << "Should be locked on send"; } } diff --git a/tests/unit/active/test_active_send.cc b/tests/unit/active/test_active_send.cc index f996b6b33f..8313daf0fe 100644 --- a/tests/unit/active/test_active_send.cc +++ b/tests/unit/active/test_active_send.cc @@ -163,7 +163,7 @@ TEST_F(TestActiveSend, test_type_safe_active_fn_send) { auto msg = makeMessage(); auto msg_hold = promoteMsg(msg.get()); - theMsg()->sendMsg(to_node, msg); + theMsg()->sendMsg(to_node, msg); EXPECT_TRUE(envelopeIsLocked(msg_hold->env)) << "Should be locked on send"; } } @@ -194,7 +194,7 @@ TEST_F(TestActiveSend, test_type_safe_active_fn_send_small_put) { #if DEBUG_TEST_HARNESS_PRINT fmt::print("{}: sendMsg: (put) i={}\n", my_node, i); #endif - theMsg()->sendMsg(to_node, msg); + theMsg()->sendMsg(to_node, msg); } } @@ -219,7 +219,7 @@ TEST_F(TestActiveSend, test_type_safe_active_fn_send_large_put) { #if DEBUG_TEST_HARNESS_PRINT fmt::print("{}: sendMsg: (put) i={}\n", my_node, i); #endif - theMsg()->sendMsg(to_node, msg); + theMsg()->sendMsg(to_node, msg); } } @@ -235,7 +235,7 @@ TEST_F(TestActiveSend, test_active_message_serialization) { auto msg = vt::makeMessage(); msg->data.resize(serialization::serialized_msg_eager_size); - theMsg()->sendMsg(this_node, msg); + theMsg()->sendMsg(this_node, msg); } }); diff --git a/tests/unit/active/test_active_send_large.cc b/tests/unit/active/test_active_send_large.cc index 16a70822b8..7833fd87a5 100644 --- a/tests/unit/active/test_active_send_large.cc +++ b/tests/unit/active/test_active_send_large.cc @@ -140,7 +140,7 @@ TYPED_TEST_P(TestActiveSendLarge, test_large_bytes_msg) { auto msg = makeMessage(); fillMsg(msg); msg->cb_ = cb; - theMsg()->sendMsg>(next_node, msg); + theMsg()->sendMsg>(next_node, msg); }); EXPECT_EQ(counter, 1); diff --git a/tests/unit/active/test_active_send_put.cc b/tests/unit/active/test_active_send_put.cc index 8cf89320f7..ba2c52551f 100644 --- a/tests/unit/active/test_active_send_put.cc +++ b/tests/unit/active/test_active_send_put.cc @@ -113,7 +113,7 @@ TEST_P(TestActiveSendPut, test_active_fn_send_put_param) { #if DEBUG_TEST_HARNESS_PRINT fmt::print("{}: sendMsg: (put) i={}\n", my_node, i); #endif - theMsg()->sendMsg(1, msg); + theMsg()->sendMsg(1, msg); } // Spin here so test_vec does not go out of scope before the send completes diff --git a/tests/unit/active/test_pending_send.cc b/tests/unit/active/test_pending_send.cc index ccb55513cc..9f320ddd5c 100644 --- a/tests/unit/active/test_pending_send.cc +++ b/tests/unit/active/test_pending_send.cc @@ -65,7 +65,7 @@ struct TestPendingSend : TestParallelHarness { auto const num_nodes = theContext()->getNumNodes(); auto prev = this_node - 1 >= 0 ? this_node - 1 : num_nodes - 1; auto msg = vt::makeMessage(); - theMsg()->sendMsg(prev, msg); + theMsg()->sendMsg(prev, msg); } static void handlerLocal(TestMsg* msg) { auto const this_node = theContext()->getNode(); @@ -93,7 +93,7 @@ TEST_F(TestPendingSend, test_pending_send_hold) { auto msg = vt::makeMessage(); auto msg_hold = promoteMsg(msg.get()); pending.emplace_back( - theMsg()->sendMsg(next, msg) + theMsg()->sendMsg(next, msg) ); // Must be stamped with the current epoch @@ -134,7 +134,7 @@ TEST_F(TestPendingSend, test_pending_broadcast_hold) { auto msg = vt::makeMessage(theContext()->getNode()); auto msg_hold = promoteMsg(msg.get()); - pending.emplace_back(theMsg()->broadcastMsg(msg)); + pending.emplace_back(theMsg()->broadcastMsg(msg)); // Must be stamped with the current epoch EXPECT_EQ(envelopeGetEpoch(msg_hold->env), ep); diff --git a/tests/unit/collectives/test_mpi_collective.cc b/tests/unit/collectives/test_mpi_collective.cc index 6b6cdbcf42..f137195344 100644 --- a/tests/unit/collectives/test_mpi_collective.cc +++ b/tests/unit/collectives/test_mpi_collective.cc @@ -257,7 +257,7 @@ TEST_F(TestMPICollective, test_mpi_collective_4) { // Broadcast out node 0's order to confirm with all other nodes if (this_node == 0) { auto msg = makeMessage(run_order); - theMsg()->broadcastMsg(msg); + theMsg()->broadcastMsg(msg); } } diff --git a/tests/unit/group/test_group.cc b/tests/unit/group/test_group.cc index 17056a224e..d3c425ae03 100644 --- a/tests/unit/group/test_group.cc +++ b/tests/unit/group/test_group.cc @@ -88,7 +88,7 @@ TEST_F(TestGroup, test_group_range_construct_1) { fmt::print("Group is created: group={:x}\n", group); auto msg = makeMessage(); envelopeSetGroup(msg->env, group); - theMsg()->broadcastMsg(msg); + theMsg()->broadcastMsg(msg); } ); } @@ -118,7 +118,7 @@ TEST_F(TestGroup, test_group_range_construct_2) { fmt::print("Group is created: group={:x}\n", group); auto msg = makeMessage(); envelopeSetGroup(msg->env, group); - theMsg()->broadcastMsg(msg); + theMsg()->broadcastMsg(msg); } ); } @@ -146,7 +146,7 @@ TEST_F(TestGroup, test_group_collective_construct_1) { EXPECT_EQ(is_default_group, false); auto msg = makeMessage(); envelopeSetGroup(msg->env, group); - theMsg()->broadcastMsg(msg); + theMsg()->broadcastMsg(msg); } ); }); diff --git a/tests/unit/group/test_group.extended.cc b/tests/unit/group/test_group.extended.cc index d28897bb50..a222164da0 100644 --- a/tests/unit/group/test_group.extended.cc +++ b/tests/unit/group/test_group.extended.cc @@ -83,7 +83,7 @@ static inline void activeMessageGroupCollective() { if (my_node == 1) { auto msg = makeMessage(); envelopeSetGroup(msg->env, group_id); - theMsg()->broadcastMsg(msg); + theMsg()->broadcastMsg(msg); } } ); diff --git a/tests/unit/lb/test_lb_data_comm.cc b/tests/unit/lb/test_lb_data_comm.cc index 42c17f35e0..6bd5808821 100644 --- a/tests/unit/lb/test_lb_data_comm.cc +++ b/tests/unit/lb/test_lb_data_comm.cc @@ -205,7 +205,7 @@ void simulateColTHandlerSends(MyMsg* msg, MyCol* col) { auto next = (this_node + 1) % num_nodes; for (int i = 0; i < num_sends; i++) { auto msg2 = makeMessage(); - vt::theMsg()->sendMsg(next, msg2); + vt::theMsg()->sendMsg(next, msg2); } } @@ -215,7 +215,7 @@ void MyObj::simulateObjGroupHandlerSends(MyMsg* msg) { auto next = (this_node + 1) % num_nodes; for (int i = 0; i < num_sends; i++) { auto msg2 = makeMessage(); - vt::theMsg()->sendMsg(next, msg2); + vt::theMsg()->sendMsg(next, msg2); } } @@ -251,7 +251,7 @@ void simulateHandlerHandlerSends(MyMsg* msg) { auto next = (this_node + 1) % num_nodes; for (int i = 0; i < num_sends; i++) { auto msg2 = makeMessage(); - vt::theMsg()->sendMsg(next, msg2); + vt::theMsg()->sendMsg(next, msg2); } } @@ -520,7 +520,7 @@ TEST_F(TestLBDataComm, test_lb_data_comm_handler_to_col_send) { auto num_nodes = theContext()->getNumNodes(); auto next = (this_node + 1) % num_nodes; auto msg = makeMessage(proxy); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); }); vt::thePhase()->nextPhaseCollective(); @@ -683,7 +683,7 @@ TEST_F(TestLBDataComm, test_lb_data_comm_handler_to_objgroup_send) { auto num_nodes = theContext()->getNumNodes(); auto next = (this_node + 1) % num_nodes; auto msg = makeMessage(obj_proxy_a); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); }); vt::thePhase()->nextPhaseCollective(); @@ -724,7 +724,7 @@ TEST_F(TestLBDataComm, test_lb_data_comm_handler_to_handler_send) { auto num_nodes = theContext()->getNumNodes(); auto next = (this_node + 1) % num_nodes; auto msg = makeMessage(); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); }); vt::thePhase()->nextPhaseCollective(); diff --git a/tests/unit/location/test_location.cc b/tests/unit/location/test_location.cc index 8be5b21aff..190cd2e50d 100644 --- a/tests/unit/location/test_location.cc +++ b/tests/unit/location/test_location.cc @@ -341,7 +341,7 @@ TYPED_TEST_P(TestLocationRoute, test_route_entity) { using MsgType = location::EntityMsg; bool is_long = std::is_same::value; auto msg = vt::makeMessage(entity, my_node, is_long); - vt::theMsg()->broadcastMsg>(msg); + vt::theMsg()->broadcastMsg>(msg); vt::theSched()->runSchedulerWhile([&msg_count, nb_nodes]{ return msg_count < nb_nodes; }); diff --git a/tests/unit/mapping/test_mapping_registry.cc b/tests/unit/mapping/test_mapping_registry.cc index 7606188a0a..2d998ac7c6 100644 --- a/tests/unit/mapping/test_mapping_registry.cc +++ b/tests/unit/mapping/test_mapping_registry.cc @@ -108,11 +108,11 @@ TEST_F(TestMappingRegistry, test_mapping_block_1d_registry) { auto map_han = auto_registry::makeAutoHandlerMap(); auto msg = makeMessage(map_han); msg->is_block = true; - theMsg()->broadcastMsg(msg); + theMsg()->broadcastMsg(msg); auto map_han2 = auto_registry::makeAutoHandlerMap(); auto msg2 = makeMessage(map_han2); - theMsg()->broadcastMsg(msg2); + theMsg()->broadcastMsg(msg2); } } diff --git a/tests/unit/memory/test_memory_active.cc b/tests/unit/memory/test_memory_active.cc index 7ef27df03f..53ce419e4a 100644 --- a/tests/unit/memory/test_memory_active.cc +++ b/tests/unit/memory/test_memory_active.cc @@ -85,7 +85,7 @@ TYPED_TEST_P(TestMemoryActive, test_memory_remote_send) { for (int i = 0; i < num_msg_sent; i++) { auto msg = makeMessage(); msgs.push_back(msg); - theMsg()->sendMsg::test_handler>( + theMsg()->sendMsg::test_handler>( to_node, msg.get() ); } @@ -116,7 +116,7 @@ TYPED_TEST_P(TestMemoryActive, test_memory_remote_broadcast) { for (int i = 0; i < num_msg_sent; i++) { auto msg = makeMessage(); msgs.push_back(msg); - theMsg()->broadcastMsg::test_handler>( + theMsg()->broadcastMsg::test_handler>( msg.get() ); } diff --git a/tests/unit/memory/test_memory_lifetime.cc b/tests/unit/memory/test_memory_lifetime.cc index 90596e984c..8ab52b14c4 100644 --- a/tests/unit/memory/test_memory_lifetime.cc +++ b/tests/unit/memory/test_memory_lifetime.cc @@ -143,7 +143,7 @@ TEST_F(TestMemoryLifetime, test_active_bcast_serial_lifetime) { runInEpochCollective([&]{ for (int i = 0; i < num_msgs_sent; i++) { auto msg = makeMessage(); - theMsg()->broadcastMsg(msg); + theMsg()->broadcastMsg(msg); } }); @@ -165,7 +165,7 @@ TEST_F(TestMemoryLifetime, test_active_send_normal_lifetime_msgptr) { EXPECT_EQ(envelopeGetRef(msg->env), 1); auto msg_hold = promoteMsg(msg.get()); EXPECT_EQ(envelopeGetRef(msg_hold->env), 2); - theMsg()->sendMsg(next_node, msg); + theMsg()->sendMsg(next_node, msg); theTerm()->addAction([msg_hold]{ // Call event cleanup all pending MPI requests to clear theEvent()->finalize(); @@ -190,7 +190,7 @@ TEST_F(TestMemoryLifetime, test_active_bcast_normal_lifetime_msgptr) { EXPECT_EQ(envelopeGetRef(msg->env), 1); auto msg_hold = promoteMsg(msg.get()); EXPECT_EQ(envelopeGetRef(msg_hold->env), 2); - theMsg()->broadcastMsg(msg); + theMsg()->broadcastMsg(msg); theTerm()->addAction([msg_hold]{ // Call event cleanup all pending MPI requests to clear theEvent()->finalize(); @@ -227,7 +227,7 @@ TEST_F(TestMemoryLifetime, test_active_send_callback_lifetime_1) { for (int i = 0; i < num_msgs_sent; i++) { auto msg = makeMessage>(cb); auto msg_hold = promoteMsg(msg.get()); - theMsg()->broadcastMsg, callbackHan>(msg); + theMsg()->broadcastMsg(msg); theTerm()->addAction([msg_hold]{ // Call event cleanup all pending MPI requests to clear theEvent()->finalize(); diff --git a/tests/unit/pipe/test_callback_bcast.cc b/tests/unit/pipe/test_callback_bcast.cc index 27043b7069..3ebf52983d 100644 --- a/tests/unit/pipe/test_callback_bcast.cc +++ b/tests/unit/pipe/test_callback_bcast.cc @@ -160,7 +160,7 @@ TEST_F(TestCallbackBcast, test_callback_bcast_remote_1) { auto next = this_node + 1 < num_nodes ? this_node + 1 : 0; auto cb = theCB()->makeBcast(); auto msg = makeMessage(cb); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); }); EXPECT_EQ(called, 100 * theContext()->getNumNodes()); @@ -178,7 +178,7 @@ TEST_F(TestCallbackBcast, test_callback_bcast_remote_2) { auto next = this_node + 1 < num_nodes ? this_node + 1 : 0; auto cb = theCB()->makeBcast(); auto msg = makeMessage(cb); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); }); EXPECT_EQ(called, 200 * theContext()->getNumNodes()); @@ -196,7 +196,7 @@ TEST_F(TestCallbackBcast, test_callback_bcast_remote_3) { auto next = this_node + 1 < num_nodes ? this_node + 1 : 0; auto cb = theCB()->makeBcast(); auto msg = makeMessage(cb); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); }); EXPECT_EQ(called, 300 * theContext()->getNumNodes()); diff --git a/tests/unit/pipe/test_callback_bcast_collection.extended.cc b/tests/unit/pipe/test_callback_bcast_collection.extended.cc index 8987da8a5b..0cd621c788 100644 --- a/tests/unit/pipe/test_callback_bcast_collection.extended.cc +++ b/tests/unit/pipe/test_callback_bcast_collection.extended.cc @@ -177,7 +177,7 @@ TEST_F(TestCallbackBcastCollection, test_callback_bcast_collection_2) { auto next = this_node + 1 < num_nodes ? this_node + 1 : 0; auto cb = theCB()->makeBcast(proxy); auto msg = makeMessage(cb); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); } }); @@ -211,7 +211,7 @@ TEST_F(TestCallbackBcastCollection, test_callback_bcast_collection_3) { auto next = this_node + 1 < num_nodes ? this_node + 1 : 0; auto cb = theCB()->makeBcast(proxy); auto msg = makeMessage(cb); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); } }); diff --git a/tests/unit/pipe/test_callback_func.cc b/tests/unit/pipe/test_callback_func.cc index 83c7078f92..a9603faa1c 100644 --- a/tests/unit/pipe/test_callback_func.cc +++ b/tests/unit/pipe/test_callback_func.cc @@ -93,7 +93,7 @@ TEST_F(TestCallbackFunc, test_callback_func_2) { vt::pipe::LifetimeEnum::Once, []{ called = 400; } ); auto msg = makeMessage(cb); - theMsg()->sendMsg(1, msg); + theMsg()->sendMsg(1, msg); } }); diff --git a/tests/unit/pipe/test_callback_func_ctx.cc b/tests/unit/pipe/test_callback_func_ctx.cc index d067146e66..09054798b6 100644 --- a/tests/unit/pipe/test_callback_func_ctx.cc +++ b/tests/unit/pipe/test_callback_func_ctx.cc @@ -131,7 +131,7 @@ TEST_F(TestCallbackFuncCtx, test_callback_func_ctx_2) { }); // fmt::print("{}: next={}\n", this_node, next); auto msg = makeMessage(cb); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); }); // fmt::print("{}: called={}\n", this_node, called); diff --git a/tests/unit/pipe/test_callback_send.cc b/tests/unit/pipe/test_callback_send.cc index 5e8f37a2f8..be1a577957 100644 --- a/tests/unit/pipe/test_callback_send.cc +++ b/tests/unit/pipe/test_callback_send.cc @@ -155,7 +155,7 @@ TEST_F(TestCallbackSend, test_callback_send_remote_1) { auto next = this_node + 1 < num_nodes ? this_node + 1 : 0; auto cb = theCB()->makeSend(this_node); auto msg = makeMessage(cb); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); }); EXPECT_EQ(called, 100); @@ -171,7 +171,7 @@ TEST_F(TestCallbackSend, test_callback_send_remote_2) { auto next = this_node + 1 < num_nodes ? this_node + 1 : 0; auto cb = theCB()->makeSend(this_node); auto msg = makeMessage(cb); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); }); EXPECT_EQ(called, 200); @@ -187,7 +187,7 @@ TEST_F(TestCallbackSend, test_callback_send_remote_3) { auto next = this_node + 1 < num_nodes ? this_node + 1 : 0; auto cb = theCB()->makeSend(this_node); auto msg = makeMessage(cb); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); }); EXPECT_EQ(called, 300); diff --git a/tests/unit/pipe/test_callback_send_collection.extended.cc b/tests/unit/pipe/test_callback_send_collection.extended.cc index 473ebc9149..d58edd4f4c 100644 --- a/tests/unit/pipe/test_callback_send_collection.extended.cc +++ b/tests/unit/pipe/test_callback_send_collection.extended.cc @@ -186,12 +186,12 @@ TEST_F(TestCallbackSendCollection, test_callback_send_collection_2) { auto cb = theCB()->makeSend(proxy(i)); auto msg = makeMessage(cb); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); } else { auto cb = theCB()->makeSend(proxy(i)); auto msg = makeMessage(cb); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); } } } diff --git a/tests/unit/pipe/test_signal_cleanup.cc b/tests/unit/pipe/test_signal_cleanup.cc index d650b8bb96..01bf454ac6 100644 --- a/tests/unit/pipe/test_signal_cleanup.cc +++ b/tests/unit/pipe/test_signal_cleanup.cc @@ -86,7 +86,7 @@ TEST_F(TestSignalCleanup, test_signal_cleanup_3) { } ); auto msg = makeMessage(cb); - theMsg()->sendMsg(1, msg); + theMsg()->sendMsg(1, msg); } // run until termination @@ -113,7 +113,7 @@ TEST_F(TestSignalCleanup, test_signal_cleanup_3) { } ); auto msg = makeMessage(cb); - theMsg()->sendMsg(1, msg); + theMsg()->sendMsg(1, msg); } // run until termination diff --git a/tests/unit/runtime/test_mpi_access_guards.cc b/tests/unit/runtime/test_mpi_access_guards.cc index d1e6e17535..4f63a80427 100644 --- a/tests/unit/runtime/test_mpi_access_guards.cc +++ b/tests/unit/runtime/test_mpi_access_guards.cc @@ -90,7 +90,7 @@ void testMpiAccess(bool access_allowed, bool grant_access) { // Sending message for common-case of attempting MPI access within // a message handler; it applies to all cases through the scheduler. auto msg = vt::makeMessage(); - theMsg()->sendMsg(1, msg); + theMsg()->sendMsg(1, msg); } } diff --git a/tests/unit/scheduler/test_scheduler_loop.cc b/tests/unit/scheduler/test_scheduler_loop.cc index fee8f98c7f..c39304ec6b 100644 --- a/tests/unit/scheduler/test_scheduler_loop.cc +++ b/tests/unit/scheduler/test_scheduler_loop.cc @@ -88,7 +88,7 @@ static void message_handler_with_nested_loop(TestMsg* msg) { auto next_msg = vt::makeMessage(); next_msg->action_ = next_depth; - theMsg()->sendMsg(target_node, next_msg); + theMsg()->sendMsg(target_node, next_msg); // ..run scheduler until someone also passed us the message. if ("nested" == action) { @@ -117,7 +117,7 @@ TEST_F(TestSchedulerLoop, test_scheduler_loop_nesting_1) { auto msg = vt::makeMessage(); msg->action_ = 1; - theMsg()->sendMsg(target_node, msg); + theMsg()->sendMsg(target_node, msg); done = false; theSched()->runSchedulerWhile([]{ return not done; }); diff --git a/tests/unit/termination/test_epoch_guard.cc b/tests/unit/termination/test_epoch_guard.cc index b828127475..e58360898e 100644 --- a/tests/unit/termination/test_epoch_guard.cc +++ b/tests/unit/termination/test_epoch_guard.cc @@ -74,7 +74,7 @@ struct TestEpochGuard : TestParallelHarness { EXPECT_EQ(theMsg()->getEpoch(), ep); auto node = theContext()->getNode(); if (0 == node) { - theMsg()->sendMsg(1, msg); + theMsg()->sendMsg(1, msg); } } @@ -91,7 +91,7 @@ struct TestEpochGuard : TestParallelHarness { EXPECT_EQ(theMsg()->getEpoch(), ep); auto node = theContext()->getNode(); if (0 == node) { - theMsg()->sendMsg(1, msg); + theMsg()->sendMsg(1, msg); } guard.pop(); diff --git a/tests/unit/termination/test_term_chaining.cc b/tests/unit/termination/test_term_chaining.cc index 42d1a6f760..4627e3e96a 100644 --- a/tests/unit/termination/test_term_chaining.cc +++ b/tests/unit/termination/test_term_chaining.cc @@ -79,7 +79,7 @@ struct TestTermChaining : TestParallelHarness { EXPECT_EQ(theContext()->getNode(), 1); auto msg2 = makeMessage(); - theMsg()->sendMsg(0, msg2); + theMsg()->sendMsg(0, msg2); } static void test_handler_response(TestMsg* msg) { @@ -96,7 +96,7 @@ struct TestTermChaining : TestParallelHarness { EXPECT_EQ(handler_count, 12); handler_count++; auto msg2 = makeMessage(); - theMsg()->sendMsg(0, msg2); + theMsg()->sendMsg(0, msg2); } static void test_handler_chained(TestMsg* msg) { @@ -140,7 +140,7 @@ struct TestTermChaining : TestParallelHarness { vt::theMsg()->pushEpoch(epoch1); auto msg = makeMessage(); chain.add( - epoch1, theMsg()->sendMsg(1, msg) + epoch1, theMsg()->sendMsg(1, msg) ); vt::theMsg()->popEpoch(epoch1); vt::theTerm()->finishedEpoch(epoch1); @@ -149,7 +149,7 @@ struct TestTermChaining : TestParallelHarness { vt::theMsg()->pushEpoch(epoch2); auto msg2 = makeMessage(); chain.add( - epoch2, theMsg()->sendMsg(1, msg2) + epoch2, theMsg()->sendMsg(1, msg2) ); vt::theMsg()->popEpoch(epoch2); vt::theTerm()->finishedEpoch(epoch2); @@ -165,7 +165,7 @@ struct TestTermChaining : TestParallelHarness { vt::theMsg()->pushEpoch(epoch1); auto msg = makeMessage(); chain.add( - epoch1, theMsg()->sendMsg(1, msg.get())); + epoch1, theMsg()->sendMsg(1, msg.get())); vt::theMsg()->popEpoch(epoch1); vt::theTerm()->finishedEpoch(epoch1); } @@ -182,7 +182,7 @@ struct TestTermChaining : TestParallelHarness { vt::theMsg()->pushEpoch(epoch3); auto msg3 = makeMessage(); chain.add( - epoch3, theMsg()->broadcastMsg(msg3.get())); + epoch3, theMsg()->broadcastMsg(msg3.get())); vt::theMsg()->popEpoch(epoch3); vt::theTerm()->finishedEpoch(epoch3); diff --git a/tests/unit/termination/test_term_cleanup.cc b/tests/unit/termination/test_term_cleanup.cc index a67e27c5b6..57f779f8a5 100644 --- a/tests/unit/termination/test_term_cleanup.cc +++ b/tests/unit/termination/test_term_cleanup.cc @@ -79,7 +79,7 @@ TEST_F(TestTermCleanup, test_termination_cleanup_1) { auto msg = makeMessage(); envelopeSetEpoch(msg->env, epoch); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); theTerm()->finishedEpoch(epoch); vt::runSchedulerThrough(epoch); @@ -123,17 +123,17 @@ TEST_F(TestTermCleanup, test_termination_cleanup_2) { for (int j = 0; j < 5; j++) { auto msg = makeMessage(); envelopeSetEpoch(msg->env, coll_epoch); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); } for (int j = 0; j < 5; j++) { auto msg = makeMessage(); envelopeSetEpoch(msg->env, root_epoch); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); } for (int j = 0; j < 5; j++) { auto msg = makeMessage(); envelopeSetEpoch(msg->env, wave_epoch); - theMsg()->sendMsg(next, msg); + theMsg()->sendMsg(next, msg); } theTerm()->finishedEpoch(coll_epoch); diff --git a/tests/unit/termination/test_termination_action_common.impl.h b/tests/unit/termination/test_termination_action_common.impl.h index 5dd8e61beb..ddd38219af 100644 --- a/tests/unit/termination/test_termination_action_common.impl.h +++ b/tests/unit/termination/test_termination_action_common.impl.h @@ -170,7 +170,7 @@ inline void add(vt::EpochType const& epoch, int order){ EXPECT_TRUE(channel::hasEnded(epoch)); channel::ok = true; auto msg = vt::makeMessage(); - vt::theMsg()->broadcastMsg(msg); + vt::theMsg()->broadcastMsg<&setOk>(msg); }); } } diff --git a/tests/unit/termination/test_termination_channel_counting.impl.h b/tests/unit/termination/test_termination_channel_counting.impl.h index b089b6b989..0991ee9ffd 100644 --- a/tests/unit/termination/test_termination_channel_counting.impl.h +++ b/tests/unit/termination/test_termination_channel_counting.impl.h @@ -55,7 +55,7 @@ void sendMsg(vt::NodeType dst, int count, vt::EpochType ep) { if (ep != vt::no_epoch) { vt::envelopeSetEpoch(msg->env,ep); } - vt::theMsg()->sendMsg(dst, msg); + vt::theMsg()->sendMsg(dst, msg); } // note: only for basic messages, @@ -68,7 +68,7 @@ void broadcast(int count, vt::EpochType ep) { if (ep != vt::no_epoch) { vt::envelopeSetEpoch(msg->env,ep); } - vt::theMsg()->broadcastMsg(msg); + vt::theMsg()->broadcastMsg(msg); for (auto&& active : data[ep].count_) { auto const& dst = active.first; diff --git a/tests/unit/termination/test_termination_reset.cc b/tests/unit/termination/test_termination_reset.cc index af7e42868e..2300e7b491 100644 --- a/tests/unit/termination/test_termination_reset.cc +++ b/tests/unit/termination/test_termination_reset.cc @@ -73,7 +73,7 @@ TEST_F(TestTermReset, test_termination_reset_1) { if (this_node == 0) { auto msg = makeMessage(); - theMsg()->broadcastMsg(msg); + theMsg()->broadcastMsg(msg); } else if (this_node == 1) { theTerm()->addAction([=]{ EXPECT_EQ(handler_count, 10); @@ -89,7 +89,7 @@ TEST_F(TestTermReset, test_termination_reset_1) { if (this_node == 1) { auto msg = makeMessage(); - theMsg()->broadcastMsg(msg); + theMsg()->broadcastMsg(msg); } else if (this_node == 0) { theTerm()->addAction([=]{ EXPECT_EQ(handler_count, 10); diff --git a/tutorial/tutorial_1b.h b/tutorial/tutorial_1b.h index b8b3ed1cba..94c4a959fc 100644 --- a/tutorial/tutorial_1b.h +++ b/tutorial/tutorial_1b.h @@ -117,7 +117,7 @@ static inline void activeMessageNode() { if (this_node == 0) { NodeType const to_node = 1; auto msg = ::vt::makeMessage(29,32); - ::vt::theMsg()->sendMsg(to_node, msg); + ::vt::theMsg()->sendMsg(to_node, msg); } } diff --git a/tutorial/tutorial_1c.h b/tutorial/tutorial_1c.h index 9aade203ba..f7e9946974 100644 --- a/tutorial/tutorial_1c.h +++ b/tutorial/tutorial_1c.h @@ -137,7 +137,7 @@ static inline void activeMessageSerialization() { auto msg = ::vt::makeMessage(1,2,3); msg->particles.push_back(Particle{10,11,12}); msg->particles.push_back(Particle{13,14,15}); - ::vt::theMsg()->sendMsg(to_node, msg); + ::vt::theMsg()->sendMsg(to_node, msg); } } diff --git a/tutorial/tutorial_1e.h b/tutorial/tutorial_1e.h index 839af157c7..bd21eacbf8 100644 --- a/tutorial/tutorial_1e.h +++ b/tutorial/tutorial_1e.h @@ -78,7 +78,7 @@ static inline void activeMessageGroupRoot() { fmt::print("Group is created: id={:x}\n", group_id); auto msg = makeMessage(); envelopeSetGroup(msg->env, group_id); - theMsg()->broadcastMsg(msg); + theMsg()->broadcastMsg(msg); }); // The `id' that is returned from the newGroup invocation, can be used // anywhere in the system to broadcast (multicast) to this group. diff --git a/tutorial/tutorial_1f.h b/tutorial/tutorial_1f.h index 0924fe1b78..fc6a79742c 100644 --- a/tutorial/tutorial_1f.h +++ b/tutorial/tutorial_1f.h @@ -84,7 +84,7 @@ static inline void activeMessageGroupCollective() { if (my_node == 1) { auto msg = makeMessage(); envelopeSetGroup(msg->env, group_id); - theMsg()->broadcastMsg(msg); + theMsg()->broadcastMsg(msg); } } ); diff --git a/tutorial/tutorial_1g.h b/tutorial/tutorial_1g.h index 4ba5ddc263..7379d165cf 100644 --- a/tutorial/tutorial_1g.h +++ b/tutorial/tutorial_1g.h @@ -113,21 +113,21 @@ static inline void activeMessageCallback() { { auto cb = ::vt::theCB()->makeFunc(vt::pipe::LifetimeEnum::Once, void_fn); auto msg = ::vt::makeMessage(cb); - ::vt::theMsg()->sendMsg(to_node, msg); + ::vt::theMsg()->sendMsg(to_node, msg); } // Example of active message handler callback with send node { auto cb = ::vt::theCB()->makeSend(cb_node); auto msg = ::vt::makeMessage(cb); - ::vt::theMsg()->sendMsg(to_node, msg); + ::vt::theMsg()->sendMsg(to_node, msg); } // Example of active message handler callback with broadcast { auto cb = ::vt::theCB()->makeBcast(); auto msg = ::vt::makeMessage(cb); - ::vt::theMsg()->sendMsg(to_node, msg); + ::vt::theMsg()->sendMsg(to_node, msg); } // Example of context callback @@ -136,7 +136,7 @@ static inline void activeMessageCallback() { vt::pipe::LifetimeEnum::Once, &ctx, callbackCtx ); auto msg = ::vt::makeMessage(cb); - ::vt::theMsg()->sendMsg(to_node, msg); + ::vt::theMsg()->sendMsg(to_node, msg); } } } diff --git a/tutorial/tutorial_3a.h b/tutorial/tutorial_3a.h index c1b37536f3..346b2e553e 100644 --- a/tutorial/tutorial_3a.h +++ b/tutorial/tutorial_3a.h @@ -78,7 +78,7 @@ static inline void activeMessageTerm() { if (this_node == 0) { auto msg = vt::makeMessage(8); envelopeSetEpoch(msg->env, new_epoch); - vt::theMsg()->sendMsg(this_node+1, msg); + vt::theMsg()->sendMsg(this_node+1, msg); } // Any node that wishes to have a notification on termination for a given @@ -116,7 +116,7 @@ static void recurHandler(ExampleMsg* msg) { ); auto msg_send = vt::makeMessage(msg->ttl); - vt::theMsg()->sendMsg(next_node, msg_send); + vt::theMsg()->sendMsg(next_node, msg_send); } } }