Merge branch 'master' of git+ssh://scm.gforge.inria.fr/gitroot/simgrid/simgrid

[simgrid.git] / examples / msg / cloud / migrate_vm.c

diff --git a/examples/msg/cloud/migrate_vm.c b/examples/msg/cloud/migrate_vm.c
index 03a08be..1c92fb5 100644 (file)
--- a/examples/msg/cloud/migrate_vm.c
+++ b/examples/msg/cloud/migrate_vm.c
@@ -1,19 +1,12 @@
-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. 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. */
 
-#include <stdio.h>
 #include "simgrid/msg.h"
-#include "xbt/sysdep.h"         /* calloc, printf */
-
-/* Create a log channel to have nice outputs. */
-#include "xbt/log.h"
-#include "xbt/asserts.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
-                             "Messages specific for this msg example");
 
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 static void vm_migrate(msg_vm_t vm, msg_host_t dst_pm)
 {
@@ -23,8 +16,8 @@ static void vm_migrate(msg_vm_t vm, msg_host_t dst_pm)
   double mig_end = MSG_get_clock();
 
   XBT_INFO("%s migrated: %s->%s in %g s", MSG_vm_get_name(vm),
-                 MSG_host_get_name(src_pm), MSG_host_get_name(dst_pm),
-                 mig_end - mig_sta);
+      MSG_host_get_name(src_pm), MSG_host_get_name(dst_pm),
+      mig_end - mig_sta);
 }
 
 static int migration_worker_main(int argc, char *argv[])
@@ -33,8 +26,8 @@ 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_get_host_by_name(vm_name);
-  msg_host_t dst_pm = MSG_get_host_by_name(dst_pm_name);
+  msg_vm_t vm = MSG_host_by_name(vm_name);
+  msg_host_t dst_pm = MSG_host_by_name(dst_pm_name);
 
   vm_migrate(vm, dst_pm);
 
@@ -64,11 +57,9 @@ static int master_main(int argc, char *argv[])
   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);
   msg_vm_t vm0, vm1;
-  s_ws_params_t params;
+  s_vm_params_t params;
   memset(&params, 0, sizeof(params));
 
-
-
   vm0 = MSG_vm_create_core(pm0, "VM0");
   params.ramsize = 1L * 1000 * 1000 * 1000; // 1Gbytes
   MSG_host_set_params(vm0, &params);
@@ -79,8 +70,6 @@ static int master_main(int argc, char *argv[])
 
   MSG_vm_destroy(vm0);
 
-
-
   vm0 = MSG_vm_create_core(pm0, "VM0");
   params.ramsize = 1L * 1000 * 1000 * 100; // 100Mbytes
   MSG_host_set_params(vm0, &params);
@@ -91,8 +80,6 @@ static int master_main(int argc, char *argv[])
 
   MSG_vm_destroy(vm0);
 
-
-
   vm0 = MSG_vm_create_core(pm0, "VM0");
   vm1 = MSG_vm_create_core(pm0, "VM1");
 
@@ -110,8 +97,6 @@ static int master_main(int argc, char *argv[])
   MSG_vm_destroy(vm0);
   MSG_vm_destroy(vm1);
 
-
-
   vm0 = MSG_vm_create_core(pm0, "VM0");
   vm1 = MSG_vm_create_core(pm0, "VM1");
 
@@ -129,7 +114,6 @@ static int master_main(int argc, char *argv[])
   MSG_vm_destroy(vm0);
   MSG_vm_destroy(vm1);
 
-
   return 0;
 }
 
@@ -143,7 +127,6 @@ static void launch_master(msg_host_t host)
   MSG_process_create_with_arguments(pr_name, master_main, NULL, host, 1, argv);
 }
 
-
 int main(int argc, char *argv[])
 {
   /* Get the arguments */
@@ -159,6 +142,5 @@ int main(int argc, char *argv[])
   int res = MSG_main();
   XBT_INFO("Bye (simulation time %g)", MSG_get_clock());
 
-
   return !(res == MSG_OK);
 }