isolate VM migration parameters from others

[simgrid.git] / examples / msg / cloud-migration / cloud-migration.c

diff --git a/examples/msg/cloud-migration/cloud-migration.c b/examples/msg/cloud-migration/cloud-migration.c
index ffb593e..5fd2143 100644 (file)
--- a/examples/msg/cloud-migration/cloud-migration.c
+++ b/examples/msg/cloud-migration/cloud-migration.c
@@ -26,7 +26,7 @@ static int migration_worker_main(int argc, char *argv[])
   char *vm_name = argv[1];
   char *dst_pm_name = argv[2];
 
-  msg_vm_t vm = MSG_host_by_name(vm_name);
+  msg_vm_t vm       = (msg_vm_t)MSG_host_by_name(vm_name);
   msg_host_t dst_pm = MSG_host_by_name(dst_pm_name);
 
   vm_migrate(vm, dst_pm);
@@ -52,41 +52,33 @@ static void vm_migrate_async(msg_vm_t vm, msg_host_t dst_pm)
 
 static int master_main(int argc, char *argv[])
 {
-  xbt_dynar_t hosts_dynar = MSG_hosts_as_dynar();
-  msg_host_t pm0 = xbt_dynar_get_as(hosts_dynar, 0, msg_host_t);
-  msg_host_t pm1 = xbt_dynar_get_as(hosts_dynar, 1, msg_host_t);
-  msg_host_t pm2 = xbt_dynar_get_as(hosts_dynar, 2, msg_host_t);
-  xbt_dynar_free(&hosts_dynar);
-  msg_vm_t vm0, vm1;
-  s_vm_params_t params;
-  memset(&params, 0, sizeof(params));
+  msg_host_t pm0 = MSG_host_by_name("Fafard");
+  msg_host_t pm1 = MSG_host_by_name("Tremblay");
+  msg_host_t pm2 = MSG_host_by_name("Bourassa");
 
-  vm0 = MSG_vm_create_core(pm0, "VM0");
-  params.ramsize = 1L * 1000 * 1000 * 1000; // 1Gbytes
-  MSG_host_set_params(vm0, &params);
+  msg_vm_t vm0 = MSG_vm_create_core(pm0, "VM0");
+  MSG_vm_set_ramsize(vm0, 1e9); // 1Gbytes
   MSG_vm_start(vm0);
 
-  XBT_INFO("Test: Migrate a VM with %llu Mbytes RAM", params.ramsize / 1000 / 1000);
+  XBT_INFO("Test: Migrate a VM with %zu Mbytes RAM", MSG_vm_get_ramsize(vm0) / 1000 / 1000);
   vm_migrate(vm0, pm1);
 
   MSG_vm_destroy(vm0);
 
   vm0 = MSG_vm_create_core(pm0, "VM0");
-  params.ramsize = 1L * 1000 * 1000 * 100; // 100Mbytes
-  MSG_host_set_params(vm0, &params);
+  MSG_vm_set_ramsize(vm0, 1e8); // 100Mbytes
   MSG_vm_start(vm0);
 
-  XBT_INFO("Test: Migrate a VM with %llu Mbytes RAM", params.ramsize / 1000 / 1000);
+  XBT_INFO("Test: Migrate a VM with %zu Mbytes RAM", MSG_vm_get_ramsize(vm0) / 1000 / 1000);
   vm_migrate(vm0, pm1);
 
   MSG_vm_destroy(vm0);
 
   vm0 = MSG_vm_create_core(pm0, "VM0");
-  vm1 = MSG_vm_create_core(pm0, "VM1");
+  msg_vm_t vm1 = MSG_vm_create_core(pm0, "VM1");
 
-  params.ramsize = 1L * 1000 * 1000 * 1000; // 1Gbytes
-  MSG_host_set_params(vm0, &params);
-  MSG_host_set_params(vm1, &params);
+  MSG_vm_set_ramsize(vm0, 1e9); // 1Gbytes
+  MSG_vm_set_ramsize(vm1, 1e9); // 1Gbytes
   MSG_vm_start(vm0);
   MSG_vm_start(vm1);
 
@@ -101,9 +93,8 @@ static int master_main(int argc, char *argv[])
   vm0 = MSG_vm_create_core(pm0, "VM0");
   vm1 = MSG_vm_create_core(pm0, "VM1");
 
-  params.ramsize = 1L * 1000 * 1000 * 1000; // 1Gbytes
-  MSG_host_set_params(vm0, &params);
-  MSG_host_set_params(vm1, &params);
+  MSG_vm_set_ramsize(vm0, 1e9); // 1Gbytes
+  MSG_vm_set_ramsize(vm1, 1e9); // 1Gbytes
   MSG_vm_start(vm0);
   MSG_vm_start(vm1);
 
@@ -136,9 +127,7 @@ int main(int argc, char *argv[])
   /* load the platform file */
   MSG_create_environment(argv[1]);
 
-  xbt_dynar_t hosts_dynar = MSG_hosts_as_dynar();
-  msg_host_t pm0 = xbt_dynar_get_as(hosts_dynar, 0, msg_host_t);
-  xbt_dynar_free(&hosts_dynar);
+  msg_host_t pm0 =  MSG_host_by_name("Fafard");
   launch_master(pm0);
 
   int res = MSG_main();