A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another attempt at fixing the Flag2 job of jenkins
[simgrid.git]
/
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 746e06ed75d19741b3721c2b458c560707cfaf5e..2f7bdd36ddba22f3a6feb12d9a3cf5c48fbcc662 100644
(file)
--- a/
teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.cpp
+++ b/
teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2017-20
18
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2017-20
23
. 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. */
/* 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. */
@@
-11,10
+11,10
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_cloud_interrupt_migration, "Messages specific f
static void vm_migrate(simgrid::s4u::VirtualMachine* vm, simgrid::s4u::Host* dst_pm)
{
static void vm_migrate(simgrid::s4u::VirtualMachine* vm, simgrid::s4u::Host* dst_pm)
{
-
simgrid::s4u::Host* src_pm = vm->getP
m();
- double mig_sta = simgrid::s4u::Engine::get
C
lock();
+
const simgrid::s4u::Host* src_pm = vm->get_p
m();
+ double mig_sta = simgrid::s4u::Engine::get
_c
lock();
sg_vm_migrate(vm, dst_pm);
sg_vm_migrate(vm, dst_pm);
- double mig_end = simgrid::s4u::Engine::get
C
lock();
+ double mig_end = simgrid::s4u::Engine::get
_c
lock();
XBT_INFO("%s migrated: %s->%s in %g s", vm->get_cname(), src_pm->get_cname(), dst_pm->get_cname(), 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);
}
@@
-29,8
+29,8
@@
static void master_main()
simgrid::s4u::Host* pm0 = simgrid::s4u::Host::by_name("Fafard");
simgrid::s4u::Host* pm1 = simgrid::s4u::Host::by_name("Tremblay");
simgrid::s4u::Host* pm0 = simgrid::s4u::Host::by_name("Fafard");
simgrid::s4u::Host* pm1 = simgrid::s4u::Host::by_name("Tremblay");
-
simgrid::s4u::VirtualMachine* vm0 = new simgrid::s4u::VirtualMachine("VM0", pm0
, 1);
- vm0->set
R
amsize(1e9); // 1Gbytes
+
auto* vm0 = pm0->create_vm("VM0"
, 1);
+ vm0->set
_r
amsize(1e9); // 1Gbytes
vm0->start();
XBT_INFO("Start the migration of %s from %s to %s", vm0->get_cname(), pm0->get_cname(), pm1->get_cname());
vm0->start();
XBT_INFO("Start the migration of %s from %s to %s", vm0->get_cname(), pm0->get_cname(), pm1->get_cname());
@@
-59,13
+59,13
@@
int main(int argc, char* argv[])
sg_vm_live_migration_plugin_init();
/* load the platform file */
sg_vm_live_migration_plugin_init();
/* load the platform file */
- e.load
P
latform(argv[1]);
+ e.load
_p
latform(argv[1]);
- simgrid::s4u::Actor::create("master_",
simgrid::s4u::Host::
by_name("Fafard"), master_main);
+ simgrid::s4u::Actor::create("master_",
e.host_
by_name("Fafard"), master_main);
e.run();
e.run();
- XBT_INFO("Bye (simulation time %g)", simgrid::s4u::Engine::get
C
lock());
+ XBT_INFO("Bye (simulation time %g)", simgrid::s4u::Engine::get
_c
lock());
return 0;
}
return 0;
}