X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/53665b99d0b7d1b7444a396a791f6629eb71822b..8c416e92254512408c1d0ce729e8d3cf82ec9938:/teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.cpp diff --git a/teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.cpp b/teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.cpp index df7d015224..94deef21fd 100644 --- a/teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.cpp +++ b/teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2017. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2017-2018. 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. */ @@ -17,12 +16,12 @@ static void vm_migrate(simgrid::s4u::VirtualMachine* vm, simgrid::s4u::Host* dst sg_vm_migrate(vm, dst_pm); double mig_end = simgrid::s4u::Engine::getClock(); - XBT_INFO("%s migrated: %s->%s in %g s", vm->getCname(), src_pm->getCname(), dst_pm->getCname(), mig_end - mig_sta); + XBT_INFO("%s migrated: %s->%s in %g s", vm->get_cname(), src_pm->get_cname(), dst_pm->get_cname(), mig_end - mig_sta); } static simgrid::s4u::ActorPtr vm_migrate_async(simgrid::s4u::VirtualMachine* vm, simgrid::s4u::Host* dst_pm) { - return simgrid::s4u::Actor::createActor("mig_wrk", simgrid::s4u::Host::current(), vm_migrate, vm, dst_pm); + return simgrid::s4u::Actor::create("mig_wrk", simgrid::s4u::Host::current(), vm_migrate, vm, dst_pm); } static void master_main() @@ -34,16 +33,16 @@ static void master_main() vm0->setRamsize(1e9); // 1Gbytes vm0->start(); - XBT_INFO("Start the migration of %s from %s to %s", vm0->getCname(), pm0->getCname(), pm1->getCname()); + XBT_INFO("Start the migration of %s from %s to %s", vm0->get_cname(), pm0->get_cname(), pm1->get_cname()); vm_migrate_async(vm0, pm1); simgrid::s4u::this_actor::sleep_for(2); - XBT_INFO("Wait! change my mind, shutdown %s. This ends the migration", vm0->getCname()); + XBT_INFO("Wait! change my mind, shutdown %s. This ends the migration", vm0->get_cname()); vm0->shutdown(); simgrid::s4u::this_actor::sleep_for(8); - XBT_INFO("Start again the migration of %s from %s to %s", vm0->getCname(), pm0->getCname(), pm1->getCname()); + XBT_INFO("Start again the migration of %s from %s to %s", vm0->get_cname(), pm0->get_cname(), pm1->get_cname()); vm0->start(); vm_migrate_async(vm0, pm1); @@ -60,9 +59,9 @@ int main(int argc, char* argv[]) sg_vm_live_migration_plugin_init(); /* load the platform file */ - e.loadPlatform(argv[1]); + e.load_platform(argv[1]); - simgrid::s4u::Actor::createActor("master_", simgrid::s4u::Host::by_name("Fafard"), master_main); + simgrid::s4u::Actor::create("master_", simgrid::s4u::Host::by_name("Fafard"), master_main); e.run();