X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f47deaf4eadbed4cf8c31d97100d444cc978799f..94e9e4e93833ebbe7b164ff0c9845f41b5b12664:/src/smpi/plugins/sampi_loadbalancer.cpp diff --git a/src/smpi/plugins/sampi_loadbalancer.cpp b/src/smpi/plugins/sampi_loadbalancer.cpp index a9f81ac230..1450a6f652 100644 --- a/src/smpi/plugins/sampi_loadbalancer.cpp +++ b/src/smpi/plugins/sampi_loadbalancer.cpp @@ -9,6 +9,8 @@ #include #include #include +#include +#include #include #include "src/kernel/activity/ExecImpl.hpp" @@ -80,7 +82,7 @@ public: sg_host_t migration_hosts[2] = {cur_host, migrate_to_host}; // Changing this to double[2] ... will cause trouble with parallel_execute, because that fct is trying to call free(). double* comp_amount = new double[2]{0, 0}; - double* comm_amount = new double[4]{0, std::max(args.memory_consumption, 1.0), 0, 0}; + double* comm_amount = new double[4]{0, /*must not be 0*/std::max(args.memory_consumption, 1.0), 0, 0}; xbt_os_timer_t timer = smpi_process()->timer(); xbt_os_threadtimer_start(timer); @@ -109,14 +111,15 @@ void action_iteration_in(simgrid::xbt::ReplayAction& action) { CHECK_ACTION_PARAMS(action, 0, 0) TRACE_Iteration_in(simgrid::s4u::this_actor::get_pid(), nullptr); + simgrid::smpi::plugin::ampi::on_iteration_in(MPI_COMM_WORLD->group()->actor(std::stol(action[0]))); } -// FIXME Move declaration XBT_PRIVATE void action_iteration_out(simgrid::xbt::ReplayAction& action); void action_iteration_out(simgrid::xbt::ReplayAction& action) { CHECK_ACTION_PARAMS(action, 0, 0) TRACE_Iteration_out(simgrid::s4u::this_actor::get_pid(), nullptr); + simgrid::smpi::plugin::ampi::on_iteration_out(MPI_COMM_WORLD->group()->actor(std::stol(action[0]))); } } }