Wait a while before effective shutdown.

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

diff --git a/examples/msg/cloud/masterslave_virtual_machines.c b/examples/msg/cloud/masterslave_virtual_machines.c
index 2ed5704..e1527eb 100644 (file)
--- a/examples/msg/cloud/masterslave_virtual_machines.c
+++ b/examples/msg/cloud/masterslave_virtual_machines.c
@@ -43,9 +43,10 @@ static void work_batch(int slaves_count) {
 
 int master(int argc, char *argv[]) {
   int slaves_count = 10;
-  m_host_t *slaves = xbt_new(m_host_t,10);
+  msg_host_t *slaves = xbt_new(msg_host_t,10);
 
-  int i;
+  msg_vm_t vm;
+  unsigned int i;
 
   /* Retrive the hostnames constituting our playground today */
   for (i = 1; i < argc; i++) {
@@ -62,10 +63,15 @@ int master(int argc, char *argv[]) {
     argv[0] = xbt_strdup(slavename);
     argv[1] = bprintf("%d",i);
     argv[2] = NULL;
-    msg_vm_t vm = MSG_vm_start(slaves[i],2);
+
+    char vmName[64];
+    snprintf(vmName, 64, "vm_%d", i);
+
+    msg_vm_t vm = MSG_vm_start(slaves[i],vmName,2);
     MSG_vm_bind(vm, MSG_process_create_with_arguments(slavename,slave_fun,NULL,slaves[i],2,argv));
   }
 
+
   xbt_dynar_t vms = MSG_vms_as_dynar();
   XBT_INFO("Launched %ld VMs", xbt_dynar_length(vms));
 
@@ -74,21 +80,23 @@ int master(int argc, char *argv[]) {
   work_batch(slaves_count);
 
   XBT_INFO("Now suspend all VMs, just for fun");
-  for (i=0;i<xbt_dynar_length(vms);i++)
-    MSG_vm_suspend(xbt_dynar_get_as(vms,i,msg_vm_t));
+
+  xbt_dynar_foreach(vms,i,vm) {
+    MSG_vm_suspend(vm);
+  }
 
   XBT_INFO("Wait a while");
   MSG_process_sleep(2);
 
   XBT_INFO("Enough. Let's resume everybody.");
-  for (i=0;i<xbt_dynar_length(vms);i++)
-    MSG_vm_resume(xbt_dynar_get_as(vms,i,msg_vm_t));
-
+  xbt_dynar_foreach(vms,i,vm) {
+    MSG_vm_resume(vm);
+  }
   XBT_INFO("Sleep long enough for everyone to be done with previous batch of work");
   MSG_process_sleep(1000-MSG_get_clock());
 
   XBT_INFO("Add one more process per VM");
-  for (i=0;i<xbt_dynar_length(vms);i++) {
+  xbt_dynar_foreach(vms,i,vm) {
     msg_vm_t vm = xbt_dynar_get_as(vms,i,msg_vm_t);
     char slavename[64];
     sprintf(slavename,"Slave %ld",i+xbt_dynar_length(vms));
@@ -99,15 +107,19 @@ int master(int argc, char *argv[]) {
     MSG_vm_bind(vm, MSG_process_create_with_arguments(slavename,slave_fun,NULL,slaves[i],2,argv));
   }
 
+  XBT_INFO("Reboot all the VMs");
+  xbt_dynar_foreach(vms,i,vm) {
+    MSG_vm_reboot(vm);
+  }
+
   work_batch(slaves_count*2);
 
   XBT_INFO("Migrate everyone to the second host.");
-  for (i=0;i<xbt_dynar_length(vms);i++)
-    MSG_vm_migrate(xbt_dynar_get_as(vms,i,msg_vm_t),slaves[1]);
-
+  xbt_dynar_foreach(vms,i,vm) {
+    MSG_vm_migrate(vm,slaves[1]);
+  }
   XBT_INFO("Suspend everyone, move them to the third host, and resume them.");
-  for (i=0;i<xbt_dynar_length(vms);i++) {
-    msg_vm_t vm = xbt_dynar_get_as(vms,i,msg_vm_t);
+  xbt_dynar_foreach(vms,i,vm) {
     MSG_vm_suspend(vm);
     MSG_vm_migrate(vm,slaves[2]);
     MSG_vm_resume(vm);
@@ -118,12 +130,14 @@ int master(int argc, char *argv[]) {
   for (i = 0; i < slaves_count; i++) {
     char mailbox_buffer[64];
     sprintf(mailbox_buffer,"Slave_%d",i);
-    m_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
+    msg_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
     MSG_task_send(finalize, mailbox_buffer);
   }
 
-  for (i=0;i<xbt_dynar_length(vms);i++) {
-    msg_vm_t vm = xbt_dynar_get_as(vms,i,msg_vm_t);
+  XBT_INFO("Wait a while before effective shutdown.");
+  MSG_process_sleep(2);
+
+  xbt_dynar_foreach(vms,i,vm) {
     MSG_vm_shutdown(vm);
     MSG_vm_destroy(vm);
   }
@@ -137,14 +151,13 @@ int master(int argc, char *argv[]) {
 /** Receiver function  */
 int slave_fun(int argc, char *argv[])
 {
-  char *mailbox_name;
-  m_task_t task = NULL;
+  char mailbox_name[128];
+  msg_task_t task = NULL;
   _XBT_GNUC_UNUSED int res;
-
   /* since the slaves will move around, use slave_%d as mailbox names instead of hostnames */
   xbt_assert(argc>=2, "slave processes need to be given their rank as parameter");
-  mailbox_name=bprintf("Slave_%s",argv[1]);
-
+  sprintf(mailbox_name,"Slave_%s",argv[1]);
+  XBT_INFO("Slave listenning on %s",argv[1]);
   while (1) {
     res = MSG_task_receive(&(task),mailbox_name);
     xbt_assert(res == MSG_OK, "MSG_task_get failed");
@@ -161,22 +174,21 @@ int slave_fun(int argc, char *argv[])
     task = NULL;
   }
 
-  free(mailbox_name);
   return 0;
 }                               /* end_of_slave */
 
 /** Main function */
 int main(int argc, char *argv[])
 {
-  MSG_error_t res = MSG_OK;
+  msg_error_t res = MSG_OK;
   xbt_dynar_t hosts_dynar;
-  m_host_t*hosts= xbt_new(m_host_t,10);
+  msg_host_t*hosts= xbt_new(msg_host_t,10);
   char**hostnames= xbt_new(char*,10);
   char**masterargv=xbt_new(char*,12);
   int i;
 
   /* Get the arguments */
-  MSG_global_init(&argc, argv);
+  MSG_init(&argc, argv);
   if (argc < 2) {
     printf("Usage: %s platform_file\n", argv[0]);
     printf("example: %s msg_platform.xml\n", argv[0]);
@@ -194,7 +206,7 @@ int main(int argc, char *argv[])
       "I need at least 10 hosts in the platform file, but %s contains only %ld hosts_dynar.",
       argv[1],xbt_dynar_length(hosts_dynar));
   for (i=0;i<10;i++) {
-    hosts[i] = xbt_dynar_get_as(hosts_dynar,i,m_host_t);
+    hosts[i] = xbt_dynar_get_as(hosts_dynar,i,msg_host_t);
     hostnames[i] = xbt_strdup(MSG_host_get_name(hosts[i]));
   }
   masterargv[0]=xbt_strdup("master");
@@ -206,8 +218,9 @@ int main(int argc, char *argv[])
   res = MSG_main();
   XBT_INFO("Simulation time %g", MSG_get_clock());
 
-  MSG_clean();
   free(hosts);
+  for (i=0;i<10;i++) 
+     free(hostnames[i]);
   free(hostnames);
   xbt_dynar_free(&hosts_dynar);