From 9b70d862acada5a0d479639459f791e90a178cfb Mon Sep 17 00:00:00 2001 From: Nicole Lemaster Slattengren Date: Tue, 17 Oct 2023 12:42:23 -0700 Subject: [PATCH] #1265: tests: make compatibility updates --- .../unit/collection/test_workload_data_migrator.cc | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/tests/unit/collection/test_workload_data_migrator.cc b/tests/unit/collection/test_workload_data_migrator.cc index 7b31aad23e..7d20356fff 100644 --- a/tests/unit/collection/test_workload_data_migrator.cc +++ b/tests/unit/collection/test_workload_data_migrator.cc @@ -579,12 +579,10 @@ struct StatsResults { std::unordered_map O_car_; std::unordered_map P_sum_; - using StatsMsgType = vt::vrt::collection::balance::NodeStatsMsg; using Statistic = vt::vrt::collection::lb::Statistic; + using LoadData = vt::vrt::collection::balance::LoadData; - void saveStatsHandler(StatsMsgType* msg) { - auto in_stat_vec = msg->getConstVal(); - + void saveStatsHandler(std::vector const& in_stat_vec) { auto const& this_node = vt::theContext()->getNode(); if (this_node == 0) { @@ -605,9 +603,7 @@ struct StatsResults { ++save_phase_; } - void compStatsHandler(StatsMsgType* msg) { - auto in_stat_vec = msg->getConstVal(); - + void compStatsHandler(std::vector const& in_stat_vec) { auto const& this_node = vt::theContext()->getNode(); if (this_node == 0) { @@ -655,7 +651,6 @@ migrateObjectsAndDoStatistics( ); runInEpochCollective("computeAndStoreStats", [=] { auto stats_cb = vt::theCB()->makeBcast< - StatsResults, StatsResults::StatsMsgType, &StatsResults::saveStatsHandler >(o_proxy); theLBManager()->computeStatistics(new_model, false, phase, stats_cb); @@ -790,7 +785,7 @@ TEST_F(TestWorkloadReplay, test_run_replay_verify_some_stats) { // make our own stats callback so that we can check the results auto stats_cb = vt::theCB()->makeBcast< - StatsResults, StatsResults::StatsMsgType, &StatsResults::compStatsHandler + &StatsResults::compStatsHandler >(o_proxy); // then replay them but allow the lb to place objects differently