-/* Copyright (c) 2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2018-2019. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
class MigrateParser : public simgrid::smpi::replay::ActionArgParser {
public:
double memory_consumption;
- void parse(simgrid::xbt::ReplayAction& action, std::string name)
+ void parse(simgrid::xbt::ReplayAction& action, const std::string&)
{
// The only parameter is the amount of memory used by the current process.
CHECK_ACTION_PARAMS(action, 1, 0);
class MigrateAction : public simgrid::smpi::replay::ReplayAction<simgrid::smpi::plugin::MigrateParser> {
public:
explicit MigrateAction() : ReplayAction("Migrate") {}
- void kernel(simgrid::xbt::ReplayAction& action)
+ void kernel(simgrid::xbt::ReplayAction&)
{
static std::map<simgrid::s4u::ActorPtr, int> migration_call_counter;
static simgrid::s4u::Barrier smpilb_bar(smpi_process_count());
static bool was_executed = false;
if (not was_executed) {
was_executed = true;
- XBT_DEBUG("Process %u runs the load balancer", my_proc_id);
+ XBT_DEBUG("Process %li runs the load balancer", my_proc_id);
smpi_bench_begin();
lb.run();
smpi_bench_end();
smpilb_bar.wait();
was_executed = false; // Must stay behind this barrier so that all processes have passed the if clause
- migrate_to_host = lb.get_mapping();
+ migrate_to_host = lb.get_mapping(simgrid::s4u::Actor::self());
if (cur_host != migrate_to_host) { // Origin and dest are not the same -> migrate
- 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, /*must not be 0*/std::max(args.memory_consumption, 1.0), 0, 0};
+ std::vector<simgrid::s4u::Host*> migration_hosts = {cur_host, migrate_to_host};
+ std::vector<double> comp_amount = {0, 0};
+ std::vector<double> comm_amount = {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);
- simgrid::s4u::this_actor::parallel_execute(2, migration_hosts, comp_amount, comm_amount, -1.0);
+ simgrid::s4u::this_actor::parallel_execute(migration_hosts, comp_amount, comm_amount, -1.0);
xbt_os_threadtimer_stop(timer);
smpi_execute(xbt_os_timer_elapsed(timer));
// Update the process and host mapping in SimGrid.
+ XBT_DEBUG("Migrating process %li from %s to %s", my_proc_id, cur_host->get_cname(), migrate_to_host->get_cname());
TRACE_smpi_process_change_host(my_proc_id, migrate_to_host);
simgrid::s4u::this_actor::migrate(migrate_to_host);
}