From e69f41f73db1511360ef02f34c9305807eb86aed Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Wed, 8 Feb 2023 16:00:50 +0100 Subject: [PATCH] Update --- 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 ++-- tests/unit/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 ++-- 11 files changed, 25 insertions(+), 25 deletions(-) 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); } } }