Remove masterslave virtual machine old example

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index ec248a1..4f36521 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -171,8 +171,6 @@ if(NOT enable_memcheck)
 
   ADD_TEST(msg-masterslave-vivaldi-thread       ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh)
 
 
   ADD_TEST(msg-masterslave-vivaldi-thread       ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh)
 

-  ADD_TEST(msg-masterslave-virtual-machines-thread ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/masterslave_virtual_machines.tesh)
-

   ADD_TEST(msg-cloud-two-tasks-vm-thread ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/ --cd ${CMAKE_BINARY_DIR}/examples/msg/cloud/ ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/two_tasks_vm.tesh)
   
   ADD_TEST(msg-cloud-simple-vm-thread ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/ --cd ${CMAKE_BINARY_DIR}/examples/msg/cloud/ ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/simple_vm.tesh)
   ADD_TEST(msg-cloud-two-tasks-vm-thread ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/ --cd ${CMAKE_BINARY_DIR}/examples/msg/cloud/ ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/two_tasks_vm.tesh)
   
   ADD_TEST(msg-cloud-simple-vm-thread ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/ --cd ${CMAKE_BINARY_DIR}/examples/msg/cloud/ ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/simple_vm.tesh)


@@ -199,8 +197,6 @@ if(NOT enable_memcheck)
 
     ADD_TEST(msg-masterslave-vivaldi-ucontext   ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh)
 
 
     ADD_TEST(msg-masterslave-vivaldi-ucontext   ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh)
 

-    ADD_TEST(msg-masterslave-virtual-machines-ucontext ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/masterslave_virtual_machines.tesh)
-

     ADD_TEST(msg-cloud-two-tasks-vm-ucontext ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/ --cd ${CMAKE_BINARY_DIR}/examples/msg/cloud/ ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/two_tasks_vm.tesh)
      ADD_TEST(msg-cloud-simple-vm-ucontext ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/ --cd ${CMAKE_BINARY_DIR}/examples/msg/cloud/ ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/simple_vm.tesh)
   endif()
     ADD_TEST(msg-cloud-two-tasks-vm-ucontext ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/ --cd ${CMAKE_BINARY_DIR}/examples/msg/cloud/ ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/two_tasks_vm.tesh)
      ADD_TEST(msg-cloud-simple-vm-ucontext ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/ --cd ${CMAKE_BINARY_DIR}/examples/msg/cloud/ ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/simple_vm.tesh)
   endif()


@@ -227,8 +223,6 @@ if(NOT enable_memcheck)
 
     ADD_TEST(msg-masterslave-vivaldi-raw        ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh)
 
 
     ADD_TEST(msg-masterslave-vivaldi-raw        ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh)
 

-    ADD_TEST(msg-masterslave-virtual-machines-raw ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/masterslave_virtual_machines.tesh)
-

     ADD_TEST(msg-cloud-two-tasks-vm-raw ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/ --cd ${CMAKE_BINARY_DIR}/examples/msg/cloud/ ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/two_tasks_vm.tesh)
   ADD_TEST(msg-cloud-simple-vm-raw ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/ --cd ${CMAKE_BINARY_DIR}/examples/msg/cloud/ ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/simple_vm.tesh)
   endif()
     ADD_TEST(msg-cloud-two-tasks-vm-raw ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/ --cd ${CMAKE_BINARY_DIR}/examples/msg/cloud/ ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/two_tasks_vm.tesh)
   ADD_TEST(msg-cloud-simple-vm-raw ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/ --cd ${CMAKE_BINARY_DIR}/examples/msg/cloud/ ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/simple_vm.tesh)
   endif()

diff --git a/examples/msg/cloud/CMakeLists.txt b/examples/msg/cloud/CMakeLists.txt
index a79cbcc..66afe97 100644 (file)
--- a/examples/msg/cloud/CMakeLists.txt
+++ b/examples/msg/cloud/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 2.6)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 

-add_executable(masterslave_virtual_machines "masterslave_virtual_machines.c")

 add_executable(simple_vm "simple_vm.c")
 add_executable(migrate_vm "migrate_vm.c")
 add_executable(bound "bound.c")
 add_executable(simple_vm "simple_vm.c")
 add_executable(migrate_vm "migrate_vm.c")
 add_executable(bound "bound.c")


@@ -11,7 +10,6 @@ add_executable(multicore "multicore.c")
 add_executable(two_tasks_vm "two_tasks_vm.c")
 
 ### Add definitions for compile
 add_executable(two_tasks_vm "two_tasks_vm.c")
 
 ### Add definitions for compile

-target_link_libraries(masterslave_virtual_machines simgrid)

 target_link_libraries(simple_vm simgrid)
 target_link_libraries(migrate_vm simgrid)
 target_link_libraries(bound simgrid)
 target_link_libraries(simple_vm simgrid)
 target_link_libraries(migrate_vm simgrid)
 target_link_libraries(bound simgrid)


@@ -22,21 +20,18 @@ target_link_libraries(two_tasks_vm simgrid)
 
 set(tesh_files
   ${tesh_files}
 
 set(tesh_files
   ${tesh_files}

-  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_virtual_machines.tesh

   ${CMAKE_CURRENT_SOURCE_DIR}/two_tasks_vm.tesh
    ${CMAKE_CURRENT_SOURCE_DIR}/simple_vm.tesh
   PARENT_SCOPE
   )
 set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/two_tasks_vm.tesh
    ${CMAKE_CURRENT_SOURCE_DIR}/simple_vm.tesh
   PARENT_SCOPE
   )
 set(xml_files
   ${xml_files}

-  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_virtual_machines.xml

   ${CMAKE_CURRENT_SOURCE_DIR}/simple_plat.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/multicore_plat.xml
   PARENT_SCOPE
   )
 set(examples_src
   ${examples_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/simple_plat.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/multicore_plat.xml
   PARENT_SCOPE
   )
 set(examples_src
   ${examples_src}

-  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_virtual_machines.c

   ${CMAKE_CURRENT_SOURCE_DIR}/simple_vm.c
   ${CMAKE_CURRENT_SOURCE_DIR}/migrate_vm.c
   ${CMAKE_CURRENT_SOURCE_DIR}/bound.c
   ${CMAKE_CURRENT_SOURCE_DIR}/simple_vm.c
   ${CMAKE_CURRENT_SOURCE_DIR}/migrate_vm.c
   ${CMAKE_CURRENT_SOURCE_DIR}/bound.c

diff --git a/examples/msg/cloud/masterslave_virtual_machines.c b/examples/msg/cloud/masterslave_virtual_machines.c
deleted file mode 100644 (file)
index eb9d072..0000000
--- a/examples/msg/cloud/masterslave_virtual_machines.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/* Copyright (c) 2007-2014. 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 "msg/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");
-
-/** @addtogroup MSG_examples
- * 
- *  - <b>cloud/masterslave_virtual_machines.c: Master/workers
- *    example on a cloud</b>. The classical example revisited to demonstrate the use of virtual machines.
- */
-
-const double task_comp_size = 10000000;
-const double task_comm_size = 10000000;
-
-
-int master_fun(int argc, char *argv[]);
-int worker_fun(int argc, char *argv[]);
-
-
-static void work_batch(int workers_count)
-{
-  int i;
-  for (i = 0; i < workers_count; i++) {
-    char *tname = bprintf("Task%02d", i);
-    char *mbox =  bprintf("MBOX:WRK%02d", i);
-
-    msg_task_t task = MSG_task_create(tname, task_comp_size, task_comm_size, NULL);
-
-    XBT_INFO("send task(%s) to mailbox(%s)", tname, mbox);
-    MSG_task_send(task, mbox);
-
-    free(tname);
-    free(mbox);
-  }
-}
-
-int master_fun(int argc, char *argv[])
-{
-  msg_vm_t vm;
-  unsigned int i;
-  int workers_count = argc - 1;
-
-  msg_host_t *pms = xbt_new(msg_host_t, workers_count);
-  xbt_dynar_t vms = xbt_dynar_new(sizeof(msg_vm_t), NULL);
-
-  /* Retrieve the PMs that will launch worker processes. */
-  for (i = 1; i < argc; i++)
-    pms[i - 1] = MSG_get_host_by_name(argv[i]);
-
-
-  /* Launch VMs and worker processes. One VM per PM, and one worker process per VM. */
-
-  XBT_INFO("Launch %d VMs", workers_count);
-  for (i=0; i< workers_count; i++) {
-    char *vm_name = bprintf("VM%02d", i);
-    char *pr_name = bprintf("WRK%02d", i);
-    char *mbox = bprintf("MBOX:WRK%02d", i);
-
-    char **wrk_argv = xbt_new(char*, 3);
-    wrk_argv[0] = pr_name;
-    wrk_argv[1] = mbox;
-    wrk_argv[2] = NULL;
-
-    XBT_INFO("create %s", vm_name);
-    msg_vm_t vm = MSG_vm_create_core(pms[i], vm_name);
-
-    s_ws_params_t params;
-    memset(&params, 0, sizeof(params));
-    params.ramsize = 1L * 1024 * 1024 * 1024; // 1Gbytes
-    MSG_host_set_params(vm, &params);
-
-    MSG_vm_start(vm);
-    xbt_dynar_push(vms, &vm);
-
-    XBT_INFO("put %s on %s", pr_name, vm_name);
-    MSG_process_create_with_arguments(pr_name, worker_fun, NULL, vm, 2, wrk_argv);
-    xbt_free(vm_name);
-  }
-
-
-  /* Send a bunch of work to every one */
-  XBT_INFO("Send a task to %d worker process", workers_count);
-  work_batch(workers_count);
-
-  XBT_INFO("Suspend all VMs");
-  xbt_dynar_foreach(vms, i, vm) {
-    const char *vm_name = MSG_host_get_name(vm);
-    XBT_INFO("suspend %s", vm_name);
-    MSG_vm_suspend(vm);
-  }
-
-  XBT_INFO("Wait a while");
-  MSG_process_sleep(2);
-
-  XBT_INFO("Resume all VMs");
-  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");
-  xbt_dynar_foreach(vms, i, vm) {
-    unsigned int index = i + xbt_dynar_length(vms);
-    char *vm_name = bprintf("VM%02d", i);
-    char *pr_name = bprintf("WRK%02d", index);
-    char *mbox = bprintf("MBOX:WRK%02d", index);
-
-    char **wrk_argv = xbt_new(char*, 3);
-    wrk_argv[0] = pr_name;
-    wrk_argv[1] = mbox;
-    wrk_argv[2] = NULL;
-
-    XBT_INFO("put %s on %s", pr_name, vm_name);
-    MSG_process_create_with_arguments(pr_name, worker_fun, NULL, vm, 2, wrk_argv);
-    xbt_free(vm_name);
-  }
-
-  XBT_INFO("Send a task to %d worker process", workers_count * 2);
-  work_batch(workers_count * 2);
-
-  XBT_INFO("Migrate all VMs to PM(%s)", MSG_host_get_name(pms[1]));
-  xbt_dynar_foreach(vms, i, vm) {
-    MSG_vm_migrate(vm, pms[1]);
-  }
-
-  /* Migration with default policy is called (i.e. live migration with pre-copy strategy) */
-  /* If you want to use other policy such as post-copy or cold migration, you should add a third parameter that defines the policy */
-  XBT_INFO("Migrate all VMs to PM(%s)", MSG_host_get_name(pms[2]));
-  xbt_dynar_foreach(vms, i, vm) {
-    // MSG_vm_suspend(vm);
-    MSG_vm_migrate(vm, pms[2]);
-    // MSG_vm_resume(vm);
-  }
-
-
-  XBT_INFO("Shutdown the half of worker processes gracefuly. The remaining half will be forcibly killed");
-  for (i = 0; i < workers_count; i++) {
-    char mbox[64];
-    sprintf(mbox, "MBOX:WRK%02d", i);
-    msg_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
-    MSG_task_send(finalize, mbox);
-  }
-
-  XBT_INFO("Wait a while before effective shutdown.");
-  MSG_process_sleep(2);
-
-
-  XBT_INFO("Shutdown and destroy all the VMs. The remaining worker processes will be forcibly killed.");
-  xbt_dynar_foreach(vms, i, vm) {
-    XBT_INFO("shutdown %s", MSG_host_get_name(vm));
-    MSG_vm_shutdown(vm);
-    XBT_INFO("destroy %s", MSG_host_get_name(vm));
-    MSG_vm_destroy(vm);
-  }
-
-  XBT_INFO("Goodbye now!");
-  free(pms);
-  xbt_dynar_free(&vms);
-
-  return 0;
-}
-
-/** Receiver function  */
-int worker_fun(int argc, char *argv[])
-{
-  xbt_assert(argc == 2, "need mbox in arguments");
-
-  char *mbox = argv[1];
-  const char *pr_name = MSG_process_get_name(MSG_process_self());
-  XBT_INFO("%s is listenning on mailbox(%s)", pr_name, mbox);
-
-  for (;;) {
-    msg_task_t task = NULL;
-
-    msg_error_t res = MSG_task_receive(&task, mbox);
-    if (res != MSG_OK) {
-      XBT_CRITICAL("MSG_task_get failed");
-      DIE_IMPOSSIBLE;
-    }
-
-    XBT_INFO("%s received task(%s) from mailbox(%s)",
-        pr_name, MSG_task_get_name(task), mbox);
-
-    if (!strcmp(MSG_task_get_name(task), "finalize")) {
-      MSG_task_destroy(task);
-      break;
-    }
-
-    MSG_task_execute(task);
-    XBT_INFO("%s executed task(%s)", pr_name, MSG_task_get_name(task));
-    MSG_task_destroy(task);
-  }
-
-  return 0;
-}
-
-
-/** Main function */
-int main(int argc, char *argv[])
-{
-  const int nb_hosts = 3;
-
-  MSG_init(&argc, argv);
-  if (argc != 2) {
-    printf("Usage: %s example/msg/msg_platform.xml\n", argv[0]);
-    return 1;
-  }
-
-  /* Load the platform file */
-  MSG_create_environment(argv[1]);
-
-  /* Retrieve hosts from the platform file */
-  xbt_dynar_t hosts_dynar = MSG_hosts_as_dynar();
-
-  if (xbt_dynar_length(hosts_dynar) <= nb_hosts) {
-    XBT_CRITICAL("need %d hosts", nb_hosts);
-    return 1;
-  }
-
-  msg_host_t master_pm = NULL;
-  char **master_argv = xbt_new(char *, 12);
-  master_argv[0] = xbt_strdup("master");
-  master_argv[11] = NULL;
-
-  unsigned int i;
-  msg_host_t host;
-  xbt_dynar_foreach(hosts_dynar, i, host) {
-    if (i == 0) {
-      master_pm = host;
-      continue;
-    }
-
-    master_argv[i] = xbt_strdup(MSG_host_get_name(host));
-
-    if (i == nb_hosts)
-      break;
-  }
-
-  msg_error_t res = 1;
-  if (master_pm!=NULL){
-    MSG_process_create_with_arguments("master", master_fun, NULL, master_pm, nb_hosts + 1, master_argv);
-
-    res = MSG_main();
-    XBT_INFO("Bye (simulation time %g)", MSG_get_clock());
-  }
-  xbt_dynar_free(&hosts_dynar);
-
-  return !(res == MSG_OK);
-}

diff --git a/examples/msg/cloud/masterslave_virtual_machines.tesh b/examples/msg/cloud/masterslave_virtual_machines.tesh
deleted file mode 100644 (file)
index 2b6e1b6..0000000
--- a/examples/msg/cloud/masterslave_virtual_machines.tesh
+++ /dev/null
@@ -1,160 +0,0 @@
-#! ./tesh
-
-p Testing the Cloud API with a simple masterslave
-
-! output sort
-$ $SG_TEST_EXENV ${bindir:=.}/cloud/masterslave_virtual_machines$EXEEXT ${srcdir:=.}/msg_platform.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
-> [    0.000000] (10:Slave 8@Jean_Yves) Slave listenning on 8
-> [    0.000000] (11:Slave 9@Fafard) Slave listenning on 9
-> [    0.000000] (1:master@Jacquelin) Launched 10 VMs
-> [    0.000000] (1:master@Jacquelin) Send a first batch of work to every one
-> [    0.000000] (1:master@Jacquelin) Sending "Task_0" to "Slave_0"
-> [    0.000000] (2:Slave 0@Jacquelin) Slave listenning on 0
-> [    0.000000] (3:Slave 1@Intel) Slave listenning on 1
-> [    0.000000] (4:Slave 2@Provost) Slave listenning on 2
-> [    0.000000] (5:Slave 3@Fernand) Slave listenning on 3
-> [    0.000000] (6:Slave 4@Bescherelle) Slave listenning on 4
-> [    0.000000] (7:Slave 5@Ethernet) Slave listenning on 5
-> [    0.000000] (8:Slave 6@Kuenning) Slave listenning on 6
-> [    0.000000] (9:Slave 7@Dodge) Slave listenning on 7
-> [    0.020275] (1:master@Jacquelin) Sending "Task_1" to "Slave_1"
-> [    0.020275] (2:Slave 0@Jacquelin) Received "Task_0" from mailbox Slave_0
-> [    0.093091] (2:Slave 0@Jacquelin) "Task_0" done
-> [   23.866678] (1:master@Jacquelin) Sending "Task_2" to "Slave_2"
-> [   23.866678] (3:Slave 1@Intel) Received "Task_1" from mailbox Slave_1
-> [   23.939494] (3:Slave 1@Intel) "Task_1" done
-> [   48.674036] (1:master@Jacquelin) Sending "Task_3" to "Slave_3"
-> [   48.674036] (4:Slave 2@Provost) Received "Task_2" from mailbox Slave_2
-> [   48.746852] (4:Slave 2@Provost) "Task_2" done
-> [   56.325710] (1:master@Jacquelin) Sending "Task_4" to "Slave_4"
-> [   56.325710] (5:Slave 3@Fernand) Received "Task_3" from mailbox Slave_3
-> [   56.777157] (5:Slave 3@Fernand) "Task_3" done
-> [   64.574878] (1:master@Jacquelin) Sending "Task_5" to "Slave_5"
-> [   64.574878] (6:Slave 4@Bescherelle) Received "Task_4" from mailbox Slave_4
-> [   64.647694] (6:Slave 4@Bescherelle) "Task_4" done
-> [   73.010762] (1:master@Jacquelin) Sending "Task_6" to "Slave_6"
-> [   73.010762] (7:Slave 5@Ethernet) Received "Task_5" from mailbox Slave_5
-> [   73.112704] (7:Slave 5@Ethernet) "Task_5" done
-> [   81.730603] (1:master@Jacquelin) Sending "Task_7" to "Slave_7"
-> [   81.730603] (8:Slave 6@Kuenning) Received "Task_6" from mailbox Slave_6
-> [   81.847108] (8:Slave 6@Kuenning) "Task_6" done
-> [  126.150095] (1:master@Jacquelin) Sending "Task_8" to "Slave_8"
-> [  126.150095] (9:Slave 7@Dodge) Received "Task_7" from mailbox Slave_7
-> [  126.237474] (9:Slave 7@Dodge) "Task_7" done
-> [  169.839597] (10:Slave 8@Jean_Yves) Received "Task_8" from mailbox Slave_8
-> [  169.839597] (1:master@Jacquelin) Sending "Task_9" to "Slave_9"
-> [  169.941539] (10:Slave 8@Jean_Yves) "Task_8" done
-> [  176.014409] (11:Slave 9@Fafard) Received "Task_9" from mailbox Slave_9
-> [  176.014409] (1:master@Jacquelin) Now suspend all VMs, just for fun
-> [  176.014409] (1:master@Jacquelin) Wait a while
-> [  178.014409] (1:master@Jacquelin) Enough. Let's resume everybody.
-> [  178.014409] (1:master@Jacquelin) Sleep long enough for everyone to be done with previous batch of work
-> [  178.087225] (11:Slave 9@Fafard) "Task_9" done
-> [ 1000.000000] (12:Slave 10@Jacquelin) Slave listenning on 10
-> [ 1000.000000] (13:Slave 11@Intel) Slave listenning on 11
-> [ 1000.000000] (14:Slave 12@Provost) Slave listenning on 12
-> [ 1000.000000] (15:Slave 13@Fernand) Slave listenning on 13
-> [ 1000.000000] (16:Slave 14@Bescherelle) Slave listenning on 14
-> [ 1000.000000] (17:Slave 15@Ethernet) Slave listenning on 15
-> [ 1000.000000] (18:Slave 16@Kuenning) Slave listenning on 16
-> [ 1000.000000] (19:Slave 17@Dodge) Slave listenning on 17
-> [ 1000.000000] (1:master@Jacquelin) Add one more process per VM
-> [ 1000.000000] (1:master@Jacquelin) Reboot all the VMs
-> [ 1000.000000] (1:master@Jacquelin) Sending "Task_0" to "Slave_0"
-> [ 1000.000000] (20:Slave 18@Jean_Yves) Slave listenning on 18
-> [ 1000.000000] (21:Slave 19@Fafard) Slave listenning on 19
-> [ 1000.000000] (22:Slave 0@Jacquelin) Slave listenning on 0
-> [ 1000.000000] (23:Slave 10@Jacquelin) Slave listenning on 10
-> [ 1000.000000] (24:Slave 1@Intel) Slave listenning on 1
-> [ 1000.000000] (25:Slave 11@Intel) Slave listenning on 11
-> [ 1000.000000] (26:Slave 2@Provost) Slave listenning on 2
-> [ 1000.000000] (27:Slave 12@Provost) Slave listenning on 12
-> [ 1000.000000] (28:Slave 3@Fernand) Slave listenning on 3
-> [ 1000.000000] (29:Slave 13@Fernand) Slave listenning on 13
-> [ 1000.000000] (30:Slave 4@Bescherelle) Slave listenning on 4
-> [ 1000.000000] (31:Slave 14@Bescherelle) Slave listenning on 14
-> [ 1000.000000] (32:Slave 5@Ethernet) Slave listenning on 5
-> [ 1000.000000] (33:Slave 15@Ethernet) Slave listenning on 15
-> [ 1000.000000] (34:Slave 6@Kuenning) Slave listenning on 6
-> [ 1000.000000] (35:Slave 16@Kuenning) Slave listenning on 16
-> [ 1000.000000] (36:Slave 7@Dodge) Slave listenning on 7
-> [ 1000.000000] (37:Slave 17@Dodge) Slave listenning on 17
-> [ 1000.000000] (38:Slave 8@Jean_Yves) Slave listenning on 8
-> [ 1000.000000] (39:Slave 18@Jean_Yves) Slave listenning on 18
-> [ 1000.000000] (40:Slave 9@Fafard) Slave listenning on 9
-> [ 1000.000000] (41:Slave 19@Fafard) Slave listenning on 19
-> [ 1000.020275] (1:master@Jacquelin) Sending "Task_1" to "Slave_1"
-> [ 1000.020275] (22:Slave 0@Jacquelin) Received "Task_0" from mailbox Slave_0
-> [ 1000.093091] (22:Slave 0@Jacquelin) "Task_0" done
-> [ 1023.866678] (1:master@Jacquelin) Sending "Task_2" to "Slave_2"
-> [ 1023.866678] (24:Slave 1@Intel) Received "Task_1" from mailbox Slave_1
-> [ 1023.939494] (24:Slave 1@Intel) "Task_1" done
-> [ 1048.674036] (1:master@Jacquelin) Sending "Task_3" to "Slave_3"
-> [ 1048.674036] (26:Slave 2@Provost) Received "Task_2" from mailbox Slave_2
-> [ 1048.746852] (26:Slave 2@Provost) "Task_2" done
-> [ 1056.325710] (1:master@Jacquelin) Sending "Task_4" to "Slave_4"
-> [ 1056.325710] (28:Slave 3@Fernand) Received "Task_3" from mailbox Slave_3
-> [ 1056.777157] (28:Slave 3@Fernand) "Task_3" done
-> [ 1064.574878] (1:master@Jacquelin) Sending "Task_5" to "Slave_5"
-> [ 1064.574878] (30:Slave 4@Bescherelle) Received "Task_4" from mailbox Slave_4
-> [ 1064.647694] (30:Slave 4@Bescherelle) "Task_4" done
-> [ 1073.010762] (1:master@Jacquelin) Sending "Task_6" to "Slave_6"
-> [ 1073.010762] (32:Slave 5@Ethernet) Received "Task_5" from mailbox Slave_5
-> [ 1073.112704] (32:Slave 5@Ethernet) "Task_5" done
-> [ 1081.730603] (1:master@Jacquelin) Sending "Task_7" to "Slave_7"
-> [ 1081.730603] (34:Slave 6@Kuenning) Received "Task_6" from mailbox Slave_6
-> [ 1081.847108] (34:Slave 6@Kuenning) "Task_6" done
-> [ 1126.150095] (1:master@Jacquelin) Sending "Task_8" to "Slave_8"
-> [ 1126.150095] (36:Slave 7@Dodge) Received "Task_7" from mailbox Slave_7
-> [ 1126.237474] (36:Slave 7@Dodge) "Task_7" done
-> [ 1169.839597] (1:master@Jacquelin) Sending "Task_9" to "Slave_9"
-> [ 1169.839597] (38:Slave 8@Jean_Yves) Received "Task_8" from mailbox Slave_8
-> [ 1169.941539] (38:Slave 8@Jean_Yves) "Task_8" done
-> [ 1176.014409] (1:master@Jacquelin) Sending "Task_10" to "Slave_10"
-> [ 1176.014409] (40:Slave 9@Fafard) Received "Task_9" from mailbox Slave_9
-> [ 1176.034684] (1:master@Jacquelin) Sending "Task_11" to "Slave_11"
-> [ 1176.034684] (23:Slave 10@Jacquelin) Received "Task_10" from mailbox Slave_10
-> [ 1176.087225] (40:Slave 9@Fafard) "Task_9" done
-> [ 1176.107500] (23:Slave 10@Jacquelin) "Task_10" done
-> [ 1199.881087] (1:master@Jacquelin) Sending "Task_12" to "Slave_12"
-> [ 1199.881087] (25:Slave 11@Intel) Received "Task_11" from mailbox Slave_11
-> [ 1199.953902] (25:Slave 11@Intel) "Task_11" done
-> [ 1224.688445] (1:master@Jacquelin) Sending "Task_13" to "Slave_13"
-> [ 1224.688445] (27:Slave 12@Provost) Received "Task_12" from mailbox Slave_12
-> [ 1224.761260] (27:Slave 12@Provost) "Task_12" done
-> [ 1232.340119] (1:master@Jacquelin) Sending "Task_14" to "Slave_14"
-> [ 1232.340119] (29:Slave 13@Fernand) Received "Task_13" from mailbox Slave_13
-> [ 1232.791566] (29:Slave 13@Fernand) "Task_13" done
-> [ 1240.589287] (1:master@Jacquelin) Sending "Task_15" to "Slave_15"
-> [ 1240.589287] (31:Slave 14@Bescherelle) Received "Task_14" from mailbox Slave_14
-> [ 1240.662103] (31:Slave 14@Bescherelle) "Task_14" done
-> [ 1249.025171] (1:master@Jacquelin) Sending "Task_16" to "Slave_16"
-> [ 1249.025171] (33:Slave 15@Ethernet) Received "Task_15" from mailbox Slave_15
-> [ 1249.127113] (33:Slave 15@Ethernet) "Task_15" done
-> [ 1257.745012] (1:master@Jacquelin) Sending "Task_17" to "Slave_17"
-> [ 1257.745012] (35:Slave 16@Kuenning) Received "Task_16" from mailbox Slave_16
-> [ 1257.861517] (35:Slave 16@Kuenning) "Task_16" done
-> [ 1302.164504] (1:master@Jacquelin) Sending "Task_18" to "Slave_18"
-> [ 1302.164504] (37:Slave 17@Dodge) Received "Task_17" from mailbox Slave_17
-> [ 1302.251883] (37:Slave 17@Dodge) "Task_17" done
-> [ 1345.854006] (1:master@Jacquelin) Sending "Task_19" to "Slave_19"
-> [ 1345.854006] (39:Slave 18@Jean_Yves) Received "Task_18" from mailbox Slave_18
-> [ 1345.955948] (39:Slave 18@Jean_Yves) "Task_18" done
-> [ 1352.028818] (1:master@Jacquelin) Migrate everyone to the second host.
-> [ 1352.028818] (1:master@Jacquelin) Suspend everyone, move them to the third host, and resume them.
-> [ 1352.028818] (1:master@Jacquelin) Let's shut down the simulation. 10 first processes will be shut down cleanly while the second half will forcefully get killed
-> [ 1352.028818] (41:Slave 19@Fafard) Received "Task_19" from mailbox Slave_19
-> [ 1352.029013] (22:Slave 0@Provost) Received "finalize" from mailbox Slave_0
-> [ 1352.101633] (41:Slave 19@Provost) "Task_19" done
-> [ 1352.947711] (24:Slave 1@Provost) Received "finalize" from mailbox Slave_1
-> [ 1354.827365] (26:Slave 2@Provost) Received "finalize" from mailbox Slave_2
-> [ 1356.653021] (28:Slave 3@Provost) Received "finalize" from mailbox Slave_3
-> [ 1357.515808] (30:Slave 4@Provost) Received "finalize" from mailbox Slave_4
-> [ 1358.576004] (32:Slave 5@Provost) Received "finalize" from mailbox Slave_5
-> [ 1359.433313] (34:Slave 6@Provost) Received "finalize" from mailbox Slave_6
-> [ 1360.833461] (36:Slave 7@Provost) Received "finalize" from mailbox Slave_7
-> [ 1361.758549] (38:Slave 8@Provost) Received "finalize" from mailbox Slave_8
-> [ 1363.743206] (1:master@Jacquelin) Wait a while before effective shutdown.
-> [ 1363.743206] (40:Slave 9@Provost) Received "finalize" from mailbox Slave_9
-> [ 1365.743206] (0:@) Simulation time 1365.74
-> [ 1365.743206] (1:master@Jacquelin) Goodbye now!

diff --git a/examples/msg/cloud/masterslave_virtual_machines.xml b/examples/msg/cloud/masterslave_virtual_machines.xml
deleted file mode 100644 (file)
index 83bcdda..0000000
--- a/examples/msg/cloud/masterslave_virtual_machines.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-  <!-- The master process (with some arguments) -->
-  <process host="Tremblay" function="master">
-     <argument value="20"/>       <!-- Number of tasks -->
-     <argument value="50000000"/>  <!-- Computation size of tasks -->
-     <argument value="1000000"/>   <!-- Communication size of tasks -->
-     <argument value="Jupiter"/>  <!-- First slave -->
-     <argument value="Fafard"/>   <!-- Second slave -->
-     <argument value="Ginette"/>  <!-- Third slave -->
-     <argument value="Bourassa"/> <!-- Last slave -->
-  </process>
-  <!-- The slave process (with no argument) -->
-  <process host="Tremblay" function="slave"/>
-  <process host="Jupiter" function="slave"/>
-  <process host="Fafard" function="slave"/>
-  <process host="Ginette" function="slave"/>
-  <process host="Bourassa" function="slave"/>
-</platform>