slave2worker cont'd

diff --git a/.gitignore b/.gitignore
index 2f8b7eb..9d1bf7e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,6 @@ examples/simdag/scheduling/sd_scheduling.jed
 teshsuite/simdag/platforms/simgrid.jed
 ### Libraries links 
 examples/lua/simgrid.so
 teshsuite/simdag/platforms/simgrid.jed
 ### Libraries links 
 examples/lua/simgrid.so

-examples/msg/masterslave/simgrid.so

 examples/simdag/simgrid.so
 examples/lua/console/simgrid.so
 SimGrid-*.tar.gz
 examples/simdag/simgrid.so
 examples/lua/console/simgrid.so
 SimGrid-*.tar.gz


@@ -145,9 +144,9 @@ examples/msg/io-file-unlink/io-file-unlink
 examples/msg/io-remote/io-remote
 examples/msg/io-storage/io-storage
 examples/msg/failures/failures
 examples/msg/io-remote/io-remote
 examples/msg/io-storage/io-storage
 examples/msg/failures/failures

-examples/msg/masterslave/masterslave
+examples/msg/masterworker/masterworker

 examples/msg/process-kill/process-kill
 examples/msg/process-kill/process-kill

-examples/msg/masterslave-mailbox/masterslave-mailbox
+examples/msg/masterworker-mailbox/masterworker-mailbox

 examples/msg/mc/bugged1
 examples/msg/mc/bugged1_liveness
 examples/msg/mc/bugged1_stateful
 examples/msg/mc/bugged1
 examples/msg/mc/bugged1_liveness
 examples/msg/mc/bugged1_stateful


@@ -181,7 +180,7 @@ examples/msg/trace/test_trace_integration
 examples/msg/trace-categories/trace-categories
 examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables
 examples/msg/trace-link-user-variables/trace-link-user-variables
 examples/msg/trace-categories/trace-categories
 examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables
 examples/msg/trace-link-user-variables/trace-link-user-variables

-examples/msg/trace-masterslave/trace-masterslave
+examples/msg/trace-masterworker/trace-masterworker

 examples/msg/trace-process-migration/trace-process-migration
 examples/msg/trace-simple/trace-simple
 examples/msg/trace-platform/trace-platform
 examples/msg/trace-process-migration/trace-process-migration
 examples/msg/trace-simple/trace-simple
 examples/msg/trace-platform/trace-platform

diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt
index 0e1b300..1021e69 100644 (file)
--- a/examples/msg/CMakeLists.txt
+++ b/examples/msg/CMakeLists.txt
@@ -1,8 +1,8 @@
 foreach(x actions-mpi actions-storage async-wait async-waitall async-waitany dht-chord dht-pastry exception 
           energy-consumption energy-onoff energy-pstate energy-ptask energy-vm failures io-file io-file-unlink io-remote
 foreach(x actions-mpi actions-storage async-wait async-waitall async-waitany dht-chord dht-pastry exception 
           energy-consumption energy-onoff energy-pstate energy-ptask energy-vm failures io-file io-file-unlink io-remote

-          io-storage masterslave masterslave-mailbox pmm task-priority process-kill process-migration process-suspend 
+          io-storage masterworker masterworker-mailbox pmm task-priority process-kill process-migration process-suspend 

           properties sendrecv set-maestro process-startkilltime synchro token_ring trace-categories 
           properties sendrecv set-maestro process-startkilltime synchro token_ring trace-categories 

-          trace-link-srcdst-user-variables trace-link-user-variables trace-masterslave trace-platform 
+          trace-link-srcdst-user-variables trace-link-user-variables trace-masterworker trace-platform 

           trace-process-migration trace-simple trace-user-variables)
   add_executable       (${x}     ${x}/${x}.c)
   target_link_libraries(${x}     simgrid)
           trace-process-migration trace-simple trace-user-variables)
   add_executable       (${x}     ${x}/${x}.c)
   target_link_libraries(${x}     simgrid)


@@ -39,7 +39,7 @@ foreach (file answer dht-kademlia node routing_table task)
 endforeach()
 
 foreach (file actions-mpi actions-storage async-wait async-waitall async-waitany bittorrent chainsend dht-chord 
 endforeach()
 
 foreach (file actions-mpi actions-storage async-wait async-waitall async-waitany bittorrent chainsend dht-chord 

-         dht-kademlia dht-pastry io-remote masterslave masterslave-mailbox properties sendrecv set-maestro
+         dht-kademlia dht-pastry io-remote masterworker masterworker-mailbox properties sendrecv set-maestro

          task-priority)
   set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/${file}/${file}_d.xml)
 endforeach()
          task-priority)
   set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/${file}/${file}_d.xml)
 endforeach()


@@ -58,17 +58,17 @@ set(examples_src ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/chainsend/chainsen
 set(tesh_files   ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent/bittorrent.tesh
                                   ${CMAKE_CURRENT_SOURCE_DIR}/chainsend/chainsend.tesh
                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/dht-kademlia.tesh
 set(tesh_files   ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent/bittorrent.tesh
                                   ${CMAKE_CURRENT_SOURCE_DIR}/chainsend/chainsend.tesh
                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/dht-kademlia.tesh

-                                  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave/masterslave_cpu_ti.tesh
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave-mailbox/masterslave-mailbox-multicore.tesh
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave-mailbox/masterslave-mailbox-vivaldi.tesh
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/masterworker/masterworker_cpu_ti.tesh
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/masterworker-mailbox/masterworker-mailbox-multicore.tesh
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/masterworker-mailbox/masterworker-mailbox-vivaldi.tesh

                                   ${CMAKE_CURRENT_SOURCE_DIR}/ns3/ns3.tesh                                 PARENT_SCOPE)
 set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi_split_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/async-wait2_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/async-wait3_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/async-wait4_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/energy-onoff/platform_onoff.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/ns3/ns3.tesh                                 PARENT_SCOPE)
 set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi_split_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/async-wait2_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/async-wait3_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/async-wait4_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/energy-onoff/platform_onoff.xml

-                                  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave-mailbox/masterslave-mailbox-multicore_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave-mailbox/masterslave-mailbox-vivaldi_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/masterworker-mailbox/masterworker-mailbox-multicore_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/masterworker-mailbox/masterworker-mailbox-vivaldi_d.xml

                                   ${CMAKE_CURRENT_SOURCE_DIR}/ns3/3hosts_2links_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/ns3/3links-timer_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/ns3/3links_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/ns3/3hosts_2links_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/ns3/3links-timer_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/ns3/3links_d.xml


@@ -83,7 +83,7 @@ set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/action
                                   ${CMAKE_CURRENT_SOURCE_DIR}/process-startkilltime/start_kill_d.xml       PARENT_SCOPE)
 
 foreach(x actions-mpi actions-storage async-wait async-waitall async-waitany bittorrent chainsend dht-chord dht-kademlia
                                   ${CMAKE_CURRENT_SOURCE_DIR}/process-startkilltime/start_kill_d.xml       PARENT_SCOPE)
 
 foreach(x actions-mpi actions-storage async-wait async-waitall async-waitany bittorrent chainsend dht-chord dht-kademlia

-        failures io-file io-file-unlink io-remote io-storage masterslave masterslave-mailbox task-priority process-kill 
+        failures io-file io-file-unlink io-remote io-storage masterworker masterworker-mailbox task-priority process-kill 

         process-migration process-suspend properties sendrecv synchro process-startkilltime token_ring)
   ADD_TESH_FACTORIES(msg-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/${x} ${x}.tesh)
 endforeach()
         process-migration process-suspend properties sendrecv synchro process-startkilltime token_ring)
   ADD_TESH_FACTORIES(msg-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/${x} ${x}.tesh)
 endforeach()


@@ -92,7 +92,7 @@ foreach (example consumption onoff pstate vm)
   ADD_TESH_FACTORIES(msg-energy-${example} "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-${example}/energy-${example}.tesh)
 endforeach()
 
   ADD_TESH_FACTORIES(msg-energy-${example} "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-${example}/energy-${example}.tesh)
 endforeach()
 

-foreach (x categories link-srcdst-user-variables link-user-variables masterslave platform process-migration simple user-variables)
+foreach (x categories link-srcdst-user-variables link-user-variables masterworker platform process-migration simple user-variables)

   ADD_TESH(msg-trace-${x} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/trace-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/trace-${x} trace-${x}.tesh)
 endforeach()
 
   ADD_TESH(msg-trace-${x} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/trace-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/trace-${x} trace-${x}.tesh)
 endforeach()
 


@@ -104,11 +104,11 @@ ADD_TESH_FACTORIES(msg-energy-consumption-ptask        "thread;ucontext;raw;boos
 ADD_TESH_FACTORIES(msg-energy-ptask                    "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-ptask/energy-ptask.tesh)
 ADD_TESH_FACTORIES(msg-set-maestro                     "thread" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/set-maestro/set-maestro.tesh)
 
 ADD_TESH_FACTORIES(msg-energy-ptask                    "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-ptask/energy-ptask.tesh)
 ADD_TESH_FACTORIES(msg-set-maestro                     "thread" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/set-maestro/set-maestro.tesh)
 

-ADD_TESH_FACTORIES(msg-masterslave-mailbox-multicore   "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave-mailbox/masterslave-mailbox-multicore.tesh)
-ADD_TESH_FACTORIES(msg-masterslave-mailbox-vivaldi     "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave-mailbox/masterslave-mailbox-vivaldi.tesh)
+ADD_TESH_FACTORIES(msg-masterworker-mailbox-multicore   "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterworker-mailbox/masterworker-mailbox-multicore.tesh)
+ADD_TESH_FACTORIES(msg-masterworker-mailbox-vivaldi     "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterworker-mailbox/masterworker-mailbox-vivaldi.tesh)

 
 # Weird issue with this one ...
 
 # Weird issue with this one ...

-#ADD_TESH_FACTORIES(msg-masterslave-cpu-ti              "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/masterslave --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave masterslave_cpu_ti.tesh)
+#ADD_TESH_FACTORIES(msg-masterworker-cpu-ti              "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/masterworker --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/masterworker masterworker_cpu_ti.tesh)

 
 ADD_TESH(msg-pmm  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm.tesh)
 
 
 ADD_TESH(msg-pmm  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm.tesh)
 

diff --git a/examples/msg/cloud/master_worker_vm.c b/examples/msg/cloud/master_worker_vm.c
index bd0bfc7..0137bdf 100644 (file)
--- a/examples/msg/cloud/master_worker_vm.c
+++ b/examples/msg/cloud/master_worker_vm.c
@@ -12,7 +12,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example")
 
 /** @addtogroup MSG_examples
  *
 
 /** @addtogroup MSG_examples
  *

- *  - <b>cloud/masterslave_virtual_machines.c: Master/workers
+ *  - <b>cloud/master_worker_vm.c: Master/workers

  *    example on a cloud</b>. The classical example revisited to demonstrate the use of virtual machines.
  */
 
  *    example on a cloud</b>. The classical example revisited to demonstrate the use of virtual machines.
  */
 

diff --git a/examples/msg/cloud/master_worker_vm.tesh b/examples/msg/cloud/master_worker_vm.tesh
index 37b2eb0..9187794 100644 (file)
--- a/examples/msg/cloud/master_worker_vm.tesh
+++ b/examples/msg/cloud/master_worker_vm.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
 #! ./tesh
 

-p Testing the Cloud API with a simple masterslave
+p Testing the Cloud API with a simple master/workers

 
 $ $SG_TEST_EXENV ${bindir:=.}/master_worker_vm$EXEEXT --log=no_loc ${srcdir:=.}/../../platforms/platform.xml
 > [Jacquelin:master:(1) 0.000000] [msg_test/INFO] # Launch 2 VMs
 
 $ $SG_TEST_EXENV ${bindir:=.}/master_worker_vm$EXEEXT --log=no_loc ${srcdir:=.}/../../platforms/platform.xml
 > [Jacquelin:master:(1) 0.000000] [msg_test/INFO] # Launch 2 VMs

diff --git a/examples/msg/energy-ptask/energy-ptask.c b/examples/msg/energy-ptask/energy-ptask.c
index 46990fa..522ed98 100644 (file)
--- a/examples/msg/energy-ptask/energy-ptask.c
+++ b/examples/msg/energy-ptask/energy-ptask.c
@@ -20,49 +20,47 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example")
 static int runner(int argc, char *argv[])
 {
   /* Retrieve the list of all hosts as an array of hosts */
 static int runner(int argc, char *argv[])
 {
   /* Retrieve the list of all hosts as an array of hosts */

-  xbt_dynar_t slaves_dynar = MSG_hosts_as_dynar();
-  int slaves_count = xbt_dynar_length(slaves_dynar);
-  msg_host_t *slaves = xbt_dynar_to_array(slaves_dynar);
+  int hosts_count = MSG_get_host_number();
+  msg_host_t *hosts = xbt_dynar_to_array(MSG_hosts_as_dynar());

 
   XBT_INFO("First, build a classical parallel task, with 1 Gflop to execute on each node, "
            "and 10MB to exchange between each pair");
 
   XBT_INFO("First, build a classical parallel task, with 1 Gflop to execute on each node, "
            "and 10MB to exchange between each pair");

-  double *computation_amounts = xbt_new0(double, slaves_count);
-  double *communication_amounts = xbt_new0(double, slaves_count * slaves_count);
+  double *computation_amounts = xbt_new0(double, hosts_count);
+  double *communication_amounts = xbt_new0(double, hosts_count * hosts_count);

 
 

-  for (int i = 0; i < slaves_count; i++)
+  for (int i = 0; i < hosts_count; i++)

     computation_amounts[i] = 1e9; // 1 Gflop
 
     computation_amounts[i] = 1e9; // 1 Gflop
 

-  for (int i = 0; i < slaves_count; i++)
-    for (int j = i + 1; j < slaves_count; j++)
-      communication_amounts[i * slaves_count + j] = 1e7; // 10 MB
+  for (int i = 0; i < hosts_count; i++)
+    for (int j = i + 1; j < hosts_count; j++)
+      communication_amounts[i * hosts_count + j] = 1e7; // 10 MB

 
   msg_task_t ptask =
 
   msg_task_t ptask =

-    MSG_parallel_task_create("parallel task", slaves_count, slaves, computation_amounts, communication_amounts, NULL);
+    MSG_parallel_task_create("parallel task", hosts_count, hosts, computation_amounts, communication_amounts, NULL);

   MSG_parallel_task_execute(ptask);
   MSG_task_destroy(ptask);
   /* The arrays communication_amounts and computation_amounts are not to be freed manually */
 
   XBT_INFO("Then, build a parallel task involving only computations and no communication (1 Gflop per node)");
   MSG_parallel_task_execute(ptask);
   MSG_task_destroy(ptask);
   /* The arrays communication_amounts and computation_amounts are not to be freed manually */
 
   XBT_INFO("Then, build a parallel task involving only computations and no communication (1 Gflop per node)");

-  computation_amounts = xbt_new0(double, slaves_count);
-  for (int i = 0; i < slaves_count; i++)
+  computation_amounts = xbt_new0(double, hosts_count);
+  for (int i = 0; i < hosts_count; i++)

     computation_amounts[i] = 1e9; // 1 Gflop
     computation_amounts[i] = 1e9; // 1 Gflop

-  ptask =
-    MSG_parallel_task_create("parallel exec", slaves_count, slaves, computation_amounts, NULL/* no comm */, NULL);
+  ptask = MSG_parallel_task_create("parallel exec", hosts_count, hosts, computation_amounts, NULL/* no comm */, NULL);

   MSG_parallel_task_execute(ptask);
   MSG_task_destroy(ptask);
 
   MSG_parallel_task_execute(ptask);
   MSG_task_destroy(ptask);
 

-  XBT_INFO("Finally, trick the ptask to do a 'remote execution', on host %s", MSG_host_get_name(slaves[1]));
+  XBT_INFO("Finally, trick the ptask to do a 'remote execution', on host %s", MSG_host_get_name(hosts[1]));

   computation_amounts = xbt_new0(double, 1);
   computation_amounts[0] = 1e9; // 1 Gflop
   msg_host_t *remote = xbt_new(msg_host_t,1);
   computation_amounts = xbt_new0(double, 1);
   computation_amounts[0] = 1e9; // 1 Gflop
   msg_host_t *remote = xbt_new(msg_host_t,1);

-  remote[0] = slaves[1];
+  remote[0] = hosts[1];

   ptask = MSG_parallel_task_create("remote exec", 1, remote, computation_amounts, NULL/* no comm */, NULL);
   MSG_parallel_task_execute(ptask);
   MSG_task_destroy(ptask);
   free(remote);
 
   XBT_INFO("Goodbye now!");
   ptask = MSG_parallel_task_create("remote exec", 1, remote, computation_amounts, NULL/* no comm */, NULL);
   MSG_parallel_task_execute(ptask);
   MSG_task_destroy(ptask);
   free(remote);
 
   XBT_INFO("Goodbye now!");

-  free(slaves);
+  free(hosts);

   return 0;
 }
 
   return 0;
 }
 

diff --git a/examples/msg/failures/failures.c b/examples/msg/failures/failures.c
index 070d75a..4a261ce 100644 (file)
--- a/examples/msg/failures/failures.c
+++ b/examples/msg/failures/failures.c
@@ -12,8 +12,8 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example")
 
 static int master(int argc, char *argv[])
 {
 
 static int master(int argc, char *argv[])
 {

-  int slaves_count = 0;
-  msg_host_t *slaves = NULL;
+  int workers_count = 0;
+  msg_host_t *workers = NULL;

   int number_of_tasks = 0;
   double task_comp_size = 0;
   double task_comm_size = 0;
   int number_of_tasks = 0;
   double task_comp_size = 0;
   double task_comm_size = 0;


@@ -28,21 +28,21 @@ static int master(int argc, char *argv[])
   xbt_assert(read, "Invalid argument %s\n", argv[3]);
 
   {                             /* Process organization */
   xbt_assert(read, "Invalid argument %s\n", argv[3]);
 
   {                             /* Process organization */

-    slaves_count = argc - 4;
-    slaves = xbt_new0(msg_host_t, slaves_count);
+    workers_count = argc - 4;
+    workers = xbt_new0(msg_host_t, workers_count);

 
     for (i = 4; i < argc; i++) {
 
     for (i = 4; i < argc; i++) {

-      slaves[i - 4] = MSG_host_by_name(argv[i]);
-      if (slaves[i - 4] == NULL) {
+      workers[i - 4] = MSG_host_by_name(argv[i]);
+      if (workers[i - 4] == NULL) {

         XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]);
         abort();
       }
     }
   }
 
         XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]);
         abort();
       }
     }
   }
 

-  XBT_INFO("Got %d slave(s) :", slaves_count);
-  for (i = 0; i < slaves_count; i++)
-    XBT_INFO("%s", MSG_host_get_name(slaves[i]));
+  XBT_INFO("Got %d worker(s) :", workers_count);
+  for (i = 0; i < workers_count; i++)
+    XBT_INFO("%s", MSG_host_get_name(workers[i]));

 
   XBT_INFO("Got %d task to process :", number_of_tasks);
 
 
   XBT_INFO("Got %d task to process :", number_of_tasks);
 


@@ -50,7 +50,7 @@ static int master(int argc, char *argv[])
     msg_task_t task = MSG_task_create("Task", task_comp_size, task_comm_size, xbt_new0(double, 1));
     *((double *) task->data) = MSG_get_clock();
 
     msg_task_t task = MSG_task_create("Task", task_comp_size, task_comm_size, xbt_new0(double, 1));
     *((double *) task->data) = MSG_get_clock();
 

-    msg_error_t a = MSG_task_send_with_timeout(task,MSG_host_get_name(slaves[i % slaves_count]),10.0);
+    msg_error_t a = MSG_task_send_with_timeout(task,MSG_host_get_name(workers[i % workers_count]),10.0);

 
     if (a == MSG_OK) {
       XBT_INFO("Send completed");
 
     if (a == MSG_OK) {
       XBT_INFO("Send completed");


@@ -58,16 +58,16 @@ static int master(int argc, char *argv[])
       XBT_INFO("Gloups. The cpu on which I'm running just turned off!. See you!");
       free(task->data);
       MSG_task_destroy(task);
       XBT_INFO("Gloups. The cpu on which I'm running just turned off!. See you!");
       free(task->data);
       MSG_task_destroy(task);

-      free(slaves);
+      free(workers);

       return 0;
     } else if (a == MSG_TRANSFER_FAILURE) {
       XBT_INFO("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!",
       return 0;
     } else if (a == MSG_TRANSFER_FAILURE) {
       XBT_INFO("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!",

-               MSG_host_get_name(slaves[i % slaves_count]));
+               MSG_host_get_name(workers[i % workers_count]));

       free(task->data);
       MSG_task_destroy(task);
     } else if (a == MSG_TIMEOUT) {
       XBT_INFO ("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!",
       free(task->data);
       MSG_task_destroy(task);
     } else if (a == MSG_TIMEOUT) {
       XBT_INFO ("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!",

-              MSG_host_get_name(slaves[i % slaves_count]));
+              MSG_host_get_name(workers[i % workers_count]));

       free(task->data);
       MSG_task_destroy(task);
     } else {
       free(task->data);
       MSG_task_destroy(task);
     } else {


@@ -77,35 +77,35 @@ static int master(int argc, char *argv[])
   }
 
   XBT_INFO("All tasks have been dispatched. Let's tell everybody the computation is over.");
   }
 
   XBT_INFO("All tasks have been dispatched. Let's tell everybody the computation is over.");

-  for (i = 0; i < slaves_count; i++) {
+  for (i = 0; i < workers_count; i++) {

     msg_task_t task = MSG_task_create("finalize", 0, 0, FINALIZE);
     msg_task_t task = MSG_task_create("finalize", 0, 0, FINALIZE);

-    int a = MSG_task_send_with_timeout(task,MSG_host_get_name(slaves[i]),1.0);
+    int a = MSG_task_send_with_timeout(task,MSG_host_get_name(workers[i]),1.0);

     if (a == MSG_OK)
       continue;
     if (a == MSG_HOST_FAILURE) {
       XBT_INFO("Gloups. The cpu on which I'm running just turned off!. See you!");
       MSG_task_destroy(task);
     if (a == MSG_OK)
       continue;
     if (a == MSG_HOST_FAILURE) {
       XBT_INFO("Gloups. The cpu on which I'm running just turned off!. See you!");
       MSG_task_destroy(task);

-      free(slaves);
+      free(workers);

       return 0;
     } else if (a == MSG_TRANSFER_FAILURE) {
       return 0;
     } else if (a == MSG_TRANSFER_FAILURE) {

-      XBT_INFO("Mmh. Can't reach '%s'! Nevermind. Let's keep going!", MSG_host_get_name(slaves[i]));
+      XBT_INFO("Mmh. Can't reach '%s'! Nevermind. Let's keep going!", MSG_host_get_name(workers[i]));

       MSG_task_destroy(task);
     } else if (a == MSG_TIMEOUT) {
       XBT_INFO("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!",
       MSG_task_destroy(task);
     } else if (a == MSG_TIMEOUT) {
       XBT_INFO("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!",

-               MSG_host_get_name(slaves[i % slaves_count]));
+               MSG_host_get_name(workers[i % workers_count]));

       MSG_task_destroy(task);
     } else {
       XBT_INFO("Hey ?! What's up ? ");
       MSG_task_destroy(task);
     } else {
       XBT_INFO("Hey ?! What's up ? ");

-      xbt_die("Unexpected behavior with '%s': %d", MSG_host_get_name(slaves[i]), a);
+      xbt_die("Unexpected behavior with '%s': %d", MSG_host_get_name(workers[i]), a);

     }
   }
 
   XBT_INFO("Goodbye now!");
     }
   }
 
   XBT_INFO("Goodbye now!");

-  free(slaves);
+  free(workers);

   return 0;
 }
 
   return 0;
 }
 

-static int slave(int argc, char *argv[])
+static int worker(int argc, char *argv[])

 {
   while (1) {
     msg_task_t task = NULL;
 {
   while (1) {
     msg_task_t task = NULL;


@@ -164,7 +164,7 @@ int main(int argc, char *argv[])
   MSG_create_environment(argv[1]);
 
   MSG_function_register("master", master);
   MSG_create_environment(argv[1]);
 
   MSG_function_register("master", master);

-  MSG_function_register("slave", slave);
+  MSG_function_register("worker", worker);

   MSG_launch_application(argv[2]);
 
   res = MSG_main();
   MSG_launch_application(argv[2]);
 
   res = MSG_main();

diff --git a/examples/msg/failures/failures.tesh b/examples/msg/failures/failures.tesh
index 7d80ba5..77da016 100644 (file)
--- a/examples/msg/failures/failures.tesh
+++ b/examples/msg/failures/failures.tesh
@@ -1,11 +1,11 @@
 #! ./tesh
 
 #! ./tesh
 

-p Testing a simple master/slave example application handling failures TCP crosstraffic DISABLED
+p Testing a simple master/worker example application handling failures TCP crosstraffic DISABLED

 
 ! output sort 19
 
 ! output sort 19

-$ $SG_TEST_EXENV ${bindir:=.}/failures$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/../msg/masterslave/masterslave_d.xml --cfg=path:${srcdir} --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Cannot launch process 'slave' on failed host 'Fafard'
-> [  0.000000] (1:master@Tremblay) Got 5 slave(s) :
+$ $SG_TEST_EXENV ${bindir:=.}/failures$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/../msg/masterworker/masterworker_d.xml --cfg=path:${srcdir} --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Cannot launch process 'worker' on failed host 'Fafard'
+> [  0.000000] (1:master@Tremblay) Got 5 worker(s) :

 > [  0.000000] (1:master@Tremblay) Jupiter
 > [  0.000000] (1:master@Tremblay) Fafard
 > [  0.000000] (1:master@Tremblay) Ginette
 > [  0.000000] (1:master@Tremblay) Jupiter
 > [  0.000000] (1:master@Tremblay) Fafard
 > [  0.000000] (1:master@Tremblay) Ginette


@@ -14,99 +14,99 @@ $ $SG_TEST_EXENV ${bindir:=.}/failures$EXEEXT --log=xbt_cfg.thres:critical --log
 > [  0.000000] (1:master@Tremblay) Got 20 task to process :
 > [  1.000000] (0:maestro@) Restart processes on host: Fafard
 > [  1.000000] (1:master@Tremblay) Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going!
 > [  0.000000] (1:master@Tremblay) Got 20 task to process :
 > [  1.000000] (0:maestro@) Restart processes on host: Fafard
 > [  1.000000] (1:master@Tremblay) Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going!

-> [  1.000000] (3:slave@Jupiter) Gloups. The cpu on which I'm running just turned off!. See you!
+> [  1.000000] (3:worker@Jupiter) Gloups. The cpu on which I'm running just turned off!. See you!

 > [  2.000000] (0:maestro@) Restart processes on host: Jupiter
 > [ 11.000000] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 12.030928] (1:master@Tremblay) Send completed
 > [  2.000000] (0:maestro@) Restart processes on host: Jupiter
 > [ 11.000000] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 12.030928] (1:master@Tremblay) Send completed

-> [ 12.030928] (4:slave@Ginette) Received "Task"
-> [ 12.030928] (4:slave@Ginette) Communication time : "1.030928"
-> [ 12.030928] (4:slave@Ginette) Processing "Task"
+> [ 12.030928] (4:worker@Ginette) Received "Task"
+> [ 12.030928] (4:worker@Ginette) Communication time : "1.030928"
+> [ 12.030928] (4:worker@Ginette) Processing "Task"

 > [ 13.061856] (1:master@Tremblay) Send completed
 > [ 13.061856] (1:master@Tremblay) Send completed

-> [ 13.061856] (5:slave@Bourassa) Received "Task"
-> [ 13.061856] (5:slave@Bourassa) Communication time : "1.030928"
-> [ 13.061856] (5:slave@Bourassa) Processing "Task"
+> [ 13.061856] (5:worker@Bourassa) Received "Task"
+> [ 13.061856] (5:worker@Bourassa) Communication time : "1.030928"
+> [ 13.061856] (5:worker@Bourassa) Processing "Task"

 > [ 13.072165] (1:master@Tremblay) Send completed
 > [ 13.072165] (1:master@Tremblay) Send completed

-> [ 13.072165] (2:slave@Tremblay) Received "Task"
-> [ 13.072165] (2:slave@Tremblay) Communication time : "0.010309"
-> [ 13.072165] (2:slave@Tremblay) Processing "Task"
-> [ 14.030928] (4:slave@Ginette) "Task" done
+> [ 13.072165] (2:worker@Tremblay) Received "Task"
+> [ 13.072165] (2:worker@Tremblay) Communication time : "0.010309"
+> [ 13.072165] (2:worker@Tremblay) Processing "Task"
+> [ 14.030928] (4:worker@Ginette) "Task" done

 > [ 14.103093] (1:master@Tremblay) Send completed
 > [ 14.103093] (1:master@Tremblay) Send completed

-> [ 14.103093] (6:slave@Jupiter) Received "Task"
-> [ 14.103093] (6:slave@Jupiter) Communication time : "1.030928"
-> [ 14.103093] (6:slave@Jupiter) Processing "Task"
-> [ 15.061856] (5:slave@Bourassa) "Task" done
-> [ 15.072165] (2:slave@Tremblay) "Task" done
-> [ 16.103093] (6:slave@Jupiter) "Task" done
+> [ 14.103093] (6:worker@Jupiter) Received "Task"
+> [ 14.103093] (6:worker@Jupiter) Communication time : "1.030928"
+> [ 14.103093] (6:worker@Jupiter) Processing "Task"
+> [ 15.061856] (5:worker@Bourassa) "Task" done
+> [ 15.072165] (2:worker@Tremblay) "Task" done
+> [ 16.103093] (6:worker@Jupiter) "Task" done

 > [ 24.103093] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 24.103093] (1:master@Tremblay) Mmh. Something went wrong with 'Ginette'. Nevermind. Let's keep going!
 > [ 24.103093] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 24.103093] (1:master@Tremblay) Mmh. Something went wrong with 'Ginette'. Nevermind. Let's keep going!

-> [ 24.103093] (4:slave@Ginette) Mmh. Something went wrong. Nevermind. Let's keep going!
+> [ 24.103093] (4:worker@Ginette) Mmh. Something went wrong. Nevermind. Let's keep going!

 > [ 25.134021] (1:master@Tremblay) Send completed
 > [ 25.134021] (1:master@Tremblay) Send completed

-> [ 25.134021] (5:slave@Bourassa) Received "Task"
-> [ 25.134021] (5:slave@Bourassa) Communication time : "1.030928"
-> [ 25.134021] (5:slave@Bourassa) Processing "Task"
+> [ 25.134021] (5:worker@Bourassa) Received "Task"
+> [ 25.134021] (5:worker@Bourassa) Communication time : "1.030928"
+> [ 25.134021] (5:worker@Bourassa) Processing "Task"

 > [ 25.144330] (1:master@Tremblay) Send completed
 > [ 25.144330] (1:master@Tremblay) Send completed

-> [ 25.144330] (2:slave@Tremblay) Received "Task"
-> [ 25.144330] (2:slave@Tremblay) Communication time : "0.010309"
-> [ 25.144330] (2:slave@Tremblay) Processing "Task"
+> [ 25.144330] (2:worker@Tremblay) Received "Task"
+> [ 25.144330] (2:worker@Tremblay) Communication time : "0.010309"
+> [ 25.144330] (2:worker@Tremblay) Processing "Task"

 > [ 26.175258] (1:master@Tremblay) Send completed
 > [ 26.175258] (1:master@Tremblay) Send completed

-> [ 26.175258] (6:slave@Jupiter) Received "Task"
-> [ 26.175258] (6:slave@Jupiter) Communication time : "1.030928"
-> [ 26.175258] (6:slave@Jupiter) Processing "Task"
-> [ 27.134021] (5:slave@Bourassa) "Task" done
-> [ 27.144330] (2:slave@Tremblay) "Task" done
-> [ 28.175258] (6:slave@Jupiter) "Task" done
+> [ 26.175258] (6:worker@Jupiter) Received "Task"
+> [ 26.175258] (6:worker@Jupiter) Communication time : "1.030928"
+> [ 26.175258] (6:worker@Jupiter) Processing "Task"
+> [ 27.134021] (5:worker@Bourassa) "Task" done
+> [ 27.144330] (2:worker@Tremblay) "Task" done
+> [ 28.175258] (6:worker@Jupiter) "Task" done

 > [ 36.175258] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 37.206186] (1:master@Tremblay) Send completed
 > [ 37.206186] (1:master@Tremblay) Mmh. Something went wrong with 'Bourassa'. Nevermind. Let's keep going!
 > [ 36.175258] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 37.206186] (1:master@Tremblay) Send completed
 > [ 37.206186] (1:master@Tremblay) Mmh. Something went wrong with 'Bourassa'. Nevermind. Let's keep going!

-> [ 37.206186] (4:slave@Ginette) Received "Task"
-> [ 37.206186] (4:slave@Ginette) Communication time : "1.030928"
-> [ 37.206186] (4:slave@Ginette) Processing "Task"
-> [ 37.206186] (5:slave@Bourassa) Mmh. Something went wrong. Nevermind. Let's keep going!
+> [ 37.206186] (4:worker@Ginette) Received "Task"
+> [ 37.206186] (4:worker@Ginette) Communication time : "1.030928"
+> [ 37.206186] (4:worker@Ginette) Processing "Task"
+> [ 37.206186] (5:worker@Bourassa) Mmh. Something went wrong. Nevermind. Let's keep going!

 > [ 37.216495] (1:master@Tremblay) Send completed
 > [ 37.216495] (1:master@Tremblay) Send completed

-> [ 37.216495] (2:slave@Tremblay) Received "Task"
-> [ 37.216495] (2:slave@Tremblay) Communication time : "0.010309"
-> [ 37.216495] (2:slave@Tremblay) Processing "Task"
+> [ 37.216495] (2:worker@Tremblay) Received "Task"
+> [ 37.216495] (2:worker@Tremblay) Communication time : "0.010309"
+> [ 37.216495] (2:worker@Tremblay) Processing "Task"

 > [ 38.247423] (1:master@Tremblay) Send completed
 > [ 38.247423] (1:master@Tremblay) Send completed

-> [ 38.247423] (6:slave@Jupiter) Received "Task"
-> [ 38.247423] (6:slave@Jupiter) Communication time : "1.030928"
-> [ 38.247423] (6:slave@Jupiter) Processing "Task"
-> [ 39.206186] (4:slave@Ginette) "Task" done
-> [ 39.216495] (2:slave@Tremblay) "Task" done
-> [ 40.247423] (6:slave@Jupiter) "Task" done
+> [ 38.247423] (6:worker@Jupiter) Received "Task"
+> [ 38.247423] (6:worker@Jupiter) Communication time : "1.030928"
+> [ 38.247423] (6:worker@Jupiter) Processing "Task"
+> [ 39.206186] (4:worker@Ginette) "Task" done
+> [ 39.216495] (2:worker@Tremblay) "Task" done
+> [ 40.247423] (6:worker@Jupiter) "Task" done

 > [ 48.247423] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 49.278351] (1:master@Tremblay) Send completed
 > [ 48.247423] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 49.278351] (1:master@Tremblay) Send completed

-> [ 49.278351] (4:slave@Ginette) Received "Task"
-> [ 49.278351] (4:slave@Ginette) Communication time : "1.030928"
-> [ 49.278351] (4:slave@Ginette) Processing "Task"
-> [ 50.000000] (4:slave@Ginette) Gloups. The cpu on which I'm running just turned off!. See you!
+> [ 49.278351] (4:worker@Ginette) Received "Task"
+> [ 49.278351] (4:worker@Ginette) Communication time : "1.030928"
+> [ 49.278351] (4:worker@Ginette) Processing "Task"
+> [ 50.000000] (4:worker@Ginette) Gloups. The cpu on which I'm running just turned off!. See you!

 > [ 50.309278] (1:master@Tremblay) Send completed
 > [ 50.309278] (1:master@Tremblay) Send completed

-> [ 50.309278] (5:slave@Bourassa) Received "Task"
-> [ 50.309278] (5:slave@Bourassa) Communication time : "1.030928"
-> [ 50.309278] (5:slave@Bourassa) Processing "Task"
+> [ 50.309278] (5:worker@Bourassa) Received "Task"
+> [ 50.309278] (5:worker@Bourassa) Communication time : "1.030928"
+> [ 50.309278] (5:worker@Bourassa) Processing "Task"

 > [ 50.319588] (1:master@Tremblay) Send completed
 > [ 50.319588] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.
 > [ 50.319588] (1:master@Tremblay) Send completed
 > [ 50.319588] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.

-> [ 50.319588] (2:slave@Tremblay) Received "Task"
-> [ 50.319588] (2:slave@Tremblay) Communication time : "0.010309"
-> [ 50.319588] (2:slave@Tremblay) Processing "Task"
-> [ 50.319588] (6:slave@Jupiter) Received "finalize"
-> [ 50.319588] (6:slave@Jupiter) I'm done. See you!
+> [ 50.319588] (2:worker@Tremblay) Received "Task"
+> [ 50.319588] (2:worker@Tremblay) Communication time : "0.010309"
+> [ 50.319588] (2:worker@Tremblay) Processing "Task"
+> [ 50.319588] (6:worker@Jupiter) Received "finalize"
+> [ 50.319588] (6:worker@Jupiter) I'm done. See you!

 > [ 51.319588] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 51.319588] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!

-> [ 52.309278] (5:slave@Bourassa) "Task" done
+> [ 52.309278] (5:worker@Bourassa) "Task" done

 > [ 52.319588] (0:maestro@) Simulation time 52.3196
 > [ 52.319588] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Ginette'. Nevermind. Let's keep going!
 > [ 52.319588] (1:master@Tremblay) Goodbye now!
 > [ 52.319588] (0:maestro@) Simulation time 52.3196
 > [ 52.319588] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Ginette'. Nevermind. Let's keep going!
 > [ 52.319588] (1:master@Tremblay) Goodbye now!

-> [ 52.319588] (2:slave@Tremblay) "Task" done
-> [ 52.319588] (2:slave@Tremblay) Received "finalize"
-> [ 52.319588] (2:slave@Tremblay) I'm done. See you!
-> [ 52.319588] (5:slave@Bourassa) Received "finalize"
-> [ 52.319588] (5:slave@Bourassa) I'm done. See you!
+> [ 52.319588] (2:worker@Tremblay) "Task" done
+> [ 52.319588] (2:worker@Tremblay) Received "finalize"
+> [ 52.319588] (2:worker@Tremblay) I'm done. See you!
+> [ 52.319588] (5:worker@Bourassa) Received "finalize"
+> [ 52.319588] (5:worker@Bourassa) I'm done. See you!

 
 

-p Testing a simple master/slave example application handling failures. TCP crosstraffic ENABLED
+p Testing a simple master/worker example application handling failures. TCP crosstraffic ENABLED

 
 ! output sort 19
 
 ! output sort 19

-$ $SG_TEST_EXENV ${bindir:=.}/failures$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/../msg/masterslave/masterslave_d.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Cannot launch process 'slave' on failed host 'Fafard'
-> [  0.000000] (1:master@Tremblay) Got 5 slave(s) :
+$ $SG_TEST_EXENV ${bindir:=.}/failures$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/../msg/masterworker/masterworker_d.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Cannot launch process 'worker' on failed host 'Fafard'
+> [  0.000000] (1:master@Tremblay) Got 5 worker(s) :

 > [  0.000000] (1:master@Tremblay) Jupiter
 > [  0.000000] (1:master@Tremblay) Fafard
 > [  0.000000] (1:master@Tremblay) Ginette
 > [  0.000000] (1:master@Tremblay) Jupiter
 > [  0.000000] (1:master@Tremblay) Fafard
 > [  0.000000] (1:master@Tremblay) Ginette


@@ -115,99 +115,99 @@ $ $SG_TEST_EXENV ${bindir:=.}/failures$EXEEXT --log=xbt_cfg.thres:critical --log
 > [  0.000000] (1:master@Tremblay) Got 20 task to process :
 > [  1.000000] (0:maestro@) Restart processes on host: Fafard
 > [  1.000000] (1:master@Tremblay) Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going!
 > [  0.000000] (1:master@Tremblay) Got 20 task to process :
 > [  1.000000] (0:maestro@) Restart processes on host: Fafard
 > [  1.000000] (1:master@Tremblay) Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going!

-> [  1.000000] (3:slave@Jupiter) Gloups. The cpu on which I'm running just turned off!. See you!
+> [  1.000000] (3:worker@Jupiter) Gloups. The cpu on which I'm running just turned off!. See you!

 > [  2.000000] (0:maestro@) Restart processes on host: Jupiter
 > [ 11.000000] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 12.082474] (1:master@Tremblay) Send completed
 > [  2.000000] (0:maestro@) Restart processes on host: Jupiter
 > [ 11.000000] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 12.082474] (1:master@Tremblay) Send completed

-> [ 12.082474] (4:slave@Ginette) Received "Task"
-> [ 12.082474] (4:slave@Ginette) Communication time : "1.082474"
-> [ 12.082474] (4:slave@Ginette) Processing "Task"
+> [ 12.082474] (4:worker@Ginette) Received "Task"
+> [ 12.082474] (4:worker@Ginette) Communication time : "1.082474"
+> [ 12.082474] (4:worker@Ginette) Processing "Task"

 > [ 13.164948] (1:master@Tremblay) Send completed
 > [ 13.164948] (1:master@Tremblay) Send completed

-> [ 13.164948] (5:slave@Bourassa) Received "Task"
-> [ 13.164948] (5:slave@Bourassa) Communication time : "1.082474"
-> [ 13.164948] (5:slave@Bourassa) Processing "Task"
+> [ 13.164948] (5:worker@Bourassa) Received "Task"
+> [ 13.164948] (5:worker@Bourassa) Communication time : "1.082474"
+> [ 13.164948] (5:worker@Bourassa) Processing "Task"

 > [ 13.175773] (1:master@Tremblay) Send completed
 > [ 13.175773] (1:master@Tremblay) Send completed

-> [ 13.175773] (2:slave@Tremblay) Received "Task"
-> [ 13.175773] (2:slave@Tremblay) Communication time : "0.010825"
-> [ 13.175773] (2:slave@Tremblay) Processing "Task"
-> [ 14.082474] (4:slave@Ginette) "Task" done
+> [ 13.175773] (2:worker@Tremblay) Received "Task"
+> [ 13.175773] (2:worker@Tremblay) Communication time : "0.010825"
+> [ 13.175773] (2:worker@Tremblay) Processing "Task"
+> [ 14.082474] (4:worker@Ginette) "Task" done

 > [ 14.258247] (1:master@Tremblay) Send completed
 > [ 14.258247] (1:master@Tremblay) Send completed

-> [ 14.258247] (6:slave@Jupiter) Received "Task"
-> [ 14.258247] (6:slave@Jupiter) Communication time : "1.082474"
-> [ 14.258247] (6:slave@Jupiter) Processing "Task"
-> [ 15.164948] (5:slave@Bourassa) "Task" done
-> [ 15.175773] (2:slave@Tremblay) "Task" done
-> [ 16.258247] (6:slave@Jupiter) "Task" done
+> [ 14.258247] (6:worker@Jupiter) Received "Task"
+> [ 14.258247] (6:worker@Jupiter) Communication time : "1.082474"
+> [ 14.258247] (6:worker@Jupiter) Processing "Task"
+> [ 15.164948] (5:worker@Bourassa) "Task" done
+> [ 15.175773] (2:worker@Tremblay) "Task" done
+> [ 16.258247] (6:worker@Jupiter) "Task" done

 > [ 24.258247] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 24.258247] (1:master@Tremblay) Mmh. Something went wrong with 'Ginette'. Nevermind. Let's keep going!
 > [ 24.258247] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 24.258247] (1:master@Tremblay) Mmh. Something went wrong with 'Ginette'. Nevermind. Let's keep going!

-> [ 24.258247] (4:slave@Ginette) Mmh. Something went wrong. Nevermind. Let's keep going!
+> [ 24.258247] (4:worker@Ginette) Mmh. Something went wrong. Nevermind. Let's keep going!

 > [ 25.340722] (1:master@Tremblay) Send completed
 > [ 25.340722] (1:master@Tremblay) Send completed

-> [ 25.340722] (5:slave@Bourassa) Received "Task"
-> [ 25.340722] (5:slave@Bourassa) Communication time : "1.082474"
-> [ 25.340722] (5:slave@Bourassa) Processing "Task"
+> [ 25.340722] (5:worker@Bourassa) Received "Task"
+> [ 25.340722] (5:worker@Bourassa) Communication time : "1.082474"
+> [ 25.340722] (5:worker@Bourassa) Processing "Task"

 > [ 25.351546] (1:master@Tremblay) Send completed
 > [ 25.351546] (1:master@Tremblay) Send completed

-> [ 25.351546] (2:slave@Tremblay) Received "Task"
-> [ 25.351546] (2:slave@Tremblay) Communication time : "0.010825"
-> [ 25.351546] (2:slave@Tremblay) Processing "Task"
+> [ 25.351546] (2:worker@Tremblay) Received "Task"
+> [ 25.351546] (2:worker@Tremblay) Communication time : "0.010825"
+> [ 25.351546] (2:worker@Tremblay) Processing "Task"

 > [ 26.434021] (1:master@Tremblay) Send completed
 > [ 26.434021] (1:master@Tremblay) Send completed

-> [ 26.434021] (6:slave@Jupiter) Received "Task"
-> [ 26.434021] (6:slave@Jupiter) Communication time : "1.082474"
-> [ 26.434021] (6:slave@Jupiter) Processing "Task"
-> [ 27.340722] (5:slave@Bourassa) "Task" done
-> [ 27.351546] (2:slave@Tremblay) "Task" done
-> [ 28.434021] (6:slave@Jupiter) "Task" done
+> [ 26.434021] (6:worker@Jupiter) Received "Task"
+> [ 26.434021] (6:worker@Jupiter) Communication time : "1.082474"
+> [ 26.434021] (6:worker@Jupiter) Processing "Task"
+> [ 27.340722] (5:worker@Bourassa) "Task" done
+> [ 27.351546] (2:worker@Tremblay) "Task" done
+> [ 28.434021] (6:worker@Jupiter) "Task" done

 > [ 36.434021] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 37.516495] (1:master@Tremblay) Send completed
 > [ 37.516495] (1:master@Tremblay) Mmh. Something went wrong with 'Bourassa'. Nevermind. Let's keep going!
 > [ 36.434021] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 37.516495] (1:master@Tremblay) Send completed
 > [ 37.516495] (1:master@Tremblay) Mmh. Something went wrong with 'Bourassa'. Nevermind. Let's keep going!

-> [ 37.516495] (4:slave@Ginette) Received "Task"
-> [ 37.516495] (4:slave@Ginette) Communication time : "1.082474"
-> [ 37.516495] (4:slave@Ginette) Processing "Task"
-> [ 37.516495] (5:slave@Bourassa) Mmh. Something went wrong. Nevermind. Let's keep going!
+> [ 37.516495] (4:worker@Ginette) Received "Task"
+> [ 37.516495] (4:worker@Ginette) Communication time : "1.082474"
+> [ 37.516495] (4:worker@Ginette) Processing "Task"
+> [ 37.516495] (5:worker@Bourassa) Mmh. Something went wrong. Nevermind. Let's keep going!

 > [ 37.527320] (1:master@Tremblay) Send completed
 > [ 37.527320] (1:master@Tremblay) Send completed

-> [ 37.527320] (2:slave@Tremblay) Received "Task"
-> [ 37.527320] (2:slave@Tremblay) Communication time : "0.010825"
-> [ 37.527320] (2:slave@Tremblay) Processing "Task"
+> [ 37.527320] (2:worker@Tremblay) Received "Task"
+> [ 37.527320] (2:worker@Tremblay) Communication time : "0.010825"
+> [ 37.527320] (2:worker@Tremblay) Processing "Task"

 > [ 38.609794] (1:master@Tremblay) Send completed
 > [ 38.609794] (1:master@Tremblay) Send completed

-> [ 38.609794] (6:slave@Jupiter) Received "Task"
-> [ 38.609794] (6:slave@Jupiter) Communication time : "1.082474"
-> [ 38.609794] (6:slave@Jupiter) Processing "Task"
-> [ 39.516495] (4:slave@Ginette) "Task" done
-> [ 39.527320] (2:slave@Tremblay) "Task" done
-> [ 40.609794] (6:slave@Jupiter) "Task" done
+> [ 38.609794] (6:worker@Jupiter) Received "Task"
+> [ 38.609794] (6:worker@Jupiter) Communication time : "1.082474"
+> [ 38.609794] (6:worker@Jupiter) Processing "Task"
+> [ 39.516495] (4:worker@Ginette) "Task" done
+> [ 39.527320] (2:worker@Tremblay) "Task" done
+> [ 40.609794] (6:worker@Jupiter) "Task" done

 > [ 48.609794] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 49.692268] (1:master@Tremblay) Send completed
 > [ 48.609794] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 49.692268] (1:master@Tremblay) Send completed

-> [ 49.692268] (4:slave@Ginette) Received "Task"
-> [ 49.692268] (4:slave@Ginette) Communication time : "1.082474"
-> [ 49.692268] (4:slave@Ginette) Processing "Task"
-> [ 50.000000] (4:slave@Ginette) Gloups. The cpu on which I'm running just turned off!. See you!
+> [ 49.692268] (4:worker@Ginette) Received "Task"
+> [ 49.692268] (4:worker@Ginette) Communication time : "1.082474"
+> [ 49.692268] (4:worker@Ginette) Processing "Task"
+> [ 50.000000] (4:worker@Ginette) Gloups. The cpu on which I'm running just turned off!. See you!

 > [ 50.774742] (1:master@Tremblay) Send completed
 > [ 50.774742] (1:master@Tremblay) Send completed

-> [ 50.774742] (5:slave@Bourassa) Received "Task"
-> [ 50.774742] (5:slave@Bourassa) Communication time : "1.082474"
-> [ 50.774742] (5:slave@Bourassa) Processing "Task"
+> [ 50.774742] (5:worker@Bourassa) Received "Task"
+> [ 50.774742] (5:worker@Bourassa) Communication time : "1.082474"
+> [ 50.774742] (5:worker@Bourassa) Processing "Task"

 > [ 50.785567] (1:master@Tremblay) Send completed
 > [ 50.785567] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.
 > [ 50.785567] (1:master@Tremblay) Send completed
 > [ 50.785567] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.

-> [ 50.785567] (2:slave@Tremblay) Received "Task"
-> [ 50.785567] (2:slave@Tremblay) Communication time : "0.010825"
-> [ 50.785567] (2:slave@Tremblay) Processing "Task"
-> [ 50.785567] (6:slave@Jupiter) Received "finalize"
-> [ 50.785567] (6:slave@Jupiter) I'm done. See you!
+> [ 50.785567] (2:worker@Tremblay) Received "Task"
+> [ 50.785567] (2:worker@Tremblay) Communication time : "0.010825"
+> [ 50.785567] (2:worker@Tremblay) Processing "Task"
+> [ 50.785567] (6:worker@Jupiter) Received "finalize"
+> [ 50.785567] (6:worker@Jupiter) I'm done. See you!

 > [ 51.785567] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 51.785567] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!

-> [ 52.774742] (5:slave@Bourassa) "Task" done
+> [ 52.774742] (5:worker@Bourassa) "Task" done

 > [ 52.785567] (0:maestro@) Simulation time 52.7856
 > [ 52.785567] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Ginette'. Nevermind. Let's keep going!
 > [ 52.785567] (1:master@Tremblay) Goodbye now!
 > [ 52.785567] (0:maestro@) Simulation time 52.7856
 > [ 52.785567] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Ginette'. Nevermind. Let's keep going!
 > [ 52.785567] (1:master@Tremblay) Goodbye now!

-> [ 52.785567] (2:slave@Tremblay) "Task" done
-> [ 52.785567] (2:slave@Tremblay) Received "finalize"
-> [ 52.785567] (2:slave@Tremblay) I'm done. See you!
-> [ 52.785567] (5:slave@Bourassa) Received "finalize"
-> [ 52.785567] (5:slave@Bourassa) I'm done. See you!
+> [ 52.785567] (2:worker@Tremblay) "Task" done
+> [ 52.785567] (2:worker@Tremblay) Received "finalize"
+> [ 52.785567] (2:worker@Tremblay) I'm done. See you!
+> [ 52.785567] (5:worker@Bourassa) Received "finalize"
+> [ 52.785567] (5:worker@Bourassa) I'm done. See you!

 
 

-p Testing a simple master/slave example application handling failures. CPU_TI optimization enabled
+p Testing a simple master/worker example application handling failures. CPU_TI optimization enabled

 
 ! output sort 19
 
 ! output sort 19

-$ $SG_TEST_EXENV ${bindir:=.}/failures$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/../msg/masterslave/masterslave_d.xml --cfg=path:${srcdir} -cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Cannot launch process 'slave' on failed host 'Fafard'
-> [  0.000000] (1:master@Tremblay) Got 5 slave(s) :
+$ $SG_TEST_EXENV ${bindir:=.}/failures$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/../msg/masterworker/masterworker_d.xml --cfg=path:${srcdir} -cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Cannot launch process 'worker' on failed host 'Fafard'
+> [  0.000000] (1:master@Tremblay) Got 5 worker(s) :

 > [  0.000000] (1:master@Tremblay) Jupiter
 > [  0.000000] (1:master@Tremblay) Fafard
 > [  0.000000] (1:master@Tremblay) Ginette
 > [  0.000000] (1:master@Tremblay) Jupiter
 > [  0.000000] (1:master@Tremblay) Fafard
 > [  0.000000] (1:master@Tremblay) Ginette


@@ -216,89 +216,89 @@ $ $SG_TEST_EXENV ${bindir:=.}/failures$EXEEXT --log=xbt_cfg.thres:critical --log
 > [  0.000000] (1:master@Tremblay) Got 20 task to process :
 > [  1.000000] (0:maestro@) Restart processes on host: Fafard
 > [  1.000000] (1:master@Tremblay) Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going!
 > [  0.000000] (1:master@Tremblay) Got 20 task to process :
 > [  1.000000] (0:maestro@) Restart processes on host: Fafard
 > [  1.000000] (1:master@Tremblay) Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going!

-> [  1.000000] (3:slave@Jupiter) Gloups. The cpu on which I'm running just turned off!. See you!
+> [  1.000000] (3:worker@Jupiter) Gloups. The cpu on which I'm running just turned off!. See you!

 > [  2.000000] (0:maestro@) Restart processes on host: Jupiter
 > [ 11.000000] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 12.082474] (1:master@Tremblay) Send completed
 > [  2.000000] (0:maestro@) Restart processes on host: Jupiter
 > [ 11.000000] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 12.082474] (1:master@Tremblay) Send completed

-> [ 12.082474] (4:slave@Ginette) Received "Task"
-> [ 12.082474] (4:slave@Ginette) Communication time : "1.082474"
-> [ 12.082474] (4:slave@Ginette) Processing "Task"
+> [ 12.082474] (4:worker@Ginette) Received "Task"
+> [ 12.082474] (4:worker@Ginette) Communication time : "1.082474"
+> [ 12.082474] (4:worker@Ginette) Processing "Task"

 > [ 13.164948] (1:master@Tremblay) Send completed
 > [ 13.164948] (1:master@Tremblay) Send completed

-> [ 13.164948] (5:slave@Bourassa) Received "Task"
-> [ 13.164948] (5:slave@Bourassa) Communication time : "1.082474"
-> [ 13.164948] (5:slave@Bourassa) Processing "Task"
+> [ 13.164948] (5:worker@Bourassa) Received "Task"
+> [ 13.164948] (5:worker@Bourassa) Communication time : "1.082474"
+> [ 13.164948] (5:worker@Bourassa) Processing "Task"

 > [ 13.175773] (1:master@Tremblay) Send completed
 > [ 13.175773] (1:master@Tremblay) Send completed

-> [ 13.175773] (2:slave@Tremblay) Received "Task"
-> [ 13.175773] (2:slave@Tremblay) Communication time : "0.010825"
-> [ 13.175773] (2:slave@Tremblay) Processing "Task"
-> [ 14.082474] (4:slave@Ginette) "Task" done
+> [ 13.175773] (2:worker@Tremblay) Received "Task"
+> [ 13.175773] (2:worker@Tremblay) Communication time : "0.010825"
+> [ 13.175773] (2:worker@Tremblay) Processing "Task"
+> [ 14.082474] (4:worker@Ginette) "Task" done

 > [ 14.258247] (1:master@Tremblay) Send completed
 > [ 14.258247] (1:master@Tremblay) Send completed

-> [ 14.258247] (6:slave@Jupiter) Received "Task"
-> [ 14.258247] (6:slave@Jupiter) Communication time : "1.082474"
-> [ 14.258247] (6:slave@Jupiter) Processing "Task"
-> [ 15.164948] (5:slave@Bourassa) "Task" done
-> [ 15.175773] (2:slave@Tremblay) "Task" done
-> [ 16.258247] (6:slave@Jupiter) "Task" done
+> [ 14.258247] (6:worker@Jupiter) Received "Task"
+> [ 14.258247] (6:worker@Jupiter) Communication time : "1.082474"
+> [ 14.258247] (6:worker@Jupiter) Processing "Task"
+> [ 15.164948] (5:worker@Bourassa) "Task" done
+> [ 15.175773] (2:worker@Tremblay) "Task" done
+> [ 16.258247] (6:worker@Jupiter) "Task" done

 > [ 24.258247] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 24.258247] (1:master@Tremblay) Mmh. Something went wrong with 'Ginette'. Nevermind. Let's keep going!
 > [ 24.258247] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 24.258247] (1:master@Tremblay) Mmh. Something went wrong with 'Ginette'. Nevermind. Let's keep going!

-> [ 24.258247] (4:slave@Ginette) Mmh. Something went wrong. Nevermind. Let's keep going!
+> [ 24.258247] (4:worker@Ginette) Mmh. Something went wrong. Nevermind. Let's keep going!

 > [ 25.340722] (1:master@Tremblay) Send completed
 > [ 25.340722] (1:master@Tremblay) Send completed

-> [ 25.340722] (5:slave@Bourassa) Received "Task"
-> [ 25.340722] (5:slave@Bourassa) Communication time : "1.082474"
-> [ 25.340722] (5:slave@Bourassa) Processing "Task"
+> [ 25.340722] (5:worker@Bourassa) Received "Task"
+> [ 25.340722] (5:worker@Bourassa) Communication time : "1.082474"
+> [ 25.340722] (5:worker@Bourassa) Processing "Task"

 > [ 25.351546] (1:master@Tremblay) Send completed
 > [ 25.351546] (1:master@Tremblay) Send completed

-> [ 25.351546] (2:slave@Tremblay) Received "Task"
-> [ 25.351546] (2:slave@Tremblay) Communication time : "0.010825"
-> [ 25.351546] (2:slave@Tremblay) Processing "Task"
+> [ 25.351546] (2:worker@Tremblay) Received "Task"
+> [ 25.351546] (2:worker@Tremblay) Communication time : "0.010825"
+> [ 25.351546] (2:worker@Tremblay) Processing "Task"

 > [ 26.434021] (1:master@Tremblay) Send completed
 > [ 26.434021] (1:master@Tremblay) Send completed

-> [ 26.434021] (6:slave@Jupiter) Received "Task"
-> [ 26.434021] (6:slave@Jupiter) Communication time : "1.082474"
-> [ 26.434021] (6:slave@Jupiter) Processing "Task"
-> [ 27.340722] (5:slave@Bourassa) "Task" done
-> [ 27.351546] (2:slave@Tremblay) "Task" done
-> [ 28.434021] (6:slave@Jupiter) "Task" done
+> [ 26.434021] (6:worker@Jupiter) Received "Task"
+> [ 26.434021] (6:worker@Jupiter) Communication time : "1.082474"
+> [ 26.434021] (6:worker@Jupiter) Processing "Task"
+> [ 27.340722] (5:worker@Bourassa) "Task" done
+> [ 27.351546] (2:worker@Tremblay) "Task" done
+> [ 28.434021] (6:worker@Jupiter) "Task" done

 > [ 36.434021] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 37.516495] (1:master@Tremblay) Send completed
 > [ 37.516495] (1:master@Tremblay) Mmh. Something went wrong with 'Bourassa'. Nevermind. Let's keep going!
 > [ 36.434021] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 37.516495] (1:master@Tremblay) Send completed
 > [ 37.516495] (1:master@Tremblay) Mmh. Something went wrong with 'Bourassa'. Nevermind. Let's keep going!

-> [ 37.516495] (4:slave@Ginette) Received "Task"
-> [ 37.516495] (4:slave@Ginette) Communication time : "1.082474"
-> [ 37.516495] (4:slave@Ginette) Processing "Task"
-> [ 37.516495] (5:slave@Bourassa) Mmh. Something went wrong. Nevermind. Let's keep going!
+> [ 37.516495] (4:worker@Ginette) Received "Task"
+> [ 37.516495] (4:worker@Ginette) Communication time : "1.082474"
+> [ 37.516495] (4:worker@Ginette) Processing "Task"
+> [ 37.516495] (5:worker@Bourassa) Mmh. Something went wrong. Nevermind. Let's keep going!

 > [ 37.527320] (1:master@Tremblay) Send completed
 > [ 37.527320] (1:master@Tremblay) Send completed

-> [ 37.527320] (2:slave@Tremblay) Received "Task"
-> [ 37.527320] (2:slave@Tremblay) Communication time : "0.010825"
-> [ 37.527320] (2:slave@Tremblay) Processing "Task"
+> [ 37.527320] (2:worker@Tremblay) Received "Task"
+> [ 37.527320] (2:worker@Tremblay) Communication time : "0.010825"
+> [ 37.527320] (2:worker@Tremblay) Processing "Task"

 > [ 38.609794] (1:master@Tremblay) Send completed
 > [ 38.609794] (1:master@Tremblay) Send completed

-> [ 38.609794] (6:slave@Jupiter) Received "Task"
-> [ 38.609794] (6:slave@Jupiter) Communication time : "1.082474"
-> [ 38.609794] (6:slave@Jupiter) Processing "Task"
-> [ 39.516495] (4:slave@Ginette) "Task" done
-> [ 39.527320] (2:slave@Tremblay) "Task" done
-> [ 40.609794] (6:slave@Jupiter) "Task" done
+> [ 38.609794] (6:worker@Jupiter) Received "Task"
+> [ 38.609794] (6:worker@Jupiter) Communication time : "1.082474"
+> [ 38.609794] (6:worker@Jupiter) Processing "Task"
+> [ 39.516495] (4:worker@Ginette) "Task" done
+> [ 39.527320] (2:worker@Tremblay) "Task" done
+> [ 40.609794] (6:worker@Jupiter) "Task" done

 > [ 48.609794] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 49.692268] (1:master@Tremblay) Send completed
 > [ 48.609794] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 49.692268] (1:master@Tremblay) Send completed

-> [ 49.692268] (4:slave@Ginette) Received "Task"
-> [ 49.692268] (4:slave@Ginette) Communication time : "1.082474"
-> [ 49.692268] (4:slave@Ginette) Processing "Task"
-> [ 50.000000] (4:slave@Ginette) Gloups. The cpu on which I'm running just turned off!. See you!
+> [ 49.692268] (4:worker@Ginette) Received "Task"
+> [ 49.692268] (4:worker@Ginette) Communication time : "1.082474"
+> [ 49.692268] (4:worker@Ginette) Processing "Task"
+> [ 50.000000] (4:worker@Ginette) Gloups. The cpu on which I'm running just turned off!. See you!

 > [ 50.774742] (1:master@Tremblay) Send completed
 > [ 50.774742] (1:master@Tremblay) Send completed

-> [ 50.774742] (5:slave@Bourassa) Received "Task"
-> [ 50.774742] (5:slave@Bourassa) Communication time : "1.082474"
-> [ 50.774742] (5:slave@Bourassa) Processing "Task"
+> [ 50.774742] (5:worker@Bourassa) Received "Task"
+> [ 50.774742] (5:worker@Bourassa) Communication time : "1.082474"
+> [ 50.774742] (5:worker@Bourassa) Processing "Task"

 > [ 50.785567] (1:master@Tremblay) Send completed
 > [ 50.785567] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.
 > [ 50.785567] (1:master@Tremblay) Send completed
 > [ 50.785567] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.

-> [ 50.785567] (2:slave@Tremblay) Received "Task"
-> [ 50.785567] (2:slave@Tremblay) Communication time : "0.010825"
-> [ 50.785567] (2:slave@Tremblay) Processing "Task"
-> [ 50.785567] (6:slave@Jupiter) Received "finalize"
-> [ 50.785567] (6:slave@Jupiter) I'm done. See you!
+> [ 50.785567] (2:worker@Tremblay) Received "Task"
+> [ 50.785567] (2:worker@Tremblay) Communication time : "0.010825"
+> [ 50.785567] (2:worker@Tremblay) Processing "Task"
+> [ 50.785567] (6:worker@Jupiter) Received "finalize"
+> [ 50.785567] (6:worker@Jupiter) I'm done. See you!

 > [ 51.785567] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [ 51.785567] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!

-> [ 52.774742] (5:slave@Bourassa) "Task" done
+> [ 52.774742] (5:worker@Bourassa) "Task" done

 > [ 52.785567] (0:maestro@) Simulation time 52.7856
 > [ 52.785567] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Ginette'. Nevermind. Let's keep going!
 > [ 52.785567] (1:master@Tremblay) Goodbye now!
 > [ 52.785567] (0:maestro@) Simulation time 52.7856
 > [ 52.785567] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Ginette'. Nevermind. Let's keep going!
 > [ 52.785567] (1:master@Tremblay) Goodbye now!

-> [ 52.785567] (2:slave@Tremblay) "Task" done
-> [ 52.785567] (2:slave@Tremblay) Received "finalize"
-> [ 52.785567] (2:slave@Tremblay) I'm done. See you!
-> [ 52.785567] (5:slave@Bourassa) Received "finalize"
-> [ 52.785567] (5:slave@Bourassa) I'm done. See you!
+> [ 52.785567] (2:worker@Tremblay) "Task" done
+> [ 52.785567] (2:worker@Tremblay) Received "finalize"
+> [ 52.785567] (2:worker@Tremblay) I'm done. See you!
+> [ 52.785567] (5:worker@Bourassa) Received "finalize"
+> [ 52.785567] (5:worker@Bourassa) I'm done. See you!

diff --git a/examples/msg/masterslave-mailbox/masterslave-mailbox-multicore_d.xml b/examples/msg/masterslave-mailbox/masterslave-mailbox-multicore_d.xml
deleted file mode 100644 (file)
index e7e5e22..0000000
--- a/examples/msg/masterslave-mailbox/masterslave-mailbox-multicore_d.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <!-- 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="6"/>         <!-- Number of slaves -->
-  </process>
-  <!-- The slave processes (with mailbox to listen on as argument) -->
-  <process host="Tremblay" function="slave">   <argument value="0"/> </process>
-  <process host="Tremblay" function="slave">   <argument value="1"/> </process>
-  <process host="Tremblay" function="slave">   <argument value="2"/> </process>
-  <process host="Tremblay" function="slave">   <argument value="3"/> </process>
-  <process host="Tremblay" function="slave">   <argument value="4"/> </process>
-  <process host="Tremblay" function="slave">   <argument value="5"/> </process>
-</platform>

diff --git a/examples/msg/masterslave-mailbox/masterslave-mailbox-vivaldi.tesh b/examples/msg/masterslave-mailbox/masterslave-mailbox-vivaldi.tesh
deleted file mode 100644 (file)
index e8e9e1c..0000000
--- a/examples/msg/masterslave-mailbox/masterslave-mailbox-vivaldi.tesh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! ./tesh
-
-p Testing a simple master/slave example application
-
-$ $SG_TEST_EXENV ./masterslave-mailbox/masterslave-mailbox  ${srcdir:=.}/../platforms/vivaldi.xml ${srcdir:=.}/masterslave-mailbox/masterslave-mailbox-vivaldi_d.xml --cfg=network/latency_factor:1.0 --cfg=network/bandwidth_factor:1.0
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/latency_factor' to '1.0'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/bandwidth_factor' to '1.0'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/coordinates' to 'yes'
-> [100030591:master:(1) 0.000000] [msg_test/INFO] Got 15 slaves and 10 tasks to process
-> [100030591:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" (of 10) to mailbox "slave-0"
-> [100030591:master:(1) 0.046299] [msg_test/INFO] Sending "Task_1" (of 10) to mailbox "slave-1"
-> [100030591:master:(1) 0.103602] [msg_test/INFO] Sending "Task_2" (of 10) to mailbox "slave-2"
-> [100030591:master:(1) 0.126922] [msg_test/INFO] Sending "Task_3" (of 10) to mailbox "slave-3"
-> [100030591:master:(1) 0.167282] [msg_test/INFO] Sending "Task_4" (of 10) to mailbox "slave-4"
-> [100030591:master:(1) 0.174710] [msg_test/INFO] Sending "Task_5" (of 10) to mailbox "slave-5"
-> [100030591:master:(1) 0.307173] [msg_test/INFO] Sending "Task_6" (of 10) to mailbox "slave-6"
-> [100030591:master:(1) 0.370794] [msg_test/INFO] Sending "Task_7" (of 10) to mailbox "slave-7"
-> [100030591:master:(1) 0.413207] [msg_test/INFO] Sending "Task_8" (of 10) to mailbox "slave-8"
-> [100030591:master:(1) 0.452277] [msg_test/INFO] Sending "Task_9" (of 10) to mailbox "slave-9"
-> [100030591:master:(1) 0.487205] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over.
-> [100036570:slave:(2) 0.533504] [msg_test/INFO] I'm done. See you!
-> [100041334:slave:(3) 0.590807] [msg_test/INFO] I'm done. See you!
-> [100055671:slave:(4) 0.614127] [msg_test/INFO] I'm done. See you!
-> [100066658:slave:(5) 0.654487] [msg_test/INFO] I'm done. See you!
-> [100090691:slave:(6) 0.661915] [msg_test/INFO] I'm done. See you!
-> [100094952:slave:(7) 0.794379] [msg_test/INFO] I'm done. See you!
-> [100117943:slave:(8) 0.858000] [msg_test/INFO] I'm done. See you!
-> [100126290:slave:(9) 0.900412] [msg_test/INFO] I'm done. See you!
-> [100144483:slave:(10) 0.939482] [msg_test/INFO] I'm done. See you!
-> [100152889:slave:(11) 0.974410] [msg_test/INFO] I'm done. See you!
-> [100178474:slave:(12) 0.990540] [msg_test/INFO] I'm done. See you!
-> [100180261:slave:(13) 1.011253] [msg_test/INFO] I'm done. See you!
-> [100185883:slave:(14) 1.051440] [msg_test/INFO] I'm done. See you!
-> [100186365:slave:(15) 1.268843] [msg_test/INFO] I'm done. See you!
-> [100200866:slave:(16) 1.336272] [msg_test/INFO] I'm done. See you!
-> [1.336272] [msg_test/INFO] Simulation time 1.33627

diff --git a/examples/msg/masterslave-mailbox/masterslave-mailbox-vivaldi_d.xml b/examples/msg/masterslave-mailbox/masterslave-mailbox-vivaldi_d.xml
deleted file mode 100644 (file)
index d5a4930..0000000
--- a/examples/msg/masterslave-mailbox/masterslave-mailbox-vivaldi_d.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <!-- The master process (with some arguments) --> 
-  <process host="100030591" function="master">
-       <argument value="10"/>       <!-- Number of tasks -->
-       <argument value="50000000"/>  <!-- Computation size of tasks -->
-       <argument value="1000000"/>   <!-- Communication size of tasks -->
-       <argument value="15"/>         <!-- Number of slaves -->
-    </process>
-    <!-- The slave processes (with mailbox to listen on as argument) -->
-    <process host="100036570" function="slave">   <argument value="0"/> </process>
-    <process host="100041334" function="slave">   <argument value="1"/> </process>
-    <process host="100055671" function="slave">   <argument value="2"/> </process>
-    <process host="100066658" function="slave">   <argument value="3"/> </process>
-    <process host="100090691" function="slave">   <argument value="4"/> </process>
-    <process host="100094952" function="slave">   <argument value="5"/> </process>
-    <process host="100117943" function="slave">   <argument value="6"/> </process>
-    <process host="100126290" function="slave">   <argument value="7"/> </process>
-    <process host="100144483" function="slave">   <argument value="8"/> </process>
-    <process host="100152889" function="slave">   <argument value="9"/> </process>
-    <process host="100178474" function="slave">   <argument value="10"/> </process>
-    <process host="100180261" function="slave">   <argument value="11"/> </process>
-    <process host="100185883" function="slave">   <argument value="12"/> </process>
-    <process host="100186365" function="slave">   <argument value="13"/> </process>
-    <process host="100200866" function="slave">   <argument value="14"/> </process>
-</platform>

diff --git a/examples/msg/masterslave-mailbox/masterslave-mailbox_d.xml b/examples/msg/masterslave-mailbox/masterslave-mailbox_d.xml
deleted file mode 100644 (file)
index 5bd6985..0000000
--- a/examples/msg/masterslave-mailbox/masterslave-mailbox_d.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <!-- 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="5"/>         <!-- Number of slaves -->
-  </process>
-  <!-- The slave processes (with mailbox to listen on as argument) -->
-  <process host="Tremblay" function="slave">  <argument value="0"/> </process>
-  <process host="Jupiter" function="slave">   <argument value="1"/> </process>
-  <process host="Fafard" function="slave">    <argument value="2"/> </process>
-  <process host="Ginette" function="slave">   <argument value="3"/> </process>
-  <process host="Bourassa" function="slave">  <argument value="4"/> </process>
-</platform>

diff --git a/examples/msg/masterslave/masterslave.tesh b/examples/msg/masterslave/masterslave.tesh
deleted file mode 100644 (file)
index dedea57..0000000
--- a/examples/msg/masterslave/masterslave.tesh
+++ /dev/null
@@ -1,247 +0,0 @@
-#! ./tesh
-
-p Testing a simple master/slave example application. TCP crosstraffic DISABLED
-
-! output sort 19
-$ $SG_TEST_EXENV ${bindir:=.}/masterslave$EXEEXT ${srcdir:=.}/small_platform_with_routers.xml ${srcdir:=.}/../msg/masterslave/masterslave_d.xml --cfg=network/crosstraffic:0 --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0'
-> [  0.000000] (1:master@Tremblay) Got 5 slaves and 20 tasks to process
-> [  0.000000] (1:master@Tremblay) Sending "Task_0" to "Jupiter"
-> [  0.162005] (1:master@Tremblay) Sent
-> [  0.162005] (1:master@Tremblay) Sending "Task_1" to "Fafard"
-> [  0.162005] (3:slave@Jupiter) Received "Task_0"
-> [  0.162005] (3:slave@Jupiter) Processing "Task_0"
-> [  0.314083] (1:master@Tremblay) Sent
-> [  0.314083] (1:master@Tremblay) Sending "Task_2" to "Ginette"
-> [  0.314083] (4:slave@Fafard) Received "Task_1"
-> [  0.314083] (4:slave@Fafard) Processing "Task_1"
-> [  0.432712] (1:master@Tremblay) Sent
-> [  0.432712] (1:master@Tremblay) Sending "Task_3" to "Bourassa"
-> [  0.432712] (5:slave@Ginette) Received "Task_2"
-> [  0.432712] (5:slave@Ginette) Processing "Task_2"
-> [  0.560227] (1:master@Tremblay) Sent
-> [  0.560227] (1:master@Tremblay) Sending "Task_4" to "Tremblay"
-> [  0.560227] (1:master@Tremblay) Hey ! It's me ! :)
-> [  0.560227] (6:slave@Bourassa) Received "Task_3"
-> [  0.560227] (6:slave@Bourassa) Processing "Task_3"
-> [  0.562492] (1:master@Tremblay) Sent
-> [  0.562492] (1:master@Tremblay) Sending "Task_5" to "Jupiter"
-> [  0.562492] (2:slave@Tremblay) Received "Task_4"
-> [  0.562492] (2:slave@Tremblay) Processing "Task_4"
-> [  0.817347] (3:slave@Jupiter) "Task_0" done
-> [  0.969426] (4:slave@Fafard) "Task_1" done
-> [  0.979353] (1:master@Tremblay) Sent
-> [  0.979353] (1:master@Tremblay) Sending "Task_6" to "Fafard"
-> [  0.979353] (3:slave@Jupiter) Received "Task_5"
-> [  0.979353] (3:slave@Jupiter) Processing "Task_5"
-> [  1.072202] (2:slave@Tremblay) "Task_4" done
-> [  1.131431] (1:master@Tremblay) Sent
-> [  1.131431] (1:master@Tremblay) Sending "Task_7" to "Ginette"
-> [  1.131431] (4:slave@Fafard) Received "Task_6"
-> [  1.131431] (4:slave@Fafard) Processing "Task_6"
-> [  1.463809] (5:slave@Ginette) "Task_2" done
-> [  1.582438] (1:master@Tremblay) Sent
-> [  1.582438] (1:master@Tremblay) Sending "Task_8" to "Bourassa"
-> [  1.582438] (5:slave@Ginette) Received "Task_7"
-> [  1.582438] (5:slave@Ginette) Processing "Task_7"
-> [  1.591325] (6:slave@Bourassa) "Task_3" done
-> [  1.634695] (3:slave@Jupiter) "Task_5" done
-> [  1.718840] (1:master@Tremblay) Sent
-> [  1.718840] (1:master@Tremblay) Sending "Task_9" to "Tremblay"
-> [  1.718840] (1:master@Tremblay) Hey ! It's me ! :)
-> [  1.718840] (6:slave@Bourassa) Received "Task_8"
-> [  1.718840] (6:slave@Bourassa) Processing "Task_8"
-> [  1.721105] (1:master@Tremblay) Sent
-> [  1.721105] (1:master@Tremblay) Sending "Task_10" to "Jupiter"
-> [  1.721105] (2:slave@Tremblay) Received "Task_9"
-> [  1.721105] (2:slave@Tremblay) Processing "Task_9"
-> [  1.786773] (4:slave@Fafard) "Task_6" done
-> [  1.883110] (1:master@Tremblay) Sent
-> [  1.883110] (1:master@Tremblay) Sending "Task_11" to "Fafard"
-> [  1.883110] (3:slave@Jupiter) Received "Task_10"
-> [  1.883110] (3:slave@Jupiter) Processing "Task_10"
-> [  2.035188] (1:master@Tremblay) Sent
-> [  2.035188] (1:master@Tremblay) Sending "Task_12" to "Ginette"
-> [  2.035188] (4:slave@Fafard) Received "Task_11"
-> [  2.035188] (4:slave@Fafard) Processing "Task_11"
-> [  2.230815] (2:slave@Tremblay) "Task_9" done
-> [  2.538453] (3:slave@Jupiter) "Task_10" done
-> [  2.613536] (5:slave@Ginette) "Task_7" done
-> [  2.690531] (4:slave@Fafard) "Task_11" done
-> [  2.732164] (1:master@Tremblay) Sent
-> [  2.732164] (1:master@Tremblay) Sending "Task_13" to "Bourassa"
-> [  2.732164] (5:slave@Ginette) Received "Task_12"
-> [  2.732164] (5:slave@Ginette) Processing "Task_12"
-> [  2.749938] (6:slave@Bourassa) "Task_8" done
-> [  2.877453] (1:master@Tremblay) Sent
-> [  2.877453] (1:master@Tremblay) Sending "Task_14" to "Tremblay"
-> [  2.877453] (1:master@Tremblay) Hey ! It's me ! :)
-> [  2.877453] (6:slave@Bourassa) Received "Task_13"
-> [  2.877453] (6:slave@Bourassa) Processing "Task_13"
-> [  2.879718] (1:master@Tremblay) Sent
-> [  2.879718] (1:master@Tremblay) Sending "Task_15" to "Jupiter"
-> [  2.879718] (2:slave@Tremblay) Received "Task_14"
-> [  2.879718] (2:slave@Tremblay) Processing "Task_14"
-> [  3.041723] (1:master@Tremblay) Sent
-> [  3.041723] (1:master@Tremblay) Sending "Task_16" to "Fafard"
-> [  3.041723] (3:slave@Jupiter) Received "Task_15"
-> [  3.041723] (3:slave@Jupiter) Processing "Task_15"
-> [  3.193802] (1:master@Tremblay) Sent
-> [  3.193802] (1:master@Tremblay) Sending "Task_17" to "Ginette"
-> [  3.193802] (4:slave@Fafard) Received "Task_16"
-> [  3.193802] (4:slave@Fafard) Processing "Task_16"
-> [  3.389428] (2:slave@Tremblay) "Task_14" done
-> [  3.697066] (3:slave@Jupiter) "Task_15" done
-> [  3.763262] (5:slave@Ginette) "Task_12" done
-> [  3.849144] (4:slave@Fafard) "Task_16" done
-> [  3.881890] (1:master@Tremblay) Sent
-> [  3.881890] (1:master@Tremblay) Sending "Task_18" to "Bourassa"
-> [  3.881890] (5:slave@Ginette) Received "Task_17"
-> [  3.881890] (5:slave@Ginette) Processing "Task_17"
-> [  3.908551] (6:slave@Bourassa) "Task_13" done
-> [  4.036066] (1:master@Tremblay) Sent
-> [  4.036066] (1:master@Tremblay) Sending "Task_19" to "Tremblay"
-> [  4.036066] (1:master@Tremblay) Hey ! It's me ! :)
-> [  4.036066] (6:slave@Bourassa) Received "Task_18"
-> [  4.036066] (6:slave@Bourassa) Processing "Task_18"
-> [  4.038331] (1:master@Tremblay) Sent
-> [  4.038331] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [  4.038331] (2:slave@Tremblay) Received "Task_19"
-> [  4.038331] (2:slave@Tremblay) Processing "Task_19"
-> [  4.057346] (3:slave@Jupiter) Received "finalize"
-> [  4.057346] (3:slave@Jupiter) I'm done. See you!
-> [  4.083054] (4:slave@Fafard) Received "finalize"
-> [  4.083054] (4:slave@Fafard) I'm done. See you!
-> [  4.548041] (2:slave@Tremblay) "Task_19" done
-> [  4.912988] (5:slave@Ginette) "Task_17" done
-> [  4.929540] (5:slave@Ginette) Received "finalize"
-> [  4.929540] (5:slave@Ginette) I'm done. See you!
-> [  5.067164] (6:slave@Bourassa) "Task_18" done
-> [  5.092603] (6:slave@Bourassa) Received "finalize"
-> [  5.092603] (6:slave@Bourassa) I'm done. See you!
-> [  5.092798] (0:maestro@) Simulation time 5.0928
-> [  5.092798] (1:master@Tremblay) Goodbye now!
-> [  5.092798] (2:slave@Tremblay) Received "finalize"
-> [  5.092798] (2:slave@Tremblay) I'm done. See you!
-
-p Testing a simple master/slave example application. TCP crosstraffic DISABLED
-
-$ $SG_TEST_EXENV ${bindir:=.}/masterslave$EXEEXT ${srcdir:=.}/small_platform_with_routers.xml ${srcdir:=.}/../msg/masterslave/masterslave_d.xml --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (1:master@Tremblay) Got 5 slaves and 20 tasks to process
-> [  0.000000] (1:master@Tremblay) Sending "Task_0" to "Jupiter"
-> [  0.169155] (3:slave@Jupiter) Received "Task_0"
-> [  0.169155] (3:slave@Jupiter) Processing "Task_0"
-> [  0.169155] (1:master@Tremblay) Sent
-> [  0.169155] (1:master@Tremblay) Sending "Task_1" to "Fafard"
-> [  0.327551] (4:slave@Fafard) Received "Task_1"
-> [  0.327551] (4:slave@Fafard) Processing "Task_1"
-> [  0.327551] (1:master@Tremblay) Sent
-> [  0.327551] (1:master@Tremblay) Sending "Task_2" to "Ginette"
-> [  0.451283] (5:slave@Ginette) Received "Task_2"
-> [  0.451283] (5:slave@Ginette) Processing "Task_2"
-> [  0.451283] (1:master@Tremblay) Sent
-> [  0.451283] (1:master@Tremblay) Sending "Task_3" to "Bourassa"
-> [  0.583902] (6:slave@Bourassa) Received "Task_3"
-> [  0.583902] (6:slave@Bourassa) Processing "Task_3"
-> [  0.583902] (1:master@Tremblay) Sent
-> [  0.583902] (1:master@Tremblay) Sending "Task_4" to "Tremblay"
-> [  0.583902] (1:master@Tremblay) Hey ! It's me ! :)
-> [  0.586168] (2:slave@Tremblay) Received "Task_4"
-> [  0.586168] (2:slave@Tremblay) Processing "Task_4"
-> [  0.586168] (1:master@Tremblay) Sent
-> [  0.586168] (1:master@Tremblay) Sending "Task_5" to "Jupiter"
-> [  0.824497] (3:slave@Jupiter) "Task_0" done
-> [  0.982894] (4:slave@Fafard) "Task_1" done
-> [  0.993652] (1:master@Tremblay) Sent
-> [  0.993652] (1:master@Tremblay) Sending "Task_6" to "Fafard"
-> [  0.993652] (3:slave@Jupiter) Received "Task_5"
-> [  0.993652] (3:slave@Jupiter) Processing "Task_5"
-> [  1.095878] (2:slave@Tremblay) "Task_4" done
-> [  1.152048] (4:slave@Fafard) Received "Task_6"
-> [  1.152048] (4:slave@Fafard) Processing "Task_6"
-> [  1.152048] (1:master@Tremblay) Sent
-> [  1.152048] (1:master@Tremblay) Sending "Task_7" to "Ginette"
-> [  1.482381] (5:slave@Ginette) "Task_2" done
-> [  1.606113] (1:master@Tremblay) Sent
-> [  1.606113] (1:master@Tremblay) Sending "Task_8" to "Bourassa"
-> [  1.606113] (5:slave@Ginette) Received "Task_7"
-> [  1.606113] (5:slave@Ginette) Processing "Task_7"
-> [  1.615000] (6:slave@Bourassa) "Task_3" done
-> [  1.648994] (3:slave@Jupiter) "Task_5" done
-> [  1.747619] (1:master@Tremblay) Sent
-> [  1.747619] (1:master@Tremblay) Sending "Task_9" to "Tremblay"
-> [  1.747619] (1:master@Tremblay) Hey ! It's me ! :)
-> [  1.747619] (6:slave@Bourassa) Received "Task_8"
-> [  1.747619] (6:slave@Bourassa) Processing "Task_8"
-> [  1.749885] (2:slave@Tremblay) Received "Task_9"
-> [  1.749885] (2:slave@Tremblay) Processing "Task_9"
-> [  1.749885] (1:master@Tremblay) Sent
-> [  1.749885] (1:master@Tremblay) Sending "Task_10" to "Jupiter"
-> [  1.807391] (4:slave@Fafard) "Task_6" done
-> [  1.919039] (3:slave@Jupiter) Received "Task_10"
-> [  1.919039] (3:slave@Jupiter) Processing "Task_10"
-> [  1.919039] (1:master@Tremblay) Sent
-> [  1.919039] (1:master@Tremblay) Sending "Task_11" to "Fafard"
-> [  2.077436] (4:slave@Fafard) Received "Task_11"
-> [  2.077436] (4:slave@Fafard) Processing "Task_11"
-> [  2.077436] (1:master@Tremblay) Sent
-> [  2.077436] (1:master@Tremblay) Sending "Task_12" to "Ginette"
-> [  2.259594] (2:slave@Tremblay) "Task_9" done
-> [  2.574382] (3:slave@Jupiter) "Task_10" done
-> [  2.637211] (5:slave@Ginette) "Task_7" done
-> [  2.732778] (4:slave@Fafard) "Task_11" done
-> [  2.760943] (1:master@Tremblay) Sent
-> [  2.760943] (1:master@Tremblay) Sending "Task_13" to "Bourassa"
-> [  2.760943] (5:slave@Ginette) Received "Task_12"
-> [  2.760943] (5:slave@Ginette) Processing "Task_12"
-> [  2.778717] (6:slave@Bourassa) "Task_8" done
-> [  2.911336] (1:master@Tremblay) Sent
-> [  2.911336] (1:master@Tremblay) Sending "Task_14" to "Tremblay"
-> [  2.911336] (1:master@Tremblay) Hey ! It's me ! :)
-> [  2.911336] (6:slave@Bourassa) Received "Task_13"
-> [  2.911336] (6:slave@Bourassa) Processing "Task_13"
-> [  2.913601] (2:slave@Tremblay) Received "Task_14"
-> [  2.913601] (2:slave@Tremblay) Processing "Task_14"
-> [  2.913601] (1:master@Tremblay) Sent
-> [  2.913601] (1:master@Tremblay) Sending "Task_15" to "Jupiter"
-> [  3.082756] (3:slave@Jupiter) Received "Task_15"
-> [  3.082756] (3:slave@Jupiter) Processing "Task_15"
-> [  3.082756] (1:master@Tremblay) Sent
-> [  3.082756] (1:master@Tremblay) Sending "Task_16" to "Fafard"
-> [  3.241153] (4:slave@Fafard) Received "Task_16"
-> [  3.241153] (4:slave@Fafard) Processing "Task_16"
-> [  3.241153] (1:master@Tremblay) Sent
-> [  3.241153] (1:master@Tremblay) Sending "Task_17" to "Ginette"
-> [  3.423311] (2:slave@Tremblay) "Task_14" done
-> [  3.738098] (3:slave@Jupiter) "Task_15" done
-> [  3.792041] (5:slave@Ginette) "Task_12" done
-> [  3.896495] (4:slave@Fafard) "Task_16" done
-> [  3.915773] (1:master@Tremblay) Sent
-> [  3.915773] (1:master@Tremblay) Sending "Task_18" to "Bourassa"
-> [  3.915773] (5:slave@Ginette) Received "Task_17"
-> [  3.915773] (5:slave@Ginette) Processing "Task_17"
-> [  3.942434] (6:slave@Bourassa) "Task_13" done
-> [  4.075053] (1:master@Tremblay) Sent
-> [  4.075053] (1:master@Tremblay) Sending "Task_19" to "Tremblay"
-> [  4.075053] (1:master@Tremblay) Hey ! It's me ! :)
-> [  4.075053] (6:slave@Bourassa) Received "Task_18"
-> [  4.075053] (6:slave@Bourassa) Processing "Task_18"
-> [  4.077318] (2:slave@Tremblay) Received "Task_19"
-> [  4.077318] (2:slave@Tremblay) Processing "Task_19"
-> [  4.077318] (1:master@Tremblay) Sent
-> [  4.077318] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [  4.096333] (3:slave@Jupiter) Received "finalize"
-> [  4.096333] (3:slave@Jupiter) I'm done. See you!
-> [  4.122041] (4:slave@Fafard) Received "finalize"
-> [  4.122041] (4:slave@Fafard) I'm done. See you!
-> [  4.587028] (2:slave@Tremblay) "Task_19" done
-> [  4.946871] (5:slave@Ginette) "Task_17" done
-> [  4.963423] (5:slave@Ginette) Received "finalize"
-> [  4.963423] (5:slave@Ginette) I'm done. See you!
-> [  5.106151] (6:slave@Bourassa) "Task_18" done
-> [  5.131590] (6:slave@Bourassa) Received "finalize"
-> [  5.131590] (6:slave@Bourassa) I'm done. See you!
-> [  5.131785] (2:slave@Tremblay) Received "finalize"
-> [  5.131785] (2:slave@Tremblay) I'm done. See you!
-> [  5.131785] (1:master@Tremblay) Goodbye now!
-> [  5.131785] (0:maestro@) Simulation time 5.13179

diff --git a/examples/msg/masterslave/masterslave_cpu_ti.tesh b/examples/msg/masterslave/masterslave_cpu_ti.tesh
deleted file mode 100644 (file)
index 53d2099..0000000
--- a/examples/msg/masterslave/masterslave_cpu_ti.tesh
+++ /dev/null
@@ -1,251 +0,0 @@
-#! ./tesh
-
-p Testing a simple master/slave example application
-
-! output sort 19
-$ $SG_TEST_EXENV ${bindir:=.}/masterslave$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave/masterslave_d.xml --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
-> [  0.000000] (1:master@Tremblay) Got 5 slaves and 20 tasks to process
-> [  0.000000] (1:master@Tremblay) Sending "Task_0" to "Jupiter"
-> [  0.169155] (1:master@Tremblay) Sent
-> [  0.169155] (1:master@Tremblay) Sending "Task_1" to "Fafard"
-> [  0.169155] (3:slave@Jupiter) Received "Task_0"
-> [  0.169155] (3:slave@Jupiter) Processing "Task_0"
-> [  0.327551] (1:master@Tremblay) Sent
-> [  0.327551] (1:master@Tremblay) Sending "Task_2" to "Ginette"
-> [  0.327551] (4:slave@Fafard) Received "Task_1"
-> [  0.327551] (4:slave@Fafard) Processing "Task_1"
-> [  0.451283] (1:master@Tremblay) Sent
-> [  0.451283] (1:master@Tremblay) Sending "Task_3" to "Bourassa"
-> [  0.451283] (5:slave@Ginette) Received "Task_2"
-> [  0.451283] (5:slave@Ginette) Processing "Task_2"
-> [  0.583902] (1:master@Tremblay) Sent
-> [  0.583902] (1:master@Tremblay) Sending "Task_4" to "Tremblay"
-> [  0.583902] (1:master@Tremblay) Hey ! It's me ! :)
-> [  0.583902] (6:slave@Bourassa) Received "Task_3"
-> [  0.583902] (6:slave@Bourassa) Processing "Task_3"
-> [  0.586168] (1:master@Tremblay) Sent
-> [  0.586168] (1:master@Tremblay) Sending "Task_5" to "Jupiter"
-> [  0.586168] (2:slave@Tremblay) Received "Task_4"
-> [  0.586168] (2:slave@Tremblay) Processing "Task_4"
-> [  0.824497] (3:slave@Jupiter) "Task_0" done
-> [  0.982894] (4:slave@Fafard) "Task_1" done
-> [  0.993652] (1:master@Tremblay) Sent
-> [  0.993652] (1:master@Tremblay) Sending "Task_6" to "Fafard"
-> [  0.993652] (3:slave@Jupiter) Received "Task_5"
-> [  0.993652] (3:slave@Jupiter) Processing "Task_5"
-> [  1.095878] (2:slave@Tremblay) "Task_4" done
-> [  1.152048] (1:master@Tremblay) Sent
-> [  1.152048] (1:master@Tremblay) Sending "Task_7" to "Ginette"
-> [  1.152048] (4:slave@Fafard) Received "Task_6"
-> [  1.152048] (4:slave@Fafard) Processing "Task_6"
-> [  1.482381] (5:slave@Ginette) "Task_2" done
-> [  1.606113] (1:master@Tremblay) Sent
-> [  1.606113] (1:master@Tremblay) Sending "Task_8" to "Bourassa"
-> [  1.606113] (5:slave@Ginette) Received "Task_7"
-> [  1.606113] (5:slave@Ginette) Processing "Task_7"
-> [  1.615000] (6:slave@Bourassa) "Task_3" done
-> [  1.648994] (3:slave@Jupiter) "Task_5" done
-> [  1.747619] (1:master@Tremblay) Sent
-> [  1.747619] (1:master@Tremblay) Sending "Task_9" to "Tremblay"
-> [  1.747619] (1:master@Tremblay) Hey ! It's me ! :)
-> [  1.747619] (6:slave@Bourassa) Received "Task_8"
-> [  1.747619] (6:slave@Bourassa) Processing "Task_8"
-> [  1.749885] (1:master@Tremblay) Sent
-> [  1.749885] (1:master@Tremblay) Sending "Task_10" to "Jupiter"
-> [  1.749885] (2:slave@Tremblay) Received "Task_9"
-> [  1.749885] (2:slave@Tremblay) Processing "Task_9"
-> [  1.807391] (4:slave@Fafard) "Task_6" done
-> [  1.919039] (1:master@Tremblay) Sent
-> [  1.919039] (1:master@Tremblay) Sending "Task_11" to "Fafard"
-> [  1.919039] (3:slave@Jupiter) Received "Task_10"
-> [  1.919039] (3:slave@Jupiter) Processing "Task_10"
-> [  2.077436] (1:master@Tremblay) Sent
-> [  2.077436] (1:master@Tremblay) Sending "Task_12" to "Ginette"
-> [  2.077436] (4:slave@Fafard) Received "Task_11"
-> [  2.077436] (4:slave@Fafard) Processing "Task_11"
-> [  2.259594] (2:slave@Tremblay) "Task_9" done
-> [  2.574382] (3:slave@Jupiter) "Task_10" done
-> [  2.637211] (5:slave@Ginette) "Task_7" done
-> [  2.732778] (4:slave@Fafard) "Task_11" done
-> [  2.760943] (1:master@Tremblay) Sent
-> [  2.760943] (1:master@Tremblay) Sending "Task_13" to "Bourassa"
-> [  2.760943] (5:slave@Ginette) Received "Task_12"
-> [  2.760943] (5:slave@Ginette) Processing "Task_12"
-> [  2.778717] (6:slave@Bourassa) "Task_8" done
-> [  2.911336] (1:master@Tremblay) Sent
-> [  2.911336] (1:master@Tremblay) Sending "Task_14" to "Tremblay"
-> [  2.911336] (1:master@Tremblay) Hey ! It's me ! :)
-> [  2.911336] (6:slave@Bourassa) Received "Task_13"
-> [  2.911336] (6:slave@Bourassa) Processing "Task_13"
-> [  2.913601] (1:master@Tremblay) Sent
-> [  2.913601] (1:master@Tremblay) Sending "Task_15" to "Jupiter"
-> [  2.913601] (2:slave@Tremblay) Received "Task_14"
-> [  2.913601] (2:slave@Tremblay) Processing "Task_14"
-> [  3.082756] (1:master@Tremblay) Sent
-> [  3.082756] (1:master@Tremblay) Sending "Task_16" to "Fafard"
-> [  3.082756] (3:slave@Jupiter) Received "Task_15"
-> [  3.082756] (3:slave@Jupiter) Processing "Task_15"
-> [  3.241153] (1:master@Tremblay) Sent
-> [  3.241153] (1:master@Tremblay) Sending "Task_17" to "Ginette"
-> [  3.241153] (4:slave@Fafard) Received "Task_16"
-> [  3.241153] (4:slave@Fafard) Processing "Task_16"
-> [  3.423311] (2:slave@Tremblay) "Task_14" done
-> [  3.738098] (3:slave@Jupiter) "Task_15" done
-> [  3.792041] (5:slave@Ginette) "Task_12" done
-> [  3.896495] (4:slave@Fafard) "Task_16" done
-> [  3.915773] (1:master@Tremblay) Sent
-> [  3.915773] (1:master@Tremblay) Sending "Task_18" to "Bourassa"
-> [  3.915773] (5:slave@Ginette) Received "Task_17"
-> [  3.915773] (5:slave@Ginette) Processing "Task_17"
-> [  3.942434] (6:slave@Bourassa) "Task_13" done
-> [  4.075053] (1:master@Tremblay) Sent
-> [  4.075053] (1:master@Tremblay) Sending "Task_19" to "Tremblay"
-> [  4.075053] (1:master@Tremblay) Hey ! It's me ! :)
-> [  4.075053] (6:slave@Bourassa) Received "Task_18"
-> [  4.075053] (6:slave@Bourassa) Processing "Task_18"
-> [  4.077318] (1:master@Tremblay) Sent
-> [  4.077318] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [  4.077318] (2:slave@Tremblay) Received "Task_19"
-> [  4.077318] (2:slave@Tremblay) Processing "Task_19"
-> [  4.096333] (3:slave@Jupiter) Received "finalize"
-> [  4.096333] (3:slave@Jupiter) I'm done. See you!
-> [  4.122041] (4:slave@Fafard) Received "finalize"
-> [  4.122041] (4:slave@Fafard) I'm done. See you!
-> [  4.587028] (2:slave@Tremblay) "Task_19" done
-> [  4.946871] (5:slave@Ginette) "Task_17" done
-> [  4.963423] (5:slave@Ginette) Received "finalize"
-> [  4.963423] (5:slave@Ginette) I'm done. See you!
-> [  5.106151] (6:slave@Bourassa) "Task_18" done
-> [  5.131590] (6:slave@Bourassa) Received "finalize"
-> [  5.131590] (6:slave@Bourassa) I'm done. See you!
-> [  5.131785] (0:maestro@) Simulation time 5.13179
-> [  5.131785] (1:master@Tremblay) Goodbye now!
-> [  5.131785] (2:slave@Tremblay) Received "finalize"
-> [  5.131785] (2:slave@Tremblay) I'm done. See you!
-
-p Testing a simple master/slave example application
-
-! output sort 19
-$ $SG_TEST_EXENV ${bindir:=.}/masterslave$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave/masterslave_d.xml --cfg=network/crosstraffic:0 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0'
-> [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
-> [  0.000000] (1:master@Tremblay) Got 5 slaves and 20 tasks to process
-> [  0.000000] (1:master@Tremblay) Sending "Task_0" to "Jupiter"
-> [  0.165962] (1:master@Tremblay) Sent
-> [  0.165962] (1:master@Tremblay) Sending "Task_1" to "Fafard"
-> [  0.165962] (3:slave@Jupiter) Received "Task_0"
-> [  0.165962] (3:slave@Jupiter) Processing "Task_0"
-> [  0.384115] (1:master@Tremblay) Sent
-> [  0.384115] (1:master@Tremblay) Sending "Task_2" to "Ginette"
-> [  0.384115] (4:slave@Fafard) Received "Task_1"
-> [  0.384115] (4:slave@Fafard) Processing "Task_1"
-> [  0.524575] (1:master@Tremblay) Sent
-> [  0.524575] (1:master@Tremblay) Sending "Task_3" to "Bourassa"
-> [  0.524575] (5:slave@Ginette) Received "Task_2"
-> [  0.524575] (5:slave@Ginette) Processing "Task_2"
-> [  0.740447] (1:master@Tremblay) Sent
-> [  0.740447] (1:master@Tremblay) Sending "Task_4" to "Tremblay"
-> [  0.740447] (1:master@Tremblay) Hey ! It's me ! :)
-> [  0.740447] (6:slave@Bourassa) Received "Task_3"
-> [  0.740447] (6:slave@Bourassa) Processing "Task_3"
-> [  0.742786] (1:master@Tremblay) Sent
-> [  0.742786] (1:master@Tremblay) Sending "Task_5" to "Jupiter"
-> [  0.742786] (2:slave@Tremblay) Received "Task_4"
-> [  0.742786] (2:slave@Tremblay) Processing "Task_4"
-> [  0.821304] (3:slave@Jupiter) "Task_0" done
-> [  0.987266] (1:master@Tremblay) Sent
-> [  0.987266] (1:master@Tremblay) Sending "Task_6" to "Fafard"
-> [  0.987266] (3:slave@Jupiter) Received "Task_5"
-> [  0.987266] (3:slave@Jupiter) Processing "Task_5"
-> [  1.039457] (4:slave@Fafard) "Task_1" done
-> [  1.252495] (2:slave@Tremblay) "Task_4" done
-> [  1.257610] (1:master@Tremblay) Sent
-> [  1.257610] (1:master@Tremblay) Sending "Task_7" to "Ginette"
-> [  1.257610] (4:slave@Fafard) Received "Task_6"
-> [  1.257610] (4:slave@Fafard) Processing "Task_6"
-> [  1.555672] (5:slave@Ginette) "Task_2" done
-> [  1.642608] (3:slave@Jupiter) "Task_5" done
-> [  1.696132] (1:master@Tremblay) Sent
-> [  1.696132] (1:master@Tremblay) Sending "Task_8" to "Bourassa"
-> [  1.696132] (5:slave@Ginette) Received "Task_7"
-> [  1.696132] (5:slave@Ginette) Processing "Task_7"
-> [  1.771545] (6:slave@Bourassa) "Task_3" done
-> [  1.912953] (4:slave@Fafard) "Task_6" done
-> [  1.987417] (1:master@Tremblay) Sent
-> [  1.987417] (1:master@Tremblay) Sending "Task_9" to "Tremblay"
-> [  1.987417] (1:master@Tremblay) Hey ! It's me ! :)
-> [  1.987417] (6:slave@Bourassa) Received "Task_8"
-> [  1.987417] (6:slave@Bourassa) Processing "Task_8"
-> [  1.989756] (1:master@Tremblay) Sent
-> [  1.989756] (1:master@Tremblay) Sending "Task_10" to "Jupiter"
-> [  1.989756] (2:slave@Tremblay) Received "Task_9"
-> [  1.989756] (2:slave@Tremblay) Processing "Task_9"
-> [  2.155718] (1:master@Tremblay) Sent
-> [  2.155718] (1:master@Tremblay) Sending "Task_11" to "Fafard"
-> [  2.155718] (3:slave@Jupiter) Received "Task_10"
-> [  2.155718] (3:slave@Jupiter) Processing "Task_10"
-> [  2.373871] (1:master@Tremblay) Sent
-> [  2.373871] (1:master@Tremblay) Sending "Task_12" to "Ginette"
-> [  2.373871] (4:slave@Fafard) Received "Task_11"
-> [  2.373871] (4:slave@Fafard) Processing "Task_11"
-> [  2.499466] (2:slave@Tremblay) "Task_9" done
-> [  2.727230] (5:slave@Ginette) "Task_7" done
-> [  2.811060] (3:slave@Jupiter) "Task_10" done
-> [  2.867690] (1:master@Tremblay) Sent
-> [  2.867690] (1:master@Tremblay) Sending "Task_13" to "Bourassa"
-> [  2.867690] (5:slave@Ginette) Received "Task_12"
-> [  2.867690] (5:slave@Ginette) Processing "Task_12"
-> [  3.018515] (6:slave@Bourassa) "Task_8" done
-> [  3.029213] (4:slave@Fafard) "Task_11" done
-> [  3.234387] (1:master@Tremblay) Sent
-> [  3.234387] (1:master@Tremblay) Sending "Task_14" to "Tremblay"
-> [  3.234387] (1:master@Tremblay) Hey ! It's me ! :)
-> [  3.234387] (6:slave@Bourassa) Received "Task_13"
-> [  3.234387] (6:slave@Bourassa) Processing "Task_13"
-> [  3.236726] (1:master@Tremblay) Sent
-> [  3.236726] (1:master@Tremblay) Sending "Task_15" to "Jupiter"
-> [  3.236726] (2:slave@Tremblay) Received "Task_14"
-> [  3.236726] (2:slave@Tremblay) Processing "Task_14"
-> [  3.402688] (1:master@Tremblay) Sent
-> [  3.402688] (1:master@Tremblay) Sending "Task_16" to "Fafard"
-> [  3.402688] (3:slave@Jupiter) Received "Task_15"
-> [  3.402688] (3:slave@Jupiter) Processing "Task_15"
-> [  3.620841] (1:master@Tremblay) Sent
-> [  3.620841] (1:master@Tremblay) Sending "Task_17" to "Ginette"
-> [  3.620841] (4:slave@Fafard) Received "Task_16"
-> [  3.620841] (4:slave@Fafard) Processing "Task_16"
-> [  3.746436] (2:slave@Tremblay) "Task_14" done
-> [  3.898788] (5:slave@Ginette) "Task_12" done
-> [  4.039247] (1:master@Tremblay) Sent
-> [  4.039247] (1:master@Tremblay) Sending "Task_18" to "Bourassa"
-> [  4.039247] (5:slave@Ginette) Received "Task_17"
-> [  4.039247] (5:slave@Ginette) Processing "Task_17"
-> [  4.058030] (3:slave@Jupiter) "Task_15" done
-> [  4.265485] (6:slave@Bourassa) "Task_13" done
-> [  4.276183] (4:slave@Fafard) "Task_16" done
-> [  4.481357] (1:master@Tremblay) Sent
-> [  4.481357] (1:master@Tremblay) Sending "Task_19" to "Tremblay"
-> [  4.481357] (1:master@Tremblay) Hey ! It's me ! :)
-> [  4.481357] (6:slave@Bourassa) Received "Task_18"
-> [  4.481357] (6:slave@Bourassa) Processing "Task_18"
-> [  4.483696] (1:master@Tremblay) Sent
-> [  4.483696] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [  4.483696] (2:slave@Tremblay) Received "Task_19"
-> [  4.483696] (2:slave@Tremblay) Processing "Task_19"
-> [  4.498896] (3:slave@Jupiter) Received "finalize"
-> [  4.498896] (3:slave@Jupiter) I'm done. See you!
-> [  4.519447] (4:slave@Fafard) Received "finalize"
-> [  4.519447] (4:slave@Fafard) I'm done. See you!
-> [  4.993406] (2:slave@Tremblay) "Task_19" done
-> [  5.070345] (5:slave@Ginette) "Task_17" done
-> [  5.083577] (5:slave@Ginette) Received "finalize"
-> [  5.083577] (5:slave@Ginette) I'm done. See you!
-> [  5.512455] (6:slave@Bourassa) "Task_18" done
-> [  5.532791] (6:slave@Bourassa) Received "finalize"
-> [  5.532791] (6:slave@Bourassa) I'm done. See you!
-> [  5.532947] (0:maestro@) Simulation time 5.53295
-> [  5.532947] (1:master@Tremblay) Goodbye now!
-> [  5.532947] (2:slave@Tremblay) Received "finalize"
-> [  5.532947] (2:slave@Tremblay) I'm done. See you!
-

diff --git a/examples/msg/masterslave/masterslave_d.xml b/examples/msg/masterslave/masterslave_d.xml
deleted file mode 100644 (file)
index 6ebf11b..0000000
--- a/examples/msg/masterslave/masterslave_d.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <!-- 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 -->
-     <argument value="Tremblay"/> <!-- Me! I can work too! -->
-  </process>
-  <!-- The slave process (with no argument) -->
-  <process host="Tremblay" function="slave" on_failure="RESTART"/>
-  <process host="Jupiter" function="slave" on_failure="RESTART"/>
-  <process host="Fafard" function="slave" on_failure="RESTART"/>
-  <process host="Ginette" function="slave" on_failure="RESTART"/>
-  <process host="Bourassa" function="slave" on_failure="RESTART"/>
-</platform>

diff --git a/examples/msg/masterslave-mailbox/masterslave-mailbox-multicore.tesh b/examples/msg/masterworker-mailbox/masterworker-mailbox-multicore.tesh
similarity index 51%
rename from examples/msg/masterslave-mailbox/masterslave-mailbox-multicore.tesh
rename to examples/msg/masterworker-mailbox/masterworker-mailbox-multicore.tesh
index e7c6c05..b131262 100644 (file)
--- a/examples/msg/masterslave-mailbox/masterslave-mailbox-multicore.tesh
+++ b/examples/msg/masterworker-mailbox/masterworker-mailbox-multicore.tesh
@@ -1,36 +1,36 @@
 #! ./tesh
 
 #! ./tesh
 

-p Testing a simple master/slave example application
+p Testing a simple master/worker example application

 
 

-$ $SG_TEST_EXENV ./masterslave-mailbox/masterslave-mailbox ${srcdir:=.}/../platforms/multicore_machine.xml ${srcdir:=.}/masterslave-mailbox/masterslave-mailbox-multicore_d.xml --cfg=cpu/model:Cas01 --cfg=cpu/optim:Full
+$ $SG_TEST_EXENV ./masterworker-mailbox/masterworker-mailbox ${srcdir:=.}/../platforms/multicore_machine.xml ${srcdir:=.}/masterworker-mailbox/masterworker-mailbox-multicore_d.xml --cfg=cpu/model:Cas01 --cfg=cpu/optim:Full

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/optim' to 'Full'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/optim' to 'Full'

-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 6 slaves and 20 tasks to process
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" (of 20) to mailbox "slave-0"
-> [Tremblay:master:(1) 0.002203] [msg_test/INFO] Sending "Task_1" (of 20) to mailbox "slave-1"
-> [Tremblay:master:(1) 0.004406] [msg_test/INFO] Sending "Task_2" (of 20) to mailbox "slave-2"
-> [Tremblay:master:(1) 0.006610] [msg_test/INFO] Sending "Task_3" (of 20) to mailbox "slave-3"
-> [Tremblay:master:(1) 0.008813] [msg_test/INFO] Sending "Task_4" (of 20) to mailbox "slave-4"
-> [Tremblay:master:(1) 0.011016] [msg_test/INFO] Sending "Task_5" (of 20) to mailbox "slave-5"
-> [Tremblay:master:(1) 0.013219] [msg_test/INFO] Sending "Task_6" (of 20) to mailbox "slave-0"
-> [Tremblay:master:(1) 0.514116] [msg_test/INFO] Sending "Task_7" (of 20) to mailbox "slave-1"
-> [Tremblay:master:(1) 0.516320] [msg_test/INFO] Sending "Task_8" (of 20) to mailbox "slave-2"
-> [Tremblay:master:(1) 0.518523] [msg_test/INFO] Sending "Task_9" (of 20) to mailbox "slave-3"
-> [Tremblay:master:(1) 0.520726] [msg_test/INFO] Sending "Task_10" (of 20) to mailbox "slave-4"
-> [Tremblay:master:(1) 0.522929] [msg_test/INFO] Sending "Task_11" (of 20) to mailbox "slave-5"
-> [Tremblay:master:(1) 0.525132] [msg_test/INFO] Sending "Task_12" (of 20) to mailbox "slave-0"
-> [Tremblay:master:(1) 1.026029] [msg_test/INFO] Sending "Task_13" (of 20) to mailbox "slave-1"
-> [Tremblay:master:(1) 1.028233] [msg_test/INFO] Sending "Task_14" (of 20) to mailbox "slave-2"
-> [Tremblay:master:(1) 1.030436] [msg_test/INFO] Sending "Task_15" (of 20) to mailbox "slave-3"
-> [Tremblay:master:(1) 1.032639] [msg_test/INFO] Sending "Task_16" (of 20) to mailbox "slave-4"
-> [Tremblay:master:(1) 1.034842] [msg_test/INFO] Sending "Task_17" (of 20) to mailbox "slave-5"
-> [Tremblay:master:(1) 1.037045] [msg_test/INFO] Sending "Task_18" (of 20) to mailbox "slave-0"
-> [Tremblay:master:(1) 1.537943] [msg_test/INFO] Sending "Task_19" (of 20) to mailbox "slave-1"
+> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 6 workers and 20 tasks to process
+> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" (of 20) to mailbox "worker-0"
+> [Tremblay:master:(1) 0.002203] [msg_test/INFO] Sending "Task_1" (of 20) to mailbox "worker-1"
+> [Tremblay:master:(1) 0.004406] [msg_test/INFO] Sending "Task_2" (of 20) to mailbox "worker-2"
+> [Tremblay:master:(1) 0.006610] [msg_test/INFO] Sending "Task_3" (of 20) to mailbox "worker-3"
+> [Tremblay:master:(1) 0.008813] [msg_test/INFO] Sending "Task_4" (of 20) to mailbox "worker-4"
+> [Tremblay:master:(1) 0.011016] [msg_test/INFO] Sending "Task_5" (of 20) to mailbox "worker-5"
+> [Tremblay:master:(1) 0.013219] [msg_test/INFO] Sending "Task_6" (of 20) to mailbox "worker-0"
+> [Tremblay:master:(1) 0.514116] [msg_test/INFO] Sending "Task_7" (of 20) to mailbox "worker-1"
+> [Tremblay:master:(1) 0.516320] [msg_test/INFO] Sending "Task_8" (of 20) to mailbox "worker-2"
+> [Tremblay:master:(1) 0.518523] [msg_test/INFO] Sending "Task_9" (of 20) to mailbox "worker-3"
+> [Tremblay:master:(1) 0.520726] [msg_test/INFO] Sending "Task_10" (of 20) to mailbox "worker-4"
+> [Tremblay:master:(1) 0.522929] [msg_test/INFO] Sending "Task_11" (of 20) to mailbox "worker-5"
+> [Tremblay:master:(1) 0.525132] [msg_test/INFO] Sending "Task_12" (of 20) to mailbox "worker-0"
+> [Tremblay:master:(1) 1.026029] [msg_test/INFO] Sending "Task_13" (of 20) to mailbox "worker-1"
+> [Tremblay:master:(1) 1.028233] [msg_test/INFO] Sending "Task_14" (of 20) to mailbox "worker-2"
+> [Tremblay:master:(1) 1.030436] [msg_test/INFO] Sending "Task_15" (of 20) to mailbox "worker-3"
+> [Tremblay:master:(1) 1.032639] [msg_test/INFO] Sending "Task_16" (of 20) to mailbox "worker-4"
+> [Tremblay:master:(1) 1.034842] [msg_test/INFO] Sending "Task_17" (of 20) to mailbox "worker-5"
+> [Tremblay:master:(1) 1.037045] [msg_test/INFO] Sending "Task_18" (of 20) to mailbox "worker-0"
+> [Tremblay:master:(1) 1.537943] [msg_test/INFO] Sending "Task_19" (of 20) to mailbox "worker-1"

 > [Tremblay:master:(1) 1.540146] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over.
 > [Tremblay:master:(1) 1.540146] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over.

-> [Tremblay:slave:(2) 2.047848] [msg_test/INFO] I'm done. See you!
-> [Tremblay:slave:(3) 2.050051] [msg_test/INFO] I'm done. See you!
-> [Tremblay:slave:(4) 2.050246] [msg_test/INFO] I'm done. See you!
-> [Tremblay:slave:(5) 2.050441] [msg_test/INFO] I'm done. See you!
-> [Tremblay:slave:(6) 2.050636] [msg_test/INFO] I'm done. See you!
-> [Tremblay:slave:(7) 2.050832] [msg_test/INFO] I'm done. See you!
+> [Tremblay:worker:(2) 2.047848] [msg_test/INFO] I'm done. See you!
+> [Tremblay:worker:(3) 2.050051] [msg_test/INFO] I'm done. See you!
+> [Tremblay:worker:(4) 2.050246] [msg_test/INFO] I'm done. See you!
+> [Tremblay:worker:(5) 2.050441] [msg_test/INFO] I'm done. See you!
+> [Tremblay:worker:(6) 2.050636] [msg_test/INFO] I'm done. See you!
+> [Tremblay:worker:(7) 2.050832] [msg_test/INFO] I'm done. See you!

 > [2.050832] [msg_test/INFO] Simulation time 2.05083
\ No newline at end of file
 > [2.050832] [msg_test/INFO] Simulation time 2.05083
\ No newline at end of file

diff --git a/examples/msg/masterworker-mailbox/masterworker-mailbox-multicore_d.xml b/examples/msg/masterworker-mailbox/masterworker-mailbox-multicore_d.xml
new file mode 100644 (file)
index 0000000..8a011ce
--- /dev/null
+++ b/examples/msg/masterworker-mailbox/masterworker-mailbox-multicore_d.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
+  <!-- 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="6"/>         <!-- Number of workers -->
+  </process>
+  <!-- The worker processes (with mailbox to listen on as argument) -->
+  <process host="Tremblay" function="worker">   <argument value="0"/> </process>
+  <process host="Tremblay" function="worker">   <argument value="1"/> </process>
+  <process host="Tremblay" function="worker">   <argument value="2"/> </process>
+  <process host="Tremblay" function="worker">   <argument value="3"/> </process>
+  <process host="Tremblay" function="worker">   <argument value="4"/> </process>
+  <process host="Tremblay" function="worker">   <argument value="5"/> </process>
+</platform>

diff --git a/examples/msg/masterworker-mailbox/masterworker-mailbox-vivaldi.tesh b/examples/msg/masterworker-mailbox/masterworker-mailbox-vivaldi.tesh
new file mode 100644 (file)
index 0000000..2f48800
--- /dev/null
+++ b/examples/msg/masterworker-mailbox/masterworker-mailbox-vivaldi.tesh
@@ -0,0 +1,36 @@
+#! ./tesh
+
+p Testing a simple master/worker example application
+
+$ $SG_TEST_EXENV ./masterworker-mailbox/masterworker-mailbox  ${srcdir:=.}/../platforms/vivaldi.xml ${srcdir:=.}/masterworker-mailbox/masterworker-mailbox-vivaldi_d.xml --cfg=network/latency_factor:1.0 --cfg=network/bandwidth_factor:1.0
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/latency_factor' to '1.0'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/bandwidth_factor' to '1.0'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/coordinates' to 'yes'
+> [100030591:master:(1) 0.000000] [msg_test/INFO] Got 15 workers and 10 tasks to process
+> [100030591:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" (of 10) to mailbox "worker-0"
+> [100030591:master:(1) 0.046299] [msg_test/INFO] Sending "Task_1" (of 10) to mailbox "worker-1"
+> [100030591:master:(1) 0.103602] [msg_test/INFO] Sending "Task_2" (of 10) to mailbox "worker-2"
+> [100030591:master:(1) 0.126922] [msg_test/INFO] Sending "Task_3" (of 10) to mailbox "worker-3"
+> [100030591:master:(1) 0.167282] [msg_test/INFO] Sending "Task_4" (of 10) to mailbox "worker-4"
+> [100030591:master:(1) 0.174710] [msg_test/INFO] Sending "Task_5" (of 10) to mailbox "worker-5"
+> [100030591:master:(1) 0.307173] [msg_test/INFO] Sending "Task_6" (of 10) to mailbox "worker-6"
+> [100030591:master:(1) 0.370794] [msg_test/INFO] Sending "Task_7" (of 10) to mailbox "worker-7"
+> [100030591:master:(1) 0.413207] [msg_test/INFO] Sending "Task_8" (of 10) to mailbox "worker-8"
+> [100030591:master:(1) 0.452277] [msg_test/INFO] Sending "Task_9" (of 10) to mailbox "worker-9"
+> [100030591:master:(1) 0.487205] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over.
+> [100036570:worker:(2) 0.533504] [msg_test/INFO] I'm done. See you!
+> [100041334:worker:(3) 0.590807] [msg_test/INFO] I'm done. See you!
+> [100055671:worker:(4) 0.614127] [msg_test/INFO] I'm done. See you!
+> [100066658:worker:(5) 0.654487] [msg_test/INFO] I'm done. See you!
+> [100090691:worker:(6) 0.661915] [msg_test/INFO] I'm done. See you!
+> [100094952:worker:(7) 0.794379] [msg_test/INFO] I'm done. See you!
+> [100117943:worker:(8) 0.858000] [msg_test/INFO] I'm done. See you!
+> [100126290:worker:(9) 0.900412] [msg_test/INFO] I'm done. See you!
+> [100144483:worker:(10) 0.939482] [msg_test/INFO] I'm done. See you!
+> [100152889:worker:(11) 0.974410] [msg_test/INFO] I'm done. See you!
+> [100178474:worker:(12) 0.990540] [msg_test/INFO] I'm done. See you!
+> [100180261:worker:(13) 1.011253] [msg_test/INFO] I'm done. See you!
+> [100185883:worker:(14) 1.051440] [msg_test/INFO] I'm done. See you!
+> [100186365:worker:(15) 1.268843] [msg_test/INFO] I'm done. See you!
+> [100200866:worker:(16) 1.336272] [msg_test/INFO] I'm done. See you!
+> [1.336272] [msg_test/INFO] Simulation time 1.33627

diff --git a/examples/msg/masterworker-mailbox/masterworker-mailbox-vivaldi_d.xml b/examples/msg/masterworker-mailbox/masterworker-mailbox-vivaldi_d.xml
new file mode 100644 (file)
index 0000000..a1660c0
--- /dev/null
+++ b/examples/msg/masterworker-mailbox/masterworker-mailbox-vivaldi_d.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
+  <!-- The master process (with some arguments) --> 
+  <process host="100030591" function="master">
+       <argument value="10"/>       <!-- Number of tasks -->
+       <argument value="50000000"/>  <!-- Computation size of tasks -->
+       <argument value="1000000"/>   <!-- Communication size of tasks -->
+       <argument value="15"/>         <!-- Number of workers -->
+    </process>
+    <!-- The worker processes (with mailbox to listen on as argument) -->
+    <process host="100036570" function="worker">   <argument value="0"/> </process>
+    <process host="100041334" function="worker">   <argument value="1"/> </process>
+    <process host="100055671" function="worker">   <argument value="2"/> </process>
+    <process host="100066658" function="worker">   <argument value="3"/> </process>
+    <process host="100090691" function="worker">   <argument value="4"/> </process>
+    <process host="100094952" function="worker">   <argument value="5"/> </process>
+    <process host="100117943" function="worker">   <argument value="6"/> </process>
+    <process host="100126290" function="worker">   <argument value="7"/> </process>
+    <process host="100144483" function="worker">   <argument value="8"/> </process>
+    <process host="100152889" function="worker">   <argument value="9"/> </process>
+    <process host="100178474" function="worker">   <argument value="10"/> </process>
+    <process host="100180261" function="worker">   <argument value="11"/> </process>
+    <process host="100185883" function="worker">   <argument value="12"/> </process>
+    <process host="100186365" function="worker">   <argument value="13"/> </process>
+    <process host="100200866" function="worker">   <argument value="14"/> </process>
+</platform>

diff --git a/examples/msg/masterslave-mailbox/masterslave-mailbox.c b/examples/msg/masterworker-mailbox/masterworker-mailbox.c
similarity index 85%
rename from examples/msg/masterslave-mailbox/masterslave-mailbox.c
rename to examples/msg/masterworker-mailbox/masterworker-mailbox.c
index 2002f02..e381763 100644 (file)
--- a/examples/msg/masterslave-mailbox/masterslave-mailbox.c
+++ b/examples/msg/masterworker-mailbox/masterworker-mailbox.c
@@ -13,18 +13,18 @@ static int master(int argc, char *argv[])
   long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s");
   double task_comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s");
   double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s");
   long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s");
   double task_comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s");
   double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s");

-  long slaves_count = xbt_str_parse_int(argv[4], "Invalid amount of slaves: %s");
+  long workers_count = xbt_str_parse_int(argv[4], "Invalid amount of workers: %s");

 
   int i;
 
 
   int i;
 

-  XBT_INFO("Got %ld slaves and %ld tasks to process", slaves_count, number_of_tasks);
+  XBT_INFO("Got %ld workers and %ld tasks to process", workers_count, number_of_tasks);

 
   for (i = 0; i < number_of_tasks; i++) {
     char mailbox[256];
     char sprintf_buffer[256];
     msg_task_t task = NULL;
 
 
   for (i = 0; i < number_of_tasks; i++) {
     char mailbox[256];
     char sprintf_buffer[256];
     msg_task_t task = NULL;
 

-    sprintf(mailbox, "slave-%ld", i % slaves_count);
+    sprintf(mailbox, "worker-%ld", i % workers_count);

     sprintf(sprintf_buffer, "Task_%d", i);
     task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, NULL);
     if (number_of_tasks < 10000 || i % 10000 == 0)
     sprintf(sprintf_buffer, "Task_%d", i);
     task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, NULL);
     if (number_of_tasks < 10000 || i % 10000 == 0)


@@ -34,10 +34,10 @@ static int master(int argc, char *argv[])
   }
 
   XBT_INFO("All tasks have been dispatched. Let's tell everybody the computation is over.");
   }
 
   XBT_INFO("All tasks have been dispatched. Let's tell everybody the computation is over.");

-  for (i = 0; i < slaves_count; i++) {
+  for (i = 0; i < workers_count; i++) {

     char mailbox[80];
 
     char mailbox[80];
 

-    sprintf(mailbox, "slave-%ld", i % slaves_count);
+    sprintf(mailbox, "worker-%ld", i % workers_count);

     msg_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
     MSG_task_send(finalize, mailbox);
   }
     msg_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
     MSG_task_send(finalize, mailbox);
   }


@@ -45,7 +45,7 @@ static int master(int argc, char *argv[])
   return 0;
 }
 
   return 0;
 }
 

-static int slave(int argc, char *argv[])
+static int worker(int argc, char *argv[])

 {
   msg_task_t task = NULL;
   XBT_ATTRIB_UNUSED int res;
 {
   msg_task_t task = NULL;
   XBT_ATTRIB_UNUSED int res;


@@ -54,7 +54,7 @@ static int slave(int argc, char *argv[])
 
   long id= xbt_str_parse_int(argv[1], "Invalid argument %s");
 
 
   long id= xbt_str_parse_int(argv[1], "Invalid argument %s");
 

-  sprintf(mailbox, "slave-%ld", id);
+  sprintf(mailbox, "worker-%ld", id);

 
   while (1) {
     res = MSG_task_receive(&(task), mailbox);
 
   while (1) {
     res = MSG_task_receive(&(task), mailbox);


@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
   MSG_create_environment(argv[1]);
 
   MSG_function_register("master", master);
   MSG_create_environment(argv[1]);
 
   MSG_function_register("master", master);

-  MSG_function_register("slave", slave);
+  MSG_function_register("worker", worker);

   MSG_launch_application(argv[2]);
 
   msg_error_t res = MSG_main();
   MSG_launch_application(argv[2]);
 
   msg_error_t res = MSG_main();

diff --git a/examples/msg/masterslave-mailbox/masterslave-mailbox.tesh b/examples/msg/masterworker-mailbox/masterworker-mailbox.tesh
similarity index 60%
rename from examples/msg/masterslave-mailbox/masterslave-mailbox.tesh
rename to examples/msg/masterworker-mailbox/masterworker-mailbox.tesh
index 2c86e25..ba612ee 100644 (file)
--- a/examples/msg/masterslave-mailbox/masterslave-mailbox.tesh
+++ b/examples/msg/masterworker-mailbox/masterworker-mailbox.tesh
@@ -1,65 +1,65 @@
 #! ./tesh
 
 #! ./tesh
 

-p Testing a simple master/slave example application (mailbox version)
+p Testing a simple master/worker example application (mailbox version)

 
 ! output sort 19
 
 ! output sort 19

-$ $SG_TEST_EXENV ${bindir:=.}/masterslave-mailbox$EXEEXT ${srcdir:=.}/small_platform_with_routers.xml ${srcdir:=.}/../msg/masterslave-mailbox/masterslave-mailbox_d.xml --cfg=network/crosstraffic:0 --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/masterworker-mailbox$EXEEXT ${srcdir:=.}/small_platform_with_routers.xml ${srcdir:=.}/../msg/masterworker-mailbox/masterworker-mailbox_d.xml --cfg=network/crosstraffic:0 --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0'

-> [  0.000000] (1:master@Tremblay) Got 5 slaves and 20 tasks to process
-> [  0.000000] (1:master@Tremblay) Sending "Task_0" (of 20) to mailbox "slave-0"
-> [  0.002265] (1:master@Tremblay) Sending "Task_1" (of 20) to mailbox "slave-1"
-> [  0.164270] (1:master@Tremblay) Sending "Task_2" (of 20) to mailbox "slave-2"
-> [  0.316349] (1:master@Tremblay) Sending "Task_3" (of 20) to mailbox "slave-3"
-> [  0.434977] (1:master@Tremblay) Sending "Task_4" (of 20) to mailbox "slave-4"
-> [  0.562492] (1:master@Tremblay) Sending "Task_5" (of 20) to mailbox "slave-0"
-> [  0.564757] (1:master@Tremblay) Sending "Task_6" (of 20) to mailbox "slave-1"
-> [  0.981618] (1:master@Tremblay) Sending "Task_7" (of 20) to mailbox "slave-2"
-> [  1.133696] (1:master@Tremblay) Sending "Task_8" (of 20) to mailbox "slave-3"
-> [  1.584703] (1:master@Tremblay) Sending "Task_9" (of 20) to mailbox "slave-4"
-> [  1.721105] (1:master@Tremblay) Sending "Task_10" (of 20) to mailbox "slave-0"
-> [  1.723370] (1:master@Tremblay) Sending "Task_11" (of 20) to mailbox "slave-1"
-> [  1.885375] (1:master@Tremblay) Sending "Task_12" (of 20) to mailbox "slave-2"
-> [  2.037454] (1:master@Tremblay) Sending "Task_13" (of 20) to mailbox "slave-3"
-> [  2.734429] (1:master@Tremblay) Sending "Task_14" (of 20) to mailbox "slave-4"
-> [  2.879718] (1:master@Tremblay) Sending "Task_15" (of 20) to mailbox "slave-0"
-> [  2.881983] (1:master@Tremblay) Sending "Task_16" (of 20) to mailbox "slave-1"
-> [  3.043989] (1:master@Tremblay) Sending "Task_17" (of 20) to mailbox "slave-2"
-> [  3.196067] (1:master@Tremblay) Sending "Task_18" (of 20) to mailbox "slave-3"
-> [  3.884155] (1:master@Tremblay) Sending "Task_19" (of 20) to mailbox "slave-4"
+> [  0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process
+> [  0.000000] (1:master@Tremblay) Sending "Task_0" (of 20) to mailbox "worker-0"
+> [  0.002265] (1:master@Tremblay) Sending "Task_1" (of 20) to mailbox "worker-1"
+> [  0.164270] (1:master@Tremblay) Sending "Task_2" (of 20) to mailbox "worker-2"
+> [  0.316349] (1:master@Tremblay) Sending "Task_3" (of 20) to mailbox "worker-3"
+> [  0.434977] (1:master@Tremblay) Sending "Task_4" (of 20) to mailbox "worker-4"
+> [  0.562492] (1:master@Tremblay) Sending "Task_5" (of 20) to mailbox "worker-0"
+> [  0.564757] (1:master@Tremblay) Sending "Task_6" (of 20) to mailbox "worker-1"
+> [  0.981618] (1:master@Tremblay) Sending "Task_7" (of 20) to mailbox "worker-2"
+> [  1.133696] (1:master@Tremblay) Sending "Task_8" (of 20) to mailbox "worker-3"
+> [  1.584703] (1:master@Tremblay) Sending "Task_9" (of 20) to mailbox "worker-4"
+> [  1.721105] (1:master@Tremblay) Sending "Task_10" (of 20) to mailbox "worker-0"
+> [  1.723370] (1:master@Tremblay) Sending "Task_11" (of 20) to mailbox "worker-1"
+> [  1.885375] (1:master@Tremblay) Sending "Task_12" (of 20) to mailbox "worker-2"
+> [  2.037454] (1:master@Tremblay) Sending "Task_13" (of 20) to mailbox "worker-3"
+> [  2.734429] (1:master@Tremblay) Sending "Task_14" (of 20) to mailbox "worker-4"
+> [  2.879718] (1:master@Tremblay) Sending "Task_15" (of 20) to mailbox "worker-0"
+> [  2.881983] (1:master@Tremblay) Sending "Task_16" (of 20) to mailbox "worker-1"
+> [  3.043989] (1:master@Tremblay) Sending "Task_17" (of 20) to mailbox "worker-2"
+> [  3.196067] (1:master@Tremblay) Sending "Task_18" (of 20) to mailbox "worker-3"
+> [  3.884155] (1:master@Tremblay) Sending "Task_19" (of 20) to mailbox "worker-4"

 > [  4.038331] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.
 > [  4.038331] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.

-> [  4.038526] (2:slave@Tremblay) I'm done. See you!
-> [  4.057541] (3:slave@Jupiter) I'm done. See you!
-> [  4.083249] (4:slave@Fafard) I'm done. See you!
-> [  4.931805] (5:slave@Ginette) I'm done. See you!
+> [  4.038526] (2:worker@Tremblay) I'm done. See you!
+> [  4.057541] (3:worker@Jupiter) I'm done. See you!
+> [  4.083249] (4:worker@Fafard) I'm done. See you!
+> [  4.931805] (5:worker@Ginette) I'm done. See you!

 > [  5.094868] (0:maestro@) Simulation time 5.09487
 > [  5.094868] (0:maestro@) Simulation time 5.09487

-> [  5.094868] (6:slave@Bourassa) I'm done. See you!
+> [  5.094868] (6:worker@Bourassa) I'm done. See you!

 
 

-$ $SG_TEST_EXENV ${bindir:=.}/masterslave-mailbox$EXEEXT ${srcdir:=.}/small_platform_with_routers.xml ${srcdir:=.}/../msg/masterslave-mailbox/masterslave-mailbox_d.xml --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (1:master@Tremblay) Got 5 slaves and 20 tasks to process
-> [  0.000000] (1:master@Tremblay) Sending "Task_0" (of 20) to mailbox "slave-0"
-> [  0.002265] (1:master@Tremblay) Sending "Task_1" (of 20) to mailbox "slave-1"
-> [  0.171420] (1:master@Tremblay) Sending "Task_2" (of 20) to mailbox "slave-2"
-> [  0.329817] (1:master@Tremblay) Sending "Task_3" (of 20) to mailbox "slave-3"
-> [  0.453549] (1:master@Tremblay) Sending "Task_4" (of 20) to mailbox "slave-4"
-> [  0.586168] (1:master@Tremblay) Sending "Task_5" (of 20) to mailbox "slave-0"
-> [  0.588433] (1:master@Tremblay) Sending "Task_6" (of 20) to mailbox "slave-1"
-> [  0.995917] (1:master@Tremblay) Sending "Task_7" (of 20) to mailbox "slave-2"
-> [  1.154314] (1:master@Tremblay) Sending "Task_8" (of 20) to mailbox "slave-3"
-> [  1.608379] (1:master@Tremblay) Sending "Task_9" (of 20) to mailbox "slave-4"
-> [  1.749885] (1:master@Tremblay) Sending "Task_10" (of 20) to mailbox "slave-0"
-> [  1.752150] (1:master@Tremblay) Sending "Task_11" (of 20) to mailbox "slave-1"
-> [  1.921304] (1:master@Tremblay) Sending "Task_12" (of 20) to mailbox "slave-2"
-> [  2.079701] (1:master@Tremblay) Sending "Task_13" (of 20) to mailbox "slave-3"
-> [  2.763209] (1:master@Tremblay) Sending "Task_14" (of 20) to mailbox "slave-4"
-> [  2.913601] (1:master@Tremblay) Sending "Task_15" (of 20) to mailbox "slave-0"
-> [  2.915867] (1:master@Tremblay) Sending "Task_16" (of 20) to mailbox "slave-1"
-> [  3.085021] (1:master@Tremblay) Sending "Task_17" (of 20) to mailbox "slave-2"
-> [  3.243418] (1:master@Tremblay) Sending "Task_18" (of 20) to mailbox "slave-3"
-> [  3.918038] (1:master@Tremblay) Sending "Task_19" (of 20) to mailbox "slave-4"
+$ $SG_TEST_EXENV ${bindir:=.}/masterworker-mailbox$EXEEXT ${srcdir:=.}/small_platform_with_routers.xml ${srcdir:=.}/../msg/masterworker-mailbox/masterworker-mailbox_d.xml --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process
+> [  0.000000] (1:master@Tremblay) Sending "Task_0" (of 20) to mailbox "worker-0"
+> [  0.002265] (1:master@Tremblay) Sending "Task_1" (of 20) to mailbox "worker-1"
+> [  0.171420] (1:master@Tremblay) Sending "Task_2" (of 20) to mailbox "worker-2"
+> [  0.329817] (1:master@Tremblay) Sending "Task_3" (of 20) to mailbox "worker-3"
+> [  0.453549] (1:master@Tremblay) Sending "Task_4" (of 20) to mailbox "worker-4"
+> [  0.586168] (1:master@Tremblay) Sending "Task_5" (of 20) to mailbox "worker-0"
+> [  0.588433] (1:master@Tremblay) Sending "Task_6" (of 20) to mailbox "worker-1"
+> [  0.995917] (1:master@Tremblay) Sending "Task_7" (of 20) to mailbox "worker-2"
+> [  1.154314] (1:master@Tremblay) Sending "Task_8" (of 20) to mailbox "worker-3"
+> [  1.608379] (1:master@Tremblay) Sending "Task_9" (of 20) to mailbox "worker-4"
+> [  1.749885] (1:master@Tremblay) Sending "Task_10" (of 20) to mailbox "worker-0"
+> [  1.752150] (1:master@Tremblay) Sending "Task_11" (of 20) to mailbox "worker-1"
+> [  1.921304] (1:master@Tremblay) Sending "Task_12" (of 20) to mailbox "worker-2"
+> [  2.079701] (1:master@Tremblay) Sending "Task_13" (of 20) to mailbox "worker-3"
+> [  2.763209] (1:master@Tremblay) Sending "Task_14" (of 20) to mailbox "worker-4"
+> [  2.913601] (1:master@Tremblay) Sending "Task_15" (of 20) to mailbox "worker-0"
+> [  2.915867] (1:master@Tremblay) Sending "Task_16" (of 20) to mailbox "worker-1"
+> [  3.085021] (1:master@Tremblay) Sending "Task_17" (of 20) to mailbox "worker-2"
+> [  3.243418] (1:master@Tremblay) Sending "Task_18" (of 20) to mailbox "worker-3"
+> [  3.918038] (1:master@Tremblay) Sending "Task_19" (of 20) to mailbox "worker-4"

 > [  4.077318] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.
 > [  4.077318] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.

-> [  4.077513] (2:slave@Tremblay) I'm done. See you!
-> [  4.096528] (3:slave@Jupiter) I'm done. See you!
-> [  4.122236] (4:slave@Fafard) I'm done. See you!
-> [  4.965689] (5:slave@Ginette) I'm done. See you!
-> [  5.133855] (6:slave@Bourassa) I'm done. See you!
+> [  4.077513] (2:worker@Tremblay) I'm done. See you!
+> [  4.096528] (3:worker@Jupiter) I'm done. See you!
+> [  4.122236] (4:worker@Fafard) I'm done. See you!
+> [  4.965689] (5:worker@Ginette) I'm done. See you!
+> [  5.133855] (6:worker@Bourassa) I'm done. See you!

 > [  5.133855] (0:maestro@) Simulation time 5.13386
 > [  5.133855] (0:maestro@) Simulation time 5.13386

diff --git a/examples/msg/masterworker-mailbox/masterworker-mailbox_d.xml b/examples/msg/masterworker-mailbox/masterworker-mailbox_d.xml
new file mode 100644 (file)
index 0000000..d463004
--- /dev/null
+++ b/examples/msg/masterworker-mailbox/masterworker-mailbox_d.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
+  <!-- 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="5"/>         <!-- Number of workers -->
+  </process>
+  <!-- The worker processes (with mailbox to listen on as argument) -->
+  <process host="Tremblay" function="worker">  <argument value="0"/> </process>
+  <process host="Jupiter" function="worker">   <argument value="1"/> </process>
+  <process host="Fafard" function="worker">    <argument value="2"/> </process>
+  <process host="Ginette" function="worker">   <argument value="3"/> </process>
+  <process host="Bourassa" function="worker">  <argument value="4"/> </process>
+</platform>

diff --git a/examples/msg/masterslave/masterslave.c b/examples/msg/masterworker/masterworker.c
similarity index 74%
rename from examples/msg/masterslave/masterslave.c
rename to examples/msg/masterworker/masterworker.c
index c731acd..664836a 100644 (file)
--- a/examples/msg/masterslave/masterslave.c
+++ b/examples/msg/masterworker/masterworker.c
@@ -10,8 +10,8 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example")
 
 /** @addtogroup MSG_examples
  * 
 
 /** @addtogroup MSG_examples
  * 

- *  - <b>masterslave/masterslave.c: Master/slaves example</b>. This good old example is also very simple. Its
- *    basic version is fully commented on this page: \ref MSG_ex_master_slave, but several variants can be found in the
+ *  - <b>masterworker/masterworker.c: Master/workers example</b>. This good old example is also very simple. Its
+ *    basic version is fully commented on this page: \ref MSG_ex_master_worker, but several variants can be found in the

  *    same directory.
  */
 
  *    same directory.
  */
 


@@ -19,9 +19,9 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example")
 
 static int master(int argc, char *argv[])
 {
 
 static int master(int argc, char *argv[])
 {

-  msg_host_t *slaves = NULL;
+  msg_host_t *workers = NULL;

   msg_task_t *todo = NULL;
   msg_task_t *todo = NULL;

-  long slaves_count = 0;
+  long workers_count = 0;

   int i;
 
   long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s");
   int i;
 
   long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s");


@@ -40,42 +40,42 @@ static int master(int argc, char *argv[])
   }
 
   {                             /* Process organization */
   }
 
   {                             /* Process organization */

-    slaves_count = argc - 4;
-    slaves = xbt_new0(msg_host_t, slaves_count);
+    workers_count = argc - 4;
+    workers = xbt_new0(msg_host_t, workers_count);

 
     for (i = 4; i < argc; i++) {
 
     for (i = 4; i < argc; i++) {

-      slaves[i - 4] = MSG_host_by_name(argv[i]);
-      xbt_assert(slaves[i - 4] != NULL, "Unknown host %s. Stopping Now! ", argv[i]);
+      workers[i - 4] = MSG_host_by_name(argv[i]);
+      xbt_assert(workers[i - 4] != NULL, "Unknown host %s. Stopping Now! ", argv[i]);

     }
   }
 
     }
   }
 

-  XBT_INFO("Got %ld slaves and %ld tasks to process", slaves_count, number_of_tasks);
-  for (i = 0; i < slaves_count; i++)
-    XBT_DEBUG("%s", MSG_host_get_name(slaves[i]));
+  XBT_INFO("Got %ld workers and %ld tasks to process", workers_count, number_of_tasks);
+  for (i = 0; i < workers_count; i++)
+    XBT_DEBUG("%s", MSG_host_get_name(workers[i]));

 
   for (i = 0; i < number_of_tasks; i++) {
 
   for (i = 0; i < number_of_tasks; i++) {

-    XBT_INFO("Sending \"%s\" to \"%s\"", todo[i]->name, MSG_host_get_name(slaves[i % slaves_count]));
-    if (MSG_host_self() == slaves[i % slaves_count]) {
+    XBT_INFO("Sending \"%s\" to \"%s\"", todo[i]->name, MSG_host_get_name(workers[i % workers_count]));
+    if (MSG_host_self() == workers[i % workers_count]) {

       XBT_INFO("Hey ! It's me ! :)");
     }
 
       XBT_INFO("Hey ! It's me ! :)");
     }
 

-    MSG_task_send(todo[i], MSG_host_get_name(slaves[i % slaves_count]));
+    MSG_task_send(todo[i], MSG_host_get_name(workers[i % workers_count]));

     XBT_INFO("Sent");
   }
 
   XBT_INFO("All tasks have been dispatched. Let's tell everybody the computation is over.");
     XBT_INFO("Sent");
   }
 
   XBT_INFO("All tasks have been dispatched. Let's tell everybody the computation is over.");

-  for (i = 0; i < slaves_count; i++) {
+  for (i = 0; i < workers_count; i++) {

     msg_task_t finalize = MSG_task_create("finalize", 0, 0, FINALIZE);
     msg_task_t finalize = MSG_task_create("finalize", 0, 0, FINALIZE);

-    MSG_task_send(finalize, MSG_host_get_name(slaves[i]));
+    MSG_task_send(finalize, MSG_host_get_name(workers[i]));

   }
 
   XBT_INFO("Goodbye now!");
   }
 
   XBT_INFO("Goodbye now!");

-  free(slaves);
+  free(workers);

   free(todo);
   return 0;
 }
 
   free(todo);
   return 0;
 }
 

-static int slave(int argc, char *argv[])
+static int worker(int argc, char *argv[])

 {
   msg_task_t task = NULL;
   XBT_ATTRIB_UNUSED int res;
 {
   msg_task_t task = NULL;
   XBT_ATTRIB_UNUSED int res;


@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
   MSG_create_environment(argv[1]);
 
   MSG_function_register("master", master);
   MSG_create_environment(argv[1]);
 
   MSG_function_register("master", master);

-  MSG_function_register("slave", slave);
+  MSG_function_register("worker", worker);

   MSG_launch_application(argv[2]);
 
   res = MSG_main();
   MSG_launch_application(argv[2]);
 
   res = MSG_main();

diff --git a/examples/msg/masterworker/masterworker.tesh b/examples/msg/masterworker/masterworker.tesh
new file mode 100644 (file)
index 0000000..158a2b9
--- /dev/null
+++ b/examples/msg/masterworker/masterworker.tesh
@@ -0,0 +1,247 @@
+#! ./tesh
+
+p Testing a simple master/worker example application. TCP crosstraffic DISABLED
+
+! output sort 19
+$ $SG_TEST_EXENV ${bindir:=.}/masterworker$EXEEXT ${srcdir:=.}/small_platform_with_routers.xml ${srcdir:=.}/../msg/masterworker/masterworker_d.xml --cfg=network/crosstraffic:0 --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0'
+> [  0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process
+> [  0.000000] (1:master@Tremblay) Sending "Task_0" to "Jupiter"
+> [  0.162005] (1:master@Tremblay) Sent
+> [  0.162005] (1:master@Tremblay) Sending "Task_1" to "Fafard"
+> [  0.162005] (3:worker@Jupiter) Received "Task_0"
+> [  0.162005] (3:worker@Jupiter) Processing "Task_0"
+> [  0.314083] (1:master@Tremblay) Sent
+> [  0.314083] (1:master@Tremblay) Sending "Task_2" to "Ginette"
+> [  0.314083] (4:worker@Fafard) Received "Task_1"
+> [  0.314083] (4:worker@Fafard) Processing "Task_1"
+> [  0.432712] (1:master@Tremblay) Sent
+> [  0.432712] (1:master@Tremblay) Sending "Task_3" to "Bourassa"
+> [  0.432712] (5:worker@Ginette) Received "Task_2"
+> [  0.432712] (5:worker@Ginette) Processing "Task_2"
+> [  0.560227] (1:master@Tremblay) Sent
+> [  0.560227] (1:master@Tremblay) Sending "Task_4" to "Tremblay"
+> [  0.560227] (1:master@Tremblay) Hey ! It's me ! :)
+> [  0.560227] (6:worker@Bourassa) Received "Task_3"
+> [  0.560227] (6:worker@Bourassa) Processing "Task_3"
+> [  0.562492] (1:master@Tremblay) Sent
+> [  0.562492] (1:master@Tremblay) Sending "Task_5" to "Jupiter"
+> [  0.562492] (2:worker@Tremblay) Received "Task_4"
+> [  0.562492] (2:worker@Tremblay) Processing "Task_4"
+> [  0.817347] (3:worker@Jupiter) "Task_0" done
+> [  0.969426] (4:worker@Fafard) "Task_1" done
+> [  0.979353] (1:master@Tremblay) Sent
+> [  0.979353] (1:master@Tremblay) Sending "Task_6" to "Fafard"
+> [  0.979353] (3:worker@Jupiter) Received "Task_5"
+> [  0.979353] (3:worker@Jupiter) Processing "Task_5"
+> [  1.072202] (2:worker@Tremblay) "Task_4" done
+> [  1.131431] (1:master@Tremblay) Sent
+> [  1.131431] (1:master@Tremblay) Sending "Task_7" to "Ginette"
+> [  1.131431] (4:worker@Fafard) Received "Task_6"
+> [  1.131431] (4:worker@Fafard) Processing "Task_6"
+> [  1.463809] (5:worker@Ginette) "Task_2" done
+> [  1.582438] (1:master@Tremblay) Sent
+> [  1.582438] (1:master@Tremblay) Sending "Task_8" to "Bourassa"
+> [  1.582438] (5:worker@Ginette) Received "Task_7"
+> [  1.582438] (5:worker@Ginette) Processing "Task_7"
+> [  1.591325] (6:worker@Bourassa) "Task_3" done
+> [  1.634695] (3:worker@Jupiter) "Task_5" done
+> [  1.718840] (1:master@Tremblay) Sent
+> [  1.718840] (1:master@Tremblay) Sending "Task_9" to "Tremblay"
+> [  1.718840] (1:master@Tremblay) Hey ! It's me ! :)
+> [  1.718840] (6:worker@Bourassa) Received "Task_8"
+> [  1.718840] (6:worker@Bourassa) Processing "Task_8"
+> [  1.721105] (1:master@Tremblay) Sent
+> [  1.721105] (1:master@Tremblay) Sending "Task_10" to "Jupiter"
+> [  1.721105] (2:worker@Tremblay) Received "Task_9"
+> [  1.721105] (2:worker@Tremblay) Processing "Task_9"
+> [  1.786773] (4:worker@Fafard) "Task_6" done
+> [  1.883110] (1:master@Tremblay) Sent
+> [  1.883110] (1:master@Tremblay) Sending "Task_11" to "Fafard"
+> [  1.883110] (3:worker@Jupiter) Received "Task_10"
+> [  1.883110] (3:worker@Jupiter) Processing "Task_10"
+> [  2.035188] (1:master@Tremblay) Sent
+> [  2.035188] (1:master@Tremblay) Sending "Task_12" to "Ginette"
+> [  2.035188] (4:worker@Fafard) Received "Task_11"
+> [  2.035188] (4:worker@Fafard) Processing "Task_11"
+> [  2.230815] (2:worker@Tremblay) "Task_9" done
+> [  2.538453] (3:worker@Jupiter) "Task_10" done
+> [  2.613536] (5:worker@Ginette) "Task_7" done
+> [  2.690531] (4:worker@Fafard) "Task_11" done
+> [  2.732164] (1:master@Tremblay) Sent
+> [  2.732164] (1:master@Tremblay) Sending "Task_13" to "Bourassa"
+> [  2.732164] (5:worker@Ginette) Received "Task_12"
+> [  2.732164] (5:worker@Ginette) Processing "Task_12"
+> [  2.749938] (6:worker@Bourassa) "Task_8" done
+> [  2.877453] (1:master@Tremblay) Sent
+> [  2.877453] (1:master@Tremblay) Sending "Task_14" to "Tremblay"
+> [  2.877453] (1:master@Tremblay) Hey ! It's me ! :)
+> [  2.877453] (6:worker@Bourassa) Received "Task_13"
+> [  2.877453] (6:worker@Bourassa) Processing "Task_13"
+> [  2.879718] (1:master@Tremblay) Sent
+> [  2.879718] (1:master@Tremblay) Sending "Task_15" to "Jupiter"
+> [  2.879718] (2:worker@Tremblay) Received "Task_14"
+> [  2.879718] (2:worker@Tremblay) Processing "Task_14"
+> [  3.041723] (1:master@Tremblay) Sent
+> [  3.041723] (1:master@Tremblay) Sending "Task_16" to "Fafard"
+> [  3.041723] (3:worker@Jupiter) Received "Task_15"
+> [  3.041723] (3:worker@Jupiter) Processing "Task_15"
+> [  3.193802] (1:master@Tremblay) Sent
+> [  3.193802] (1:master@Tremblay) Sending "Task_17" to "Ginette"
+> [  3.193802] (4:worker@Fafard) Received "Task_16"
+> [  3.193802] (4:worker@Fafard) Processing "Task_16"
+> [  3.389428] (2:worker@Tremblay) "Task_14" done
+> [  3.697066] (3:worker@Jupiter) "Task_15" done
+> [  3.763262] (5:worker@Ginette) "Task_12" done
+> [  3.849144] (4:worker@Fafard) "Task_16" done
+> [  3.881890] (1:master@Tremblay) Sent
+> [  3.881890] (1:master@Tremblay) Sending "Task_18" to "Bourassa"
+> [  3.881890] (5:worker@Ginette) Received "Task_17"
+> [  3.881890] (5:worker@Ginette) Processing "Task_17"
+> [  3.908551] (6:worker@Bourassa) "Task_13" done
+> [  4.036066] (1:master@Tremblay) Sent
+> [  4.036066] (1:master@Tremblay) Sending "Task_19" to "Tremblay"
+> [  4.036066] (1:master@Tremblay) Hey ! It's me ! :)
+> [  4.036066] (6:worker@Bourassa) Received "Task_18"
+> [  4.036066] (6:worker@Bourassa) Processing "Task_18"
+> [  4.038331] (1:master@Tremblay) Sent
+> [  4.038331] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.
+> [  4.038331] (2:worker@Tremblay) Received "Task_19"
+> [  4.038331] (2:worker@Tremblay) Processing "Task_19"
+> [  4.057346] (3:worker@Jupiter) Received "finalize"
+> [  4.057346] (3:worker@Jupiter) I'm done. See you!
+> [  4.083054] (4:worker@Fafard) Received "finalize"
+> [  4.083054] (4:worker@Fafard) I'm done. See you!
+> [  4.548041] (2:worker@Tremblay) "Task_19" done
+> [  4.912988] (5:worker@Ginette) "Task_17" done
+> [  4.929540] (5:worker@Ginette) Received "finalize"
+> [  4.929540] (5:worker@Ginette) I'm done. See you!
+> [  5.067164] (6:worker@Bourassa) "Task_18" done
+> [  5.092603] (6:worker@Bourassa) Received "finalize"
+> [  5.092603] (6:worker@Bourassa) I'm done. See you!
+> [  5.092798] (0:maestro@) Simulation time 5.0928
+> [  5.092798] (1:master@Tremblay) Goodbye now!
+> [  5.092798] (2:worker@Tremblay) Received "finalize"
+> [  5.092798] (2:worker@Tremblay) I'm done. See you!
+
+p Testing a simple master/worker example application. TCP crosstraffic DISABLED
+
+$ $SG_TEST_EXENV ${bindir:=.}/masterworker$EXEEXT ${srcdir:=.}/small_platform_with_routers.xml ${srcdir:=.}/../msg/masterworker/masterworker_d.xml --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process
+> [  0.000000] (1:master@Tremblay) Sending "Task_0" to "Jupiter"
+> [  0.169155] (3:worker@Jupiter) Received "Task_0"
+> [  0.169155] (3:worker@Jupiter) Processing "Task_0"
+> [  0.169155] (1:master@Tremblay) Sent
+> [  0.169155] (1:master@Tremblay) Sending "Task_1" to "Fafard"
+> [  0.327551] (4:worker@Fafard) Received "Task_1"
+> [  0.327551] (4:worker@Fafard) Processing "Task_1"
+> [  0.327551] (1:master@Tremblay) Sent
+> [  0.327551] (1:master@Tremblay) Sending "Task_2" to "Ginette"
+> [  0.451283] (5:worker@Ginette) Received "Task_2"
+> [  0.451283] (5:worker@Ginette) Processing "Task_2"
+> [  0.451283] (1:master@Tremblay) Sent
+> [  0.451283] (1:master@Tremblay) Sending "Task_3" to "Bourassa"
+> [  0.583902] (6:worker@Bourassa) Received "Task_3"
+> [  0.583902] (6:worker@Bourassa) Processing "Task_3"
+> [  0.583902] (1:master@Tremblay) Sent
+> [  0.583902] (1:master@Tremblay) Sending "Task_4" to "Tremblay"
+> [  0.583902] (1:master@Tremblay) Hey ! It's me ! :)
+> [  0.586168] (2:worker@Tremblay) Received "Task_4"
+> [  0.586168] (2:worker@Tremblay) Processing "Task_4"
+> [  0.586168] (1:master@Tremblay) Sent
+> [  0.586168] (1:master@Tremblay) Sending "Task_5" to "Jupiter"
+> [  0.824497] (3:worker@Jupiter) "Task_0" done
+> [  0.982894] (4:worker@Fafard) "Task_1" done
+> [  0.993652] (1:master@Tremblay) Sent
+> [  0.993652] (1:master@Tremblay) Sending "Task_6" to "Fafard"
+> [  0.993652] (3:worker@Jupiter) Received "Task_5"
+> [  0.993652] (3:worker@Jupiter) Processing "Task_5"
+> [  1.095878] (2:worker@Tremblay) "Task_4" done
+> [  1.152048] (4:worker@Fafard) Received "Task_6"
+> [  1.152048] (4:worker@Fafard) Processing "Task_6"
+> [  1.152048] (1:master@Tremblay) Sent
+> [  1.152048] (1:master@Tremblay) Sending "Task_7" to "Ginette"
+> [  1.482381] (5:worker@Ginette) "Task_2" done
+> [  1.606113] (1:master@Tremblay) Sent
+> [  1.606113] (1:master@Tremblay) Sending "Task_8" to "Bourassa"
+> [  1.606113] (5:worker@Ginette) Received "Task_7"
+> [  1.606113] (5:worker@Ginette) Processing "Task_7"
+> [  1.615000] (6:worker@Bourassa) "Task_3" done
+> [  1.648994] (3:worker@Jupiter) "Task_5" done
+> [  1.747619] (1:master@Tremblay) Sent
+> [  1.747619] (1:master@Tremblay) Sending "Task_9" to "Tremblay"
+> [  1.747619] (1:master@Tremblay) Hey ! It's me ! :)
+> [  1.747619] (6:worker@Bourassa) Received "Task_8"
+> [  1.747619] (6:worker@Bourassa) Processing "Task_8"
+> [  1.749885] (2:worker@Tremblay) Received "Task_9"
+> [  1.749885] (2:worker@Tremblay) Processing "Task_9"
+> [  1.749885] (1:master@Tremblay) Sent
+> [  1.749885] (1:master@Tremblay) Sending "Task_10" to "Jupiter"
+> [  1.807391] (4:worker@Fafard) "Task_6" done
+> [  1.919039] (3:worker@Jupiter) Received "Task_10"
+> [  1.919039] (3:worker@Jupiter) Processing "Task_10"
+> [  1.919039] (1:master@Tremblay) Sent
+> [  1.919039] (1:master@Tremblay) Sending "Task_11" to "Fafard"
+> [  2.077436] (4:worker@Fafard) Received "Task_11"
+> [  2.077436] (4:worker@Fafard) Processing "Task_11"
+> [  2.077436] (1:master@Tremblay) Sent
+> [  2.077436] (1:master@Tremblay) Sending "Task_12" to "Ginette"
+> [  2.259594] (2:worker@Tremblay) "Task_9" done
+> [  2.574382] (3:worker@Jupiter) "Task_10" done
+> [  2.637211] (5:worker@Ginette) "Task_7" done
+> [  2.732778] (4:worker@Fafard) "Task_11" done
+> [  2.760943] (1:master@Tremblay) Sent
+> [  2.760943] (1:master@Tremblay) Sending "Task_13" to "Bourassa"
+> [  2.760943] (5:worker@Ginette) Received "Task_12"
+> [  2.760943] (5:worker@Ginette) Processing "Task_12"
+> [  2.778717] (6:worker@Bourassa) "Task_8" done
+> [  2.911336] (1:master@Tremblay) Sent
+> [  2.911336] (1:master@Tremblay) Sending "Task_14" to "Tremblay"
+> [  2.911336] (1:master@Tremblay) Hey ! It's me ! :)
+> [  2.911336] (6:worker@Bourassa) Received "Task_13"
+> [  2.911336] (6:worker@Bourassa) Processing "Task_13"
+> [  2.913601] (2:worker@Tremblay) Received "Task_14"
+> [  2.913601] (2:worker@Tremblay) Processing "Task_14"
+> [  2.913601] (1:master@Tremblay) Sent
+> [  2.913601] (1:master@Tremblay) Sending "Task_15" to "Jupiter"
+> [  3.082756] (3:worker@Jupiter) Received "Task_15"
+> [  3.082756] (3:worker@Jupiter) Processing "Task_15"
+> [  3.082756] (1:master@Tremblay) Sent
+> [  3.082756] (1:master@Tremblay) Sending "Task_16" to "Fafard"
+> [  3.241153] (4:worker@Fafard) Received "Task_16"
+> [  3.241153] (4:worker@Fafard) Processing "Task_16"
+> [  3.241153] (1:master@Tremblay) Sent
+> [  3.241153] (1:master@Tremblay) Sending "Task_17" to "Ginette"
+> [  3.423311] (2:worker@Tremblay) "Task_14" done
+> [  3.738098] (3:worker@Jupiter) "Task_15" done
+> [  3.792041] (5:worker@Ginette) "Task_12" done
+> [  3.896495] (4:worker@Fafard) "Task_16" done
+> [  3.915773] (1:master@Tremblay) Sent
+> [  3.915773] (1:master@Tremblay) Sending "Task_18" to "Bourassa"
+> [  3.915773] (5:worker@Ginette) Received "Task_17"
+> [  3.915773] (5:worker@Ginette) Processing "Task_17"
+> [  3.942434] (6:worker@Bourassa) "Task_13" done
+> [  4.075053] (1:master@Tremblay) Sent
+> [  4.075053] (1:master@Tremblay) Sending "Task_19" to "Tremblay"
+> [  4.075053] (1:master@Tremblay) Hey ! It's me ! :)
+> [  4.075053] (6:worker@Bourassa) Received "Task_18"
+> [  4.075053] (6:worker@Bourassa) Processing "Task_18"
+> [  4.077318] (2:worker@Tremblay) Received "Task_19"
+> [  4.077318] (2:worker@Tremblay) Processing "Task_19"
+> [  4.077318] (1:master@Tremblay) Sent
+> [  4.077318] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.
+> [  4.096333] (3:worker@Jupiter) Received "finalize"
+> [  4.096333] (3:worker@Jupiter) I'm done. See you!
+> [  4.122041] (4:worker@Fafard) Received "finalize"
+> [  4.122041] (4:worker@Fafard) I'm done. See you!
+> [  4.587028] (2:worker@Tremblay) "Task_19" done
+> [  4.946871] (5:worker@Ginette) "Task_17" done
+> [  4.963423] (5:worker@Ginette) Received "finalize"
+> [  4.963423] (5:worker@Ginette) I'm done. See you!
+> [  5.106151] (6:worker@Bourassa) "Task_18" done
+> [  5.131590] (6:worker@Bourassa) Received "finalize"
+> [  5.131590] (6:worker@Bourassa) I'm done. See you!
+> [  5.131785] (2:worker@Tremblay) Received "finalize"
+> [  5.131785] (2:worker@Tremblay) I'm done. See you!
+> [  5.131785] (1:master@Tremblay) Goodbye now!
+> [  5.131785] (0:maestro@) Simulation time 5.13179

diff --git a/examples/msg/masterworker/masterworker_cpu_ti.tesh b/examples/msg/masterworker/masterworker_cpu_ti.tesh
new file mode 100644 (file)
index 0000000..ee58a96
--- /dev/null
+++ b/examples/msg/masterworker/masterworker_cpu_ti.tesh
@@ -0,0 +1,251 @@
+#! ./tesh
+
+p Testing a simple master/worker example application
+
+! output sort 19
+$ $SG_TEST_EXENV ${bindir:=.}/masterworker$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterworker/masterworker_d.xml --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
+> [  0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process
+> [  0.000000] (1:master@Tremblay) Sending "Task_0" to "Jupiter"
+> [  0.169155] (1:master@Tremblay) Sent
+> [  0.169155] (1:master@Tremblay) Sending "Task_1" to "Fafard"
+> [  0.169155] (3:worker@Jupiter) Received "Task_0"
+> [  0.169155] (3:worker@Jupiter) Processing "Task_0"
+> [  0.327551] (1:master@Tremblay) Sent
+> [  0.327551] (1:master@Tremblay) Sending "Task_2" to "Ginette"
+> [  0.327551] (4:worker@Fafard) Received "Task_1"
+> [  0.327551] (4:worker@Fafard) Processing "Task_1"
+> [  0.451283] (1:master@Tremblay) Sent
+> [  0.451283] (1:master@Tremblay) Sending "Task_3" to "Bourassa"
+> [  0.451283] (5:worker@Ginette) Received "Task_2"
+> [  0.451283] (5:worker@Ginette) Processing "Task_2"
+> [  0.583902] (1:master@Tremblay) Sent
+> [  0.583902] (1:master@Tremblay) Sending "Task_4" to "Tremblay"
+> [  0.583902] (1:master@Tremblay) Hey ! It's me ! :)
+> [  0.583902] (6:worker@Bourassa) Received "Task_3"
+> [  0.583902] (6:worker@Bourassa) Processing "Task_3"
+> [  0.586168] (1:master@Tremblay) Sent
+> [  0.586168] (1:master@Tremblay) Sending "Task_5" to "Jupiter"
+> [  0.586168] (2:worker@Tremblay) Received "Task_4"
+> [  0.586168] (2:worker@Tremblay) Processing "Task_4"
+> [  0.824497] (3:worker@Jupiter) "Task_0" done
+> [  0.982894] (4:worker@Fafard) "Task_1" done
+> [  0.993652] (1:master@Tremblay) Sent
+> [  0.993652] (1:master@Tremblay) Sending "Task_6" to "Fafard"
+> [  0.993652] (3:worker@Jupiter) Received "Task_5"
+> [  0.993652] (3:worker@Jupiter) Processing "Task_5"
+> [  1.095878] (2:worker@Tremblay) "Task_4" done
+> [  1.152048] (1:master@Tremblay) Sent
+> [  1.152048] (1:master@Tremblay) Sending "Task_7" to "Ginette"
+> [  1.152048] (4:worker@Fafard) Received "Task_6"
+> [  1.152048] (4:worker@Fafard) Processing "Task_6"
+> [  1.482381] (5:worker@Ginette) "Task_2" done
+> [  1.606113] (1:master@Tremblay) Sent
+> [  1.606113] (1:master@Tremblay) Sending "Task_8" to "Bourassa"
+> [  1.606113] (5:worker@Ginette) Received "Task_7"
+> [  1.606113] (5:worker@Ginette) Processing "Task_7"
+> [  1.615000] (6:worker@Bourassa) "Task_3" done
+> [  1.648994] (3:worker@Jupiter) "Task_5" done
+> [  1.747619] (1:master@Tremblay) Sent
+> [  1.747619] (1:master@Tremblay) Sending "Task_9" to "Tremblay"
+> [  1.747619] (1:master@Tremblay) Hey ! It's me ! :)
+> [  1.747619] (6:worker@Bourassa) Received "Task_8"
+> [  1.747619] (6:worker@Bourassa) Processing "Task_8"
+> [  1.749885] (1:master@Tremblay) Sent
+> [  1.749885] (1:master@Tremblay) Sending "Task_10" to "Jupiter"
+> [  1.749885] (2:worker@Tremblay) Received "Task_9"
+> [  1.749885] (2:worker@Tremblay) Processing "Task_9"
+> [  1.807391] (4:worker@Fafard) "Task_6" done
+> [  1.919039] (1:master@Tremblay) Sent
+> [  1.919039] (1:master@Tremblay) Sending "Task_11" to "Fafard"
+> [  1.919039] (3:worker@Jupiter) Received "Task_10"
+> [  1.919039] (3:worker@Jupiter) Processing "Task_10"
+> [  2.077436] (1:master@Tremblay) Sent
+> [  2.077436] (1:master@Tremblay) Sending "Task_12" to "Ginette"
+> [  2.077436] (4:worker@Fafard) Received "Task_11"
+> [  2.077436] (4:worker@Fafard) Processing "Task_11"
+> [  2.259594] (2:worker@Tremblay) "Task_9" done
+> [  2.574382] (3:worker@Jupiter) "Task_10" done
+> [  2.637211] (5:worker@Ginette) "Task_7" done
+> [  2.732778] (4:worker@Fafard) "Task_11" done
+> [  2.760943] (1:master@Tremblay) Sent
+> [  2.760943] (1:master@Tremblay) Sending "Task_13" to "Bourassa"
+> [  2.760943] (5:worker@Ginette) Received "Task_12"
+> [  2.760943] (5:worker@Ginette) Processing "Task_12"
+> [  2.778717] (6:worker@Bourassa) "Task_8" done
+> [  2.911336] (1:master@Tremblay) Sent
+> [  2.911336] (1:master@Tremblay) Sending "Task_14" to "Tremblay"
+> [  2.911336] (1:master@Tremblay) Hey ! It's me ! :)
+> [  2.911336] (6:worker@Bourassa) Received "Task_13"
+> [  2.911336] (6:worker@Bourassa) Processing "Task_13"
+> [  2.913601] (1:master@Tremblay) Sent
+> [  2.913601] (1:master@Tremblay) Sending "Task_15" to "Jupiter"
+> [  2.913601] (2:worker@Tremblay) Received "Task_14"
+> [  2.913601] (2:worker@Tremblay) Processing "Task_14"
+> [  3.082756] (1:master@Tremblay) Sent
+> [  3.082756] (1:master@Tremblay) Sending "Task_16" to "Fafard"
+> [  3.082756] (3:worker@Jupiter) Received "Task_15"
+> [  3.082756] (3:worker@Jupiter) Processing "Task_15"
+> [  3.241153] (1:master@Tremblay) Sent
+> [  3.241153] (1:master@Tremblay) Sending "Task_17" to "Ginette"
+> [  3.241153] (4:worker@Fafard) Received "Task_16"
+> [  3.241153] (4:worker@Fafard) Processing "Task_16"
+> [  3.423311] (2:worker@Tremblay) "Task_14" done
+> [  3.738098] (3:worker@Jupiter) "Task_15" done
+> [  3.792041] (5:worker@Ginette) "Task_12" done
+> [  3.896495] (4:worker@Fafard) "Task_16" done
+> [  3.915773] (1:master@Tremblay) Sent
+> [  3.915773] (1:master@Tremblay) Sending "Task_18" to "Bourassa"
+> [  3.915773] (5:worker@Ginette) Received "Task_17"
+> [  3.915773] (5:worker@Ginette) Processing "Task_17"
+> [  3.942434] (6:worker@Bourassa) "Task_13" done
+> [  4.075053] (1:master@Tremblay) Sent
+> [  4.075053] (1:master@Tremblay) Sending "Task_19" to "Tremblay"
+> [  4.075053] (1:master@Tremblay) Hey ! It's me ! :)
+> [  4.075053] (6:worker@Bourassa) Received "Task_18"
+> [  4.075053] (6:worker@Bourassa) Processing "Task_18"
+> [  4.077318] (1:master@Tremblay) Sent
+> [  4.077318] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.
+> [  4.077318] (2:worker@Tremblay) Received "Task_19"
+> [  4.077318] (2:worker@Tremblay) Processing "Task_19"
+> [  4.096333] (3:worker@Jupiter) Received "finalize"
+> [  4.096333] (3:worker@Jupiter) I'm done. See you!
+> [  4.122041] (4:worker@Fafard) Received "finalize"
+> [  4.122041] (4:worker@Fafard) I'm done. See you!
+> [  4.587028] (2:worker@Tremblay) "Task_19" done
+> [  4.946871] (5:worker@Ginette) "Task_17" done
+> [  4.963423] (5:worker@Ginette) Received "finalize"
+> [  4.963423] (5:worker@Ginette) I'm done. See you!
+> [  5.106151] (6:worker@Bourassa) "Task_18" done
+> [  5.131590] (6:worker@Bourassa) Received "finalize"
+> [  5.131590] (6:worker@Bourassa) I'm done. See you!
+> [  5.131785] (0:maestro@) Simulation time 5.13179
+> [  5.131785] (1:master@Tremblay) Goodbye now!
+> [  5.131785] (2:worker@Tremblay) Received "finalize"
+> [  5.131785] (2:worker@Tremblay) I'm done. See you!
+
+p Testing a simple master/worker example application
+
+! output sort 19
+$ $SG_TEST_EXENV ${bindir:=.}/masterworker$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterworker/masterworker_d.xml --cfg=network/crosstraffic:0 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0'
+> [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
+> [  0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process
+> [  0.000000] (1:master@Tremblay) Sending "Task_0" to "Jupiter"
+> [  0.165962] (1:master@Tremblay) Sent
+> [  0.165962] (1:master@Tremblay) Sending "Task_1" to "Fafard"
+> [  0.165962] (3:worker@Jupiter) Received "Task_0"
+> [  0.165962] (3:worker@Jupiter) Processing "Task_0"
+> [  0.384115] (1:master@Tremblay) Sent
+> [  0.384115] (1:master@Tremblay) Sending "Task_2" to "Ginette"
+> [  0.384115] (4:worker@Fafard) Received "Task_1"
+> [  0.384115] (4:worker@Fafard) Processing "Task_1"
+> [  0.524575] (1:master@Tremblay) Sent
+> [  0.524575] (1:master@Tremblay) Sending "Task_3" to "Bourassa"
+> [  0.524575] (5:worker@Ginette) Received "Task_2"
+> [  0.524575] (5:worker@Ginette) Processing "Task_2"
+> [  0.740447] (1:master@Tremblay) Sent
+> [  0.740447] (1:master@Tremblay) Sending "Task_4" to "Tremblay"
+> [  0.740447] (1:master@Tremblay) Hey ! It's me ! :)
+> [  0.740447] (6:worker@Bourassa) Received "Task_3"
+> [  0.740447] (6:worker@Bourassa) Processing "Task_3"
+> [  0.742786] (1:master@Tremblay) Sent
+> [  0.742786] (1:master@Tremblay) Sending "Task_5" to "Jupiter"
+> [  0.742786] (2:worker@Tremblay) Received "Task_4"
+> [  0.742786] (2:worker@Tremblay) Processing "Task_4"
+> [  0.821304] (3:worker@Jupiter) "Task_0" done
+> [  0.987266] (1:master@Tremblay) Sent
+> [  0.987266] (1:master@Tremblay) Sending "Task_6" to "Fafard"
+> [  0.987266] (3:worker@Jupiter) Received "Task_5"
+> [  0.987266] (3:worker@Jupiter) Processing "Task_5"
+> [  1.039457] (4:worker@Fafard) "Task_1" done
+> [  1.252495] (2:worker@Tremblay) "Task_4" done
+> [  1.257610] (1:master@Tremblay) Sent
+> [  1.257610] (1:master@Tremblay) Sending "Task_7" to "Ginette"
+> [  1.257610] (4:worker@Fafard) Received "Task_6"
+> [  1.257610] (4:worker@Fafard) Processing "Task_6"
+> [  1.555672] (5:worker@Ginette) "Task_2" done
+> [  1.642608] (3:worker@Jupiter) "Task_5" done
+> [  1.696132] (1:master@Tremblay) Sent
+> [  1.696132] (1:master@Tremblay) Sending "Task_8" to "Bourassa"
+> [  1.696132] (5:worker@Ginette) Received "Task_7"
+> [  1.696132] (5:worker@Ginette) Processing "Task_7"
+> [  1.771545] (6:worker@Bourassa) "Task_3" done
+> [  1.912953] (4:worker@Fafard) "Task_6" done
+> [  1.987417] (1:master@Tremblay) Sent
+> [  1.987417] (1:master@Tremblay) Sending "Task_9" to "Tremblay"
+> [  1.987417] (1:master@Tremblay) Hey ! It's me ! :)
+> [  1.987417] (6:worker@Bourassa) Received "Task_8"
+> [  1.987417] (6:worker@Bourassa) Processing "Task_8"
+> [  1.989756] (1:master@Tremblay) Sent
+> [  1.989756] (1:master@Tremblay) Sending "Task_10" to "Jupiter"
+> [  1.989756] (2:worker@Tremblay) Received "Task_9"
+> [  1.989756] (2:worker@Tremblay) Processing "Task_9"
+> [  2.155718] (1:master@Tremblay) Sent
+> [  2.155718] (1:master@Tremblay) Sending "Task_11" to "Fafard"
+> [  2.155718] (3:worker@Jupiter) Received "Task_10"
+> [  2.155718] (3:worker@Jupiter) Processing "Task_10"
+> [  2.373871] (1:master@Tremblay) Sent
+> [  2.373871] (1:master@Tremblay) Sending "Task_12" to "Ginette"
+> [  2.373871] (4:worker@Fafard) Received "Task_11"
+> [  2.373871] (4:worker@Fafard) Processing "Task_11"
+> [  2.499466] (2:worker@Tremblay) "Task_9" done
+> [  2.727230] (5:worker@Ginette) "Task_7" done
+> [  2.811060] (3:worker@Jupiter) "Task_10" done
+> [  2.867690] (1:master@Tremblay) Sent
+> [  2.867690] (1:master@Tremblay) Sending "Task_13" to "Bourassa"
+> [  2.867690] (5:worker@Ginette) Received "Task_12"
+> [  2.867690] (5:worker@Ginette) Processing "Task_12"
+> [  3.018515] (6:worker@Bourassa) "Task_8" done
+> [  3.029213] (4:worker@Fafard) "Task_11" done
+> [  3.234387] (1:master@Tremblay) Sent
+> [  3.234387] (1:master@Tremblay) Sending "Task_14" to "Tremblay"
+> [  3.234387] (1:master@Tremblay) Hey ! It's me ! :)
+> [  3.234387] (6:worker@Bourassa) Received "Task_13"
+> [  3.234387] (6:worker@Bourassa) Processing "Task_13"
+> [  3.236726] (1:master@Tremblay) Sent
+> [  3.236726] (1:master@Tremblay) Sending "Task_15" to "Jupiter"
+> [  3.236726] (2:worker@Tremblay) Received "Task_14"
+> [  3.236726] (2:worker@Tremblay) Processing "Task_14"
+> [  3.402688] (1:master@Tremblay) Sent
+> [  3.402688] (1:master@Tremblay) Sending "Task_16" to "Fafard"
+> [  3.402688] (3:worker@Jupiter) Received "Task_15"
+> [  3.402688] (3:worker@Jupiter) Processing "Task_15"
+> [  3.620841] (1:master@Tremblay) Sent
+> [  3.620841] (1:master@Tremblay) Sending "Task_17" to "Ginette"
+> [  3.620841] (4:worker@Fafard) Received "Task_16"
+> [  3.620841] (4:worker@Fafard) Processing "Task_16"
+> [  3.746436] (2:worker@Tremblay) "Task_14" done
+> [  3.898788] (5:worker@Ginette) "Task_12" done
+> [  4.039247] (1:master@Tremblay) Sent
+> [  4.039247] (1:master@Tremblay) Sending "Task_18" to "Bourassa"
+> [  4.039247] (5:worker@Ginette) Received "Task_17"
+> [  4.039247] (5:worker@Ginette) Processing "Task_17"
+> [  4.058030] (3:worker@Jupiter) "Task_15" done
+> [  4.265485] (6:worker@Bourassa) "Task_13" done
+> [  4.276183] (4:worker@Fafard) "Task_16" done
+> [  4.481357] (1:master@Tremblay) Sent
+> [  4.481357] (1:master@Tremblay) Sending "Task_19" to "Tremblay"
+> [  4.481357] (1:master@Tremblay) Hey ! It's me ! :)
+> [  4.481357] (6:worker@Bourassa) Received "Task_18"
+> [  4.481357] (6:worker@Bourassa) Processing "Task_18"
+> [  4.483696] (1:master@Tremblay) Sent
+> [  4.483696] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.
+> [  4.483696] (2:worker@Tremblay) Received "Task_19"
+> [  4.483696] (2:worker@Tremblay) Processing "Task_19"
+> [  4.498896] (3:worker@Jupiter) Received "finalize"
+> [  4.498896] (3:worker@Jupiter) I'm done. See you!
+> [  4.519447] (4:worker@Fafard) Received "finalize"
+> [  4.519447] (4:worker@Fafard) I'm done. See you!
+> [  4.993406] (2:worker@Tremblay) "Task_19" done
+> [  5.070345] (5:worker@Ginette) "Task_17" done
+> [  5.083577] (5:worker@Ginette) Received "finalize"
+> [  5.083577] (5:worker@Ginette) I'm done. See you!
+> [  5.512455] (6:worker@Bourassa) "Task_18" done
+> [  5.532791] (6:worker@Bourassa) Received "finalize"
+> [  5.532791] (6:worker@Bourassa) I'm done. See you!
+> [  5.532947] (0:maestro@) Simulation time 5.53295
+> [  5.532947] (1:master@Tremblay) Goodbye now!
+> [  5.532947] (2:worker@Tremblay) Received "finalize"
+> [  5.532947] (2:worker@Tremblay) I'm done. See you!
+

diff --git a/examples/msg/masterworker/masterworker_d.xml b/examples/msg/masterworker/masterworker_d.xml
new file mode 100644 (file)
index 0000000..4746b97
--- /dev/null
+++ b/examples/msg/masterworker/masterworker_d.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
+  <!-- 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 worker -->
+     <argument value="Fafard"/>   <!-- Second worker -->
+     <argument value="Ginette"/>  <!-- Third worker -->
+     <argument value="Bourassa"/> <!-- Last worker -->
+     <argument value="Tremblay"/> <!-- Me! I can work too! -->
+  </process>
+  <!-- The worker process (with no argument) -->
+  <process host="Tremblay" function="worker" on_failure="RESTART"/>
+  <process host="Jupiter" function="worker" on_failure="RESTART"/>
+  <process host="Fafard" function="worker" on_failure="RESTART"/>
+  <process host="Ginette" function="worker" on_failure="RESTART"/>
+  <process host="Bourassa" function="worker" on_failure="RESTART"/>
+</platform>

diff --git a/examples/msg/ns3/3hosts_2links_d.xml b/examples/msg/ns3/3hosts_2links_d.xml
index 915c5c8..661289a 100644 (file)
--- a/examples/msg/ns3/3hosts_2links_d.xml
+++ b/examples/msg/ns3/3hosts_2links_d.xml
@@ -6,7 +6,7 @@
       <argument value="Jupiter"/>
       <argument value="1"/>
   </process>
       <argument value="Jupiter"/>
       <argument value="1"/>
   </process>

-  <process host="Jupiter" function="slave">
+  <process host="Jupiter" function="worker">

     <argument value="1"/>
   </process>
 </platform>
     <argument value="1"/>
   </process>
 </platform>

diff --git a/examples/msg/ns3/3links-timer_d.xml b/examples/msg/ns3/3links-timer_d.xml
index ee686fd..b74c49c 100644 (file)
--- a/examples/msg/ns3/3links-timer_d.xml
+++ b/examples/msg/ns3/3links-timer_d.xml
@@ -6,7 +6,7 @@
       <argument value="Jupiter"/>
       <argument value="1"/>
   </process>
       <argument value="Jupiter"/>
       <argument value="1"/>
   </process>

-  <process host="Jupiter" function="slave">
+  <process host="Jupiter" function="worker">

     <argument value="1"/>
   </process>
   <process host="Fafard" function="master">
     <argument value="1"/>
   </process>
   <process host="Fafard" function="master">


@@ -14,7 +14,7 @@
       <argument value="Ginette"/>
       <argument value="2"/>
   </process>
       <argument value="Ginette"/>
       <argument value="2"/>
   </process>

-  <process host="Ginette" function="slave">
+  <process host="Ginette" function="worker">

     <argument value="2"/>
   </process>
   <process host="Bourassa" function="master">
     <argument value="2"/>
   </process>
   <process host="Bourassa" function="master">


@@ -22,7 +22,7 @@
       <argument value="Lovelace"/>
       <argument value="3"/>
   </process>
       <argument value="Lovelace"/>
       <argument value="3"/>
   </process>

-  <process host="Lovelace" function="slave">
+  <process host="Lovelace" function="worker">

     <argument value="3"/>
   </process>
   <process host="Bourassa" function="master" start_time="2.0">
     <argument value="3"/>
   </process>
   <process host="Bourassa" function="master" start_time="2.0">


@@ -30,7 +30,7 @@
       <argument value="Lovelace"/>
       <argument value="4"/>
   </process>
       <argument value="Lovelace"/>
       <argument value="4"/>
   </process>

-  <process host="Lovelace" function="slave">
+  <process host="Lovelace" function="worker">

     <argument value="4"/>
   </process>
   <process host="Lovelace" function="timer">
     <argument value="4"/>
   </process>
   <process host="Lovelace" function="timer">

diff --git a/examples/msg/ns3/3links_d.xml b/examples/msg/ns3/3links_d.xml
index 41da034..2aa4d11 100644 (file)
--- a/examples/msg/ns3/3links_d.xml
+++ b/examples/msg/ns3/3links_d.xml
@@ -6,7 +6,7 @@
       <argument value="Jupiter"/>
       <argument value="1"/>
   </process>
       <argument value="Jupiter"/>
       <argument value="1"/>
   </process>

-  <process host="Jupiter" function="slave">
+  <process host="Jupiter" function="worker">

     <argument value="1"/>
   </process>
   <process host="Fafard" function="master">
     <argument value="1"/>
   </process>
   <process host="Fafard" function="master">


@@ -14,7 +14,7 @@
       <argument value="Ginette"/>
       <argument value="2"/>
   </process>
       <argument value="Ginette"/>
       <argument value="2"/>
   </process>

-  <process host="Ginette" function="slave">
+  <process host="Ginette" function="worker">

     <argument value="2"/>
   </process>
   <process host="Bourassa" function="master">
     <argument value="2"/>
   </process>
   <process host="Bourassa" function="master">


@@ -22,7 +22,7 @@
       <argument value="Lovelace"/>
       <argument value="3"/>
   </process>
       <argument value="Lovelace"/>
       <argument value="3"/>
   </process>

-  <process host="Lovelace" function="slave">
+  <process host="Lovelace" function="worker">

     <argument value="3"/>
   </process>
 </platform>
     <argument value="3"/>
   </process>
 </platform>

diff --git a/examples/msg/ns3/crosstraffic_d.xml b/examples/msg/ns3/crosstraffic_d.xml
index 212bca5..95d99dd 100644 (file)
--- a/examples/msg/ns3/crosstraffic_d.xml
+++ b/examples/msg/ns3/crosstraffic_d.xml
@@ -6,7 +6,7 @@
       <argument value="C1"/>
       <argument value="1"/>
   </process>
       <argument value="C1"/>
       <argument value="1"/>
   </process>

-  <process host="C1" function="slave">
+  <process host="C1" function="worker">

     <argument value="1"/>
   </process>
   <process host="S1" function="master">
     <argument value="1"/>
   </process>
   <process host="S1" function="master">


@@ -14,7 +14,7 @@
       <argument value="C1"/>
       <argument value="2"/>
   </process>
       <argument value="C1"/>
       <argument value="2"/>
   </process>

-  <process host="C1" function="slave">
+  <process host="C1" function="worker">

     <argument value="2"/>
   </process>
   <process host="S1" function="master">
     <argument value="2"/>
   </process>
   <process host="S1" function="master">


@@ -22,7 +22,7 @@
       <argument value="C1"/>
       <argument value="3"/>
   </process>
       <argument value="C1"/>
       <argument value="3"/>
   </process>

-  <process host="C1" function="slave">
+  <process host="C1" function="worker">

     <argument value="3"/>
   </process>
   <process host="C1" function="master">
     <argument value="3"/>
   </process>
   <process host="C1" function="master">


@@ -30,7 +30,7 @@
       <argument value="S1"/>
       <argument value="4"/>
   </process>
       <argument value="S1"/>
       <argument value="4"/>
   </process>

-  <process host="S1" function="slave">
+  <process host="S1" function="worker">

     <argument value="4"/>
   </process>
 </platform>
     <argument value="4"/>
   </process>
 </platform>

diff --git a/examples/msg/ns3/dogbone_d.xml b/examples/msg/ns3/dogbone_d.xml
index 0fd2359..4288e63 100644 (file)
--- a/examples/msg/ns3/dogbone_d.xml
+++ b/examples/msg/ns3/dogbone_d.xml
@@ -11,10 +11,10 @@
       <argument value="C2"/>
       <argument value="1"/>
   </process>
       <argument value="C2"/>
       <argument value="1"/>
   </process>

-  <process host="C1" function="slave">
+  <process host="C1" function="worker">

       <argument value="0"/>
   </process>
       <argument value="0"/>
   </process>

-  <process host="C2" function="slave">
+  <process host="C2" function="worker">

       <argument value="1"/>
   </process>
 </platform>
       <argument value="1"/>
   </process>
 </platform>

diff --git a/examples/msg/ns3/ns3.c b/examples/msg/ns3/ns3.c
index 9a8df98..9c2ecf7 100644 (file)
--- a/examples/msg/ns3/ns3.c
+++ b/examples/msg/ns3/ns3.c
@@ -30,7 +30,7 @@ int bool_printed = 0;
 double start_time, end_time, elapsed_time;
 double gl_data_size[NTASKS];
 msg_task_t gl_task_array[NTASKS];
 double start_time, end_time, elapsed_time;
 double gl_data_size[NTASKS];
 msg_task_t gl_task_array[NTASKS];

-const char *slavenames[NTASKS];
+const char *workernames[NTASKS];

 const char *masternames[NTASKS];
 int gl_task_array_id = 0;
 int count_finished = 0;
 const char *masternames[NTASKS];
 int gl_task_array_id = 0;
 int count_finished = 0;


@@ -48,11 +48,11 @@ static int master(int argc, char *argv[])
   /* data size */
   double task_comm_size = xbt_str_parse_double(argv[1], "Invalid task communication size: %s");
 
   /* data size */
   double task_comm_size = xbt_str_parse_double(argv[1], "Invalid task communication size: %s");
 

-  /* slave name */
-  char *slavename = argv[2];
+  /* worker name */
+  char *workername = argv[2];

   int id = xbt_str_parse_int(argv[3], "Invalid ID as argument 3: %s");   //unique id to control statistics
   char *id_alias = bprintf("flow_%d", id);
   int id = xbt_str_parse_int(argv[3], "Invalid ID as argument 3: %s");   //unique id to control statistics
   char *id_alias = bprintf("flow_%d", id);

-  slavenames[id] = slavename;
+  workernames[id] = workername;

   TRACE_category(id_alias);
 
   masternames[id] = MSG_host_get_name(MSG_host_self());
   TRACE_category(id_alias);
 
   masternames[id] = MSG_host_get_name(MSG_host_self());


@@ -65,7 +65,7 @@ static int master(int argc, char *argv[])
     gl_data_size[id] = task_comm_size;
   }
 
     gl_data_size[id] = task_comm_size;
   }
 

-  MSG_host_by_name(slavename);
+  MSG_host_by_name(workername);

 
   count_finished++;
   timer_start = 1 ;
 
   count_finished++;
   timer_start = 1 ;


@@ -106,14 +106,14 @@ static int timer(int argc, char *argv[])
   return 0;
 }
 
   return 0;
 }
 

-static int slave(int argc, char *argv[])
+static int worker(int argc, char *argv[])

 {
   msg_task_t task = NULL;
   char id_alias[10];
 
   xbt_assert(argc==2,"Strange number of arguments expected 1 got %d", argc - 1);
 
 {
   msg_task_t task = NULL;
   char id_alias[10];
 
   xbt_assert(argc==2,"Strange number of arguments expected 1 got %d", argc - 1);
 

-  XBT_DEBUG ("Slave started");
+  XBT_DEBUG ("Worker started");

 
   int id = xbt_str_parse_int(argv[1], "Invalid id: %s");
   sprintf(id_alias, "%d", id);
 
   int id = xbt_str_parse_int(argv[1], "Invalid id: %s");
   sprintf(id_alias, "%d", id);


@@ -130,7 +130,7 @@ static int slave(int argc, char *argv[])
   elapsed_time = MSG_get_clock() - start_time;
 
   XBT_INFO("FLOW[%d] : Receive %.0f bytes from %s to %s", id, MSG_task_get_bytes_amount(task), masternames[id],
   elapsed_time = MSG_get_clock() - start_time;
 
   XBT_INFO("FLOW[%d] : Receive %.0f bytes from %s to %s", id, MSG_task_get_bytes_amount(task), masternames[id],

-           slavenames[id]);
+           workernames[id]);

 //  MSG_task_execute(task);
   MSG_task_destroy(task);
 
 //  MSG_task_execute(task);
   MSG_task_destroy(task);
 


@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
   TRACE_declare_mark("endmark");
 
   MSG_function_register("master", master);
   TRACE_declare_mark("endmark");
 
   MSG_function_register("master", master);

-  MSG_function_register("slave", slave);
+  MSG_function_register("worker", worker);

   MSG_function_register("timer", timer);
 
   MSG_launch_application(argv[2]);
   MSG_function_register("timer", timer);
 
   MSG_launch_application(argv[2]);

diff --git a/examples/msg/ns3/ns3.tesh b/examples/msg/ns3/ns3.tesh
index 50c83db..869ec46 100644 (file)
--- a/examples/msg/ns3/ns3.tesh
+++ b/examples/msg/ns3/ns3.tesh
@@ -7,65 +7,65 @@ p 3hosts 2links
 
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/ns3/3hosts_2links_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/ns3/3hosts_2links_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'

-> [Jupiter:slave(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from Tremblay to Jupiter
+> [Jupiter:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from Tremblay to Jupiter

 
 p 6hosts 3links
 
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/ns3/3links_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 
 p 6hosts 3links
 
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/ns3/3links_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'

-> [Jupiter:slave(2)] [msg_test/INFO] FLOW[1] : Receive 100000 bytes from Tremblay to Jupiter
-> [Ginette:slave(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from Fafard to Ginette
-> [Lovelace:slave(6)] [msg_test/INFO] FLOW[3] : Receive 2000000 bytes from Bourassa to Lovelace
+> [Jupiter:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100000 bytes from Tremblay to Jupiter
+> [Ginette:worker(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from Fafard to Ginette
+> [Lovelace:worker(6)] [msg_test/INFO] FLOW[3] : Receive 2000000 bytes from Bourassa to Lovelace

 
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/ns3/3links-timer_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/small_platform_one_link_routes.xml ${srcdir:=.}/examples/msg/ns3/3links-timer_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'

-> [Jupiter:slave(2)] [msg_test/INFO] FLOW[1] : Receive 100000 bytes from Tremblay to Jupiter
-> [Ginette:slave(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from Fafard to Ginette
-> [Lovelace:slave(6)] [msg_test/INFO] FLOW[3] : Receive 2000000 bytes from Bourassa to Lovelace
-> [Lovelace:slave(7)] [msg_test/INFO] FLOW[4] : Receive 2000000 bytes from Bourassa to Lovelace
+> [Jupiter:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100000 bytes from Tremblay to Jupiter
+> [Ginette:worker(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from Fafard to Ginette
+> [Lovelace:worker(6)] [msg_test/INFO] FLOW[3] : Receive 2000000 bytes from Bourassa to Lovelace
+> [Lovelace:worker(7)] [msg_test/INFO] FLOW[4] : Receive 2000000 bytes from Bourassa to Lovelace

 
 p One cluster
 
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/ns3/one_cluster_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 
 p One cluster
 
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/ns3/one_cluster_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'

-> [node-6.acme.org:slave(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from node-2.acme.org to node-6.acme.org
+> [node-6.acme.org:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from node-2.acme.org to node-6.acme.org

 
 p Two clusters
 
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/clusters_routing_full.xml ${srcdir:=.}/examples/msg/ns3/two_clusters_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 
 p Two clusters
 
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/clusters_routing_full.xml ${srcdir:=.}/examples/msg/ns3/two_clusters_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'

-> [node-16.acme.org:slave(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from node-3.acme.org to node-16.acme.org
+> [node-16.acme.org:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from node-3.acme.org to node-16.acme.org

 
 p Dogbone
 
 ! timeout 10
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/dogbone.xml ${srcdir:=.}/examples/msg/ns3/dogbone_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 
 p Dogbone
 
 ! timeout 10
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/dogbone.xml ${srcdir:=.}/examples/msg/ns3/dogbone_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'

-> [C1:slave(3)] [msg_test/INFO] FLOW[0] : Receive 20000000 bytes from S1 to C1
-> [C2:slave(4)] [msg_test/INFO] FLOW[1] : Receive 20000000 bytes from S2 to C2
+> [C1:worker(3)] [msg_test/INFO] FLOW[0] : Receive 20000000 bytes from S1 to C1
+> [C2:worker(4)] [msg_test/INFO] FLOW[1] : Receive 20000000 bytes from S2 to C2

 
 p 2hosts 1link
 
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/onelink.xml ${srcdir:=.}/examples/msg/ns3/onelink_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 
 p 2hosts 1link
 
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/onelink.xml ${srcdir:=.}/examples/msg/ns3/onelink_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'

-> [C1:slave(2)] [msg_test/INFO] FLOW[1] : Receive 1000000 bytes from S1 to C1
+> [C1:worker(2)] [msg_test/INFO] FLOW[1] : Receive 1000000 bytes from S1 to C1

 
 p Crosstraffic TCP option DISABLED
 
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/crosstraffic.xml ${srcdir:=.}/examples/msg/ns3/crosstraffic_d.xml --cfg=network/model:NS3 --cfg=network/crosstraffic:0 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/crosstraffic' to '0'
 
 p Crosstraffic TCP option DISABLED
 
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/crosstraffic.xml ${srcdir:=.}/examples/msg/ns3/crosstraffic_d.xml --cfg=network/model:NS3 --cfg=network/crosstraffic:0 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/crosstraffic' to '0'

-> [C1:slave(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from S1 to C1
-> [C1:slave(2)] [msg_test/INFO] FLOW[1] : Receive 1000000 bytes from S1 to C1
-> [C1:slave(6)] [msg_test/INFO] FLOW[3] : Receive 1000000 bytes from S1 to C1
-> [S1:slave(8)] [msg_test/INFO] FLOW[4] : Receive 1000000 bytes from C1 to S1
+> [C1:worker(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from S1 to C1
+> [C1:worker(2)] [msg_test/INFO] FLOW[1] : Receive 1000000 bytes from S1 to C1
+> [C1:worker(6)] [msg_test/INFO] FLOW[3] : Receive 1000000 bytes from S1 to C1
+> [S1:worker(8)] [msg_test/INFO] FLOW[4] : Receive 1000000 bytes from C1 to S1

 
 p Crosstraffic TCP option ENABLED
 
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/crosstraffic.xml ${srcdir:=.}/examples/msg/ns3/crosstraffic_d.xml --cfg=network/model:NS3 --cfg=network/crosstraffic:1 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/crosstraffic' to '1'
 
 p Crosstraffic TCP option ENABLED
 
 $ ns3/ns3 ${srcdir:=.}/examples/platforms/crosstraffic.xml ${srcdir:=.}/examples/msg/ns3/crosstraffic_d.xml --cfg=network/model:NS3 --cfg=network/crosstraffic:1 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/crosstraffic' to '1'

-> [C1:slave(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from S1 to C1
-> [C1:slave(2)] [msg_test/INFO] FLOW[1] : Receive 1000000 bytes from S1 to C1
-> [C1:slave(6)] [msg_test/INFO] FLOW[3] : Receive 1000000 bytes from S1 to C1
-> [S1:slave(8)] [msg_test/INFO] FLOW[4] : Receive 1000000 bytes from C1 to S1
+> [C1:worker(4)] [msg_test/INFO] FLOW[2] : Receive 1000000 bytes from S1 to C1
+> [C1:worker(2)] [msg_test/INFO] FLOW[1] : Receive 1000000 bytes from S1 to C1
+> [C1:worker(6)] [msg_test/INFO] FLOW[3] : Receive 1000000 bytes from S1 to C1
+> [S1:worker(8)] [msg_test/INFO] FLOW[4] : Receive 1000000 bytes from C1 to S1

diff --git a/examples/msg/ns3/one_cluster_d.xml b/examples/msg/ns3/one_cluster_d.xml
index 98102d2..9c3dd43 100644 (file)
--- a/examples/msg/ns3/one_cluster_d.xml
+++ b/examples/msg/ns3/one_cluster_d.xml
@@ -6,7 +6,7 @@
       <argument value="node-6.acme.org"/>
       <argument value="1"/>
   </process>
       <argument value="node-6.acme.org"/>
       <argument value="1"/>
   </process>

-  <process host="node-6.acme.org" function="slave">
+  <process host="node-6.acme.org" function="worker">

     <argument value="1"/>
   </process>
 </platform>
     <argument value="1"/>
   </process>
 </platform>

diff --git a/examples/msg/ns3/onelink_d.xml b/examples/msg/ns3/onelink_d.xml
index a3450be..39113f5 100644 (file)
--- a/examples/msg/ns3/onelink_d.xml
+++ b/examples/msg/ns3/onelink_d.xml
@@ -6,7 +6,7 @@
       <argument value="C1"/>
       <argument value="1"/>
   </process>
       <argument value="C1"/>
       <argument value="1"/>
   </process>

-  <process host="C1" function="slave">
+  <process host="C1" function="worker">

     <argument value="1"/>
   </process>
 </platform>
     <argument value="1"/>
   </process>
 </platform>

diff --git a/examples/msg/ns3/two_clusters_d.xml b/examples/msg/ns3/two_clusters_d.xml
index 81d1aef..99f2583 100644 (file)
--- a/examples/msg/ns3/two_clusters_d.xml
+++ b/examples/msg/ns3/two_clusters_d.xml
@@ -6,7 +6,7 @@
       <argument value="node-16.acme.org"/>
       <argument value="1"/>
   </process>
       <argument value="node-16.acme.org"/>
       <argument value="1"/>
   </process>

-  <process host="node-16.acme.org" function="slave">
+  <process host="node-16.acme.org" function="worker">

     <argument value="1"/>
   </process>
 </platform>
     <argument value="1"/>
   </process>
 </platform>

diff --git a/examples/msg/task-priority/task-priority.tesh b/examples/msg/task-priority/task-priority.tesh
index 9c7cb85..57fe178 100644 (file)
--- a/examples/msg/task-priority/task-priority.tesh
+++ b/examples/msg/task-priority/task-priority.tesh
@@ -1,7 +1,5 @@
 #! ./tesh
 
 #! ./tesh
 

-p Testing a simple master/slave example application
-

 ! output sort 19
 $ $SG_TEST_EXENV ${bindir:=.}/task-priority$EXEEXT ${srcdir:=.}/small_platform.xml  ${srcdir:=.}/../msg/task-priority/task-priority_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:test@Fafard) Hello! Running a task of size 7.6296e+07 with priority 1
 ! output sort 19
 $ $SG_TEST_EXENV ${bindir:=.}/task-priority$EXEEXT ${srcdir:=.}/small_platform.xml  ${srcdir:=.}/../msg/task-priority/task-priority_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:test@Fafard) Hello! Running a task of size 7.6296e+07 with priority 1

diff --git a/examples/msg/token_ring/token_ring.c b/examples/msg/token_ring/token_ring.c
index bc270cd..4dc5d71 100644 (file)
--- a/examples/msg/token_ring/token_ring.c
+++ b/examples/msg/token_ring/token_ring.c
@@ -25,7 +25,7 @@ static int host(int argc, char *argv[])
   char mailbox[256];
   msg_task_t task = NULL;
   XBT_ATTRIB_UNUSED int res;
   char mailbox[256];
   msg_task_t task = NULL;
   XBT_ATTRIB_UNUSED int res;

-  if (host_number == 0){ //master  send then receive
+  if (host_number == 0){ //root: send then receive

     sprintf(mailbox, "%d", host_number+1);
     task = MSG_task_create("Token", task_comp_size, task_comm_size, NULL);
     XBT_INFO("Host \"%d\" send '%s' to Host \"%s\"",host_number,task->name,mailbox);
     sprintf(mailbox, "%d", host_number+1);
     task = MSG_task_create("Token", task_comp_size, task_comm_size, NULL);
     XBT_INFO("Host \"%d\" send '%s' to Host \"%s\"",host_number,task->name,mailbox);


@@ -35,7 +35,7 @@ static int host(int argc, char *argv[])
     xbt_assert(res == MSG_OK, "MSG_task_get failed");
     XBT_INFO("Host \"%d\" received \"%s\"",host_number, MSG_task_get_name(task));
     MSG_task_destroy(task);
     xbt_assert(res == MSG_OK, "MSG_task_get failed");
     XBT_INFO("Host \"%d\" received \"%s\"",host_number, MSG_task_get_name(task));
     MSG_task_destroy(task);

-  } else{ //slave receive then send
+  } else{ // receive then send

     res = MSG_task_receive(&(task), MSG_process_get_name(MSG_process_self()));
     xbt_assert(res == MSG_OK, "MSG_task_get failed");
     XBT_INFO("Host \"%d\" received \"%s\"",host_number, MSG_task_get_name(task));
     res = MSG_task_receive(&(task), MSG_process_get_name(MSG_process_self()));
     xbt_assert(res == MSG_OK, "MSG_task_get failed");
     XBT_INFO("Host \"%d\" received \"%s\"",host_number, MSG_task_get_name(task));

diff --git a/examples/msg/trace-categories/trace-categories.c b/examples/msg/trace-categories/trace-categories.c
index acc12b3..704ddc1 100644 (file)
--- a/examples/msg/trace-categories/trace-categories.c
+++ b/examples/msg/trace-categories/trace-categories.c
@@ -6,8 +6,8 @@
 
 /** @addtogroup MSG_examples
  * 
 
 /** @addtogroup MSG_examples
  * 

- * - <b>tracing/categories.c</b> This is a master/slave program where the master creates tasks, send them to the slaves.
- * For each task received, the slave executes it and then destroys it. This program declares several tracing categories
+ * - <b>tracing/categories.c</b> This is a master/worker program. The master creates tasks and send them to workers.
+ * For each task received, the worker executes it and then destroys it. This program declares several tracing categories

  * that are used to classify tasks. When the program is executed, the tracing mechanism registers the resource
  * utilization of hosts and links according to these categories. You might want to run this program with the following
  * parameters:
  * that are used to classify tasks. When the program is executed, the tracing mechanism registers the resource
  * utilization of hosts and links according to these categories. You might want to run this program with the following
  * parameters:


@@ -24,7 +24,7 @@
 static int master(int argc, char *argv[])
 {
   long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s");
 static int master(int argc, char *argv[])
 {
   long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s");

-  long slaves_count = xbt_str_parse_int(argv[4], "Invalid amount of slaves: %s");
+  long workers_count = xbt_str_parse_int(argv[4], "Invalid amount of workers: %s");

 
   int i;
   for (i = 0; i < number_of_tasks; i++) {
 
   int i;
   for (i = 0; i < number_of_tasks; i++) {


@@ -44,7 +44,7 @@ static int master(int argc, char *argv[])
     MSG_task_send(task, "master_mailbox");
   }
 
     MSG_task_send(task, "master_mailbox");
   }
 

-  for (i = 0; i < slaves_count; i++) {
+  for (i = 0; i < workers_count; i++) {

     msg_task_t finalize = MSG_task_create("finalize", 0, 1000, 0);
     MSG_task_set_category(finalize, "finalize");
     MSG_task_send(finalize, "master_mailbox");
     msg_task_t finalize = MSG_task_create("finalize", 0, 1000, 0);
     MSG_task_set_category(finalize, "finalize");
     MSG_task_send(finalize, "master_mailbox");


@@ -53,7 +53,7 @@ static int master(int argc, char *argv[])
   return 0;
 }
 
   return 0;
 }
 

-static int slave(int argc, char *argv[])
+static int worker(int argc, char *argv[])

 {
   msg_task_t task = NULL;
 
 {
   msg_task_t task = NULL;
 


@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
   TRACE_category_with_color ("finalize", "0 0 0");//black
 
   MSG_function_register("master", master);
   TRACE_category_with_color ("finalize", "0 0 0");//black
 
   MSG_function_register("master", master);

-  MSG_function_register("slave", slave);
+  MSG_function_register("worker", worker);

   MSG_launch_application(argv[2]);
 
   MSG_main();
   MSG_launch_application(argv[2]);
 
   MSG_main();

diff --git a/examples/msg/trace-categories/trace-categories.tesh b/examples/msg/trace-categories/trace-categories.tesh
index cbbde48..12486a1 100644 (file)
--- a/examples/msg/trace-categories/trace-categories.tesh
+++ b/examples/msg/trace-categories/trace-categories.tesh
@@ -1,8 +1,8 @@
 #! ./tesh
 
 #! ./tesh
 

-p Tracing multiple categories master/slave application
+p Tracing multiple categories master/worker application

 
 

-$ $SG_TEST_EXENV ${bindir:=.}/trace-categories$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:categories.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:categories.cat.plist --cfg=viva/uncategorized:categories.uncat.plist ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave-mailbox/masterslave-mailbox_d.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-categories$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:categories.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:categories.cat.plist --cfg=viva/uncategorized:categories.uncat.plist ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterworker-mailbox/masterworker-mailbox_d.xml

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'categories.trace'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'categories.trace'

diff --git a/examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables.c b/examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables.c
index ba3eb08..c9c4503 100644 (file)
--- a/examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables.c
+++ b/examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables.c
@@ -27,7 +27,7 @@ static void create_and_execute_task (void)
   MSG_task_destroy (task);
 }
 
   MSG_task_destroy (task);
 }
 

-static int master(int argc, char *argv[])
+static int trace_fun(int argc, char *argv[])

 {
   //Set initial values for the link user variables
   //This example uses source and destination where source and destination are the name of hosts inthe platform file.
 {
   //Set initial values for the link user variables
   //This example uses source and destination where source and destination are the name of hosts inthe platform file.


@@ -73,9 +73,9 @@ int main(int argc, char *argv[])
   TRACE_link_variable_declare("Link_Capacity");
   TRACE_link_variable_declare_with_color ("Link_Utilization", "0.9 0.1 0.1");
 
   TRACE_link_variable_declare("Link_Capacity");
   TRACE_link_variable_declare_with_color ("Link_Utilization", "0.9 0.1 0.1");
 

-  //register "master" and "slave" functions and launch deployment
-  MSG_function_register("master", master);
-  MSG_function_register("slave", master);
+  //register functions and launch deployment
+  MSG_function_register("master", trace_fun);
+  MSG_function_register("worker", trace_fun);

   MSG_launch_application(argv[2]);
 
   MSG_main();
   MSG_launch_application(argv[2]);
 
   MSG_main();

diff --git a/examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables.tesh b/examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables.tesh
index 87f0aad..44bc097 100644 (file)
--- a/examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables.tesh
+++ b/examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables.tesh
@@ -1,7 +1,7 @@
 #! ./tesh
 
 p Trace user variables associated to links of the platform file
 #! ./tesh
 
 p Trace user variables associated to links of the platform file

-$ $SG_TEST_EXENV ${bindir:=.}/trace-link-srcdst-user-variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave-mailbox/masterslave-mailbox_d.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-link-srcdst-user-variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterworker-mailbox/masterworker-mailbox_d.xml

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes'
 
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes'
 

diff --git a/examples/msg/trace-link-user-variables/trace-link-user-variables.c b/examples/msg/trace-link-user-variables/trace-link-user-variables.c
index cb9f44f..5c97ac6 100644 (file)
--- a/examples/msg/trace-link-user-variables/trace-link-user-variables.c
+++ b/examples/msg/trace-link-user-variables/trace-link-user-variables.c
@@ -24,7 +24,7 @@ static void create_and_execute_task (void)
   MSG_task_destroy (task);
 }
 
   MSG_task_destroy (task);
 }
 

-static int master(int argc, char *argv[])
+static int trace_fun(int argc, char *argv[])

 {
   //set initial values for the link user variables this example only shows for links identified by "6" and "3" in the
   //platform file
 {
   //set initial values for the link user variables this example only shows for links identified by "6" and "3" in the
   //platform file


@@ -69,9 +69,9 @@ int main(int argc, char *argv[])
   TRACE_link_variable_declare("Link_Capacity");
   TRACE_link_variable_declare_with_color ("Link_Utilization", "0.9 0.1 0.1");
 
   TRACE_link_variable_declare("Link_Capacity");
   TRACE_link_variable_declare_with_color ("Link_Utilization", "0.9 0.1 0.1");
 

-  //register "master" and "slave" functions and launch deployment
-  MSG_function_register("master", master);
-  MSG_function_register("slave", master);
+  //register functions and launch deployment
+  MSG_function_register("master", trace_fun);
+  MSG_function_register("worker", trace_fun);

   MSG_launch_application(argv[2]);
 
   MSG_main();
   MSG_launch_application(argv[2]);
 
   MSG_main();

diff --git a/examples/msg/trace-link-user-variables/trace-link-user-variables.tesh b/examples/msg/trace-link-user-variables/trace-link-user-variables.tesh
index ca53d3d..75ef0a1 100644 (file)
--- a/examples/msg/trace-link-user-variables/trace-link-user-variables.tesh
+++ b/examples/msg/trace-link-user-variables/trace-link-user-variables.tesh
@@ -1,7 +1,7 @@
 #! ./tesh
 
 p Trace user variables associated to links of the platform file
 #! ./tesh
 
 p Trace user variables associated to links of the platform file

-$ $SG_TEST_EXENV ${bindir:=.}/trace-link-user-variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave-mailbox/masterslave-mailbox_d.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-link-user-variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterworker-mailbox/masterworker-mailbox_d.xml

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes'
 
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes'
 

diff --git a/examples/msg/trace-masterslave/trace-masterslave.c b/examples/msg/trace-masterworker/trace-masterworker.c
similarity index 89%
rename from examples/msg/trace-masterslave/trace-masterslave.c
rename to examples/msg/trace-masterworker/trace-masterworker.c
index 1b8e266..335dd09 100644 (file)
--- a/examples/msg/trace-masterslave/trace-masterslave.c
+++ b/examples/msg/trace-masterworker/trace-masterworker.c
@@ -6,8 +6,8 @@
 
 /** @addtogroup MSG_examples
  * 
 
 /** @addtogroup MSG_examples
  * 

- * - <b>tracing/ms.c</b> This is a master/slave program where the master creates tasks, send them to the slaves. For
- * each task received, the slave executes it and then destroys it. This program uses several tracing functions that
+ * - <b>tracing/ms.c</b> This is a master/worker program where the master creates tasks, send them to the workers. For
+ * each task received, the worker executes it and then destroys it. This program uses several tracing functions that

  * enable the tracing of categorized resource utilization, the use of trace marks, and user variables associated to the
  * hosts of the platform file. You might want to run this program with the following parameters:
  * --cfg=tracing/categorized:yes
  * enable the tracing of categorized resource utilization, the use of trace marks, and user variables associated to the
  * hosts of the platform file. You might want to run this program with the following parameters:
  * --cfg=tracing/categorized:yes


@@ -26,7 +26,7 @@ static int master(int argc, char *argv[])
   long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s");
   double task_comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s");
   double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s");
   long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s");
   double task_comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s");
   double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s");

-  long slaves_count = xbt_str_parse_int(argv[4], "Invalid amount of slaves: %s");
+  long workers_count = xbt_str_parse_int(argv[4], "Invalid amount of workers: %s");

 
   //setting the variable "is_master" (previously declared) to value 1
   TRACE_host_variable_set(MSG_host_get_name(MSG_host_self()), "is_master", 1);
 
   //setting the variable "is_master" (previously declared) to value 1
   TRACE_host_variable_set(MSG_host_get_name(MSG_host_self()), "is_master", 1);


@@ -47,7 +47,7 @@ static int master(int argc, char *argv[])
   }
   TRACE_mark("msmark", "finish_send_tasks");
 
   }
   TRACE_mark("msmark", "finish_send_tasks");
 

-  for (i = 0; i < slaves_count; i++) {
+  for (i = 0; i < workers_count; i++) {

     msg_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
     MSG_task_set_category(finalize, "finalize");
     MSG_task_send(finalize, "master_mailbox");
     msg_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
     MSG_task_set_category(finalize, "finalize");
     MSG_task_send(finalize, "master_mailbox");


@@ -56,11 +56,11 @@ static int master(int argc, char *argv[])
   return 0;
 }
 
   return 0;
 }
 

-static int slave(int argc, char *argv[])
+static int worker(int argc, char *argv[])

 {
   msg_task_t task = NULL;
 
 {
   msg_task_t task = NULL;
 

-  TRACE_host_variable_set(MSG_host_get_name(MSG_host_self()), "is_slave", 1);
+  TRACE_host_variable_set(MSG_host_get_name(MSG_host_self()), "is_worker", 1);

   TRACE_host_variable_set(MSG_host_get_name(MSG_host_self()), "task_computation", 0);
   while (1) {
     MSG_task_receive(&(task), "master_mailbox");
   TRACE_host_variable_set(MSG_host_get_name(MSG_host_self()), "task_computation", 0);
   while (1) {
     MSG_task_receive(&(task), "master_mailbox");


@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
   MSG_create_environment(argv[1]);
 
   //declaring user variables
   MSG_create_environment(argv[1]);
 
   //declaring user variables

-  TRACE_host_variable_declare("is_slave");
+  TRACE_host_variable_declare("is_worker");

   TRACE_host_variable_declare("is_master");
   TRACE_host_variable_declare("task_creation");
   TRACE_host_variable_declare("task_computation");
   TRACE_host_variable_declare("is_master");
   TRACE_host_variable_declare("task_creation");
   TRACE_host_variable_declare("task_computation");


@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
   TRACE_category_with_color ("report", NULL);
 
   MSG_function_register("master", master);
   TRACE_category_with_color ("report", NULL);
 
   MSG_function_register("master", master);

-  MSG_function_register("slave", slave);
+  MSG_function_register("worker", worker);

   MSG_launch_application(argv[2]);
 
   MSG_main();
   MSG_launch_application(argv[2]);
 
   MSG_main();

diff --git a/examples/msg/trace-masterslave/trace-masterslave.tesh b/examples/msg/trace-masterworker/trace-masterworker.tesh
similarity index 62%
rename from examples/msg/trace-masterslave/trace-masterslave.tesh
rename to examples/msg/trace-masterworker/trace-masterworker.tesh
index f0d6da8..2e6686c 100644 (file)
--- a/examples/msg/trace-masterslave/trace-masterslave.tesh
+++ b/examples/msg/trace-masterworker/trace-masterworker.tesh
@@ -1,14 +1,14 @@
 #! ./tesh
 
 #! ./tesh
 

-p Tracing master/slave application
-$ $SG_TEST_EXENV ${bindir:=.}/trace-masterslave$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:trace-masterslave.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:trace-masterslave.cat.plist --cfg=viva/uncategorized:trace-masterslave.uncat.plist ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave-mailbox/masterslave-mailbox_d.xml
+p Tracing master/worker application
+$ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:trace-masterworker.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:trace-masterworker.cat.plist --cfg=viva/uncategorized:trace-masterworker.uncat.plist ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterworker-mailbox/masterworker-mailbox_d.xml

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'

-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace-masterslave.trace'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace-masterworker.trace'

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'

-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'trace-masterslave.cat.plist'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'trace-masterslave.uncat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'trace-masterworker.cat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'trace-masterworker.uncat.plist'

 > [4.214821] [msg_test/INFO] Declared tracing categories:
 > [4.214821] [msg_test/INFO] request
 > [4.214821] [msg_test/INFO] finalize
 > [4.214821] [msg_test/INFO] Declared tracing categories:
 > [4.214821] [msg_test/INFO] request
 > [4.214821] [msg_test/INFO] finalize


@@ -17,14 +17,14 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace-masterslave$EXEEXT --cfg=tracing:yes --cfg=t
 > [4.214821] [msg_test/INFO] Declared marks:
 > [4.214821] [msg_test/INFO] msmark
 
 > [4.214821] [msg_test/INFO] Declared marks:
 > [4.214821] [msg_test/INFO] msmark
 

-p Tracing master/slave application with xml config
-$ $SG_TEST_EXENV ${bindir:=.}/trace-masterslave$EXEEXT ${srcdir:=.}/config_tracing.xml ${srcdir:=.}/../msg/masterslave-mailbox/masterslave-mailbox_d.xml
+p Tracing master/worker application with xml config
+$ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT ${srcdir:=.}/config_tracing.xml ${srcdir:=.}/../msg/masterworker-mailbox/masterworker-mailbox_d.xml

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'

-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'trace-masterslave.cat.plist'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace-masterslave.trace'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'trace-masterslave.uncat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'trace-masterworker.cat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace-masterworker.trace'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'trace-masterworker.uncat.plist'

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 > [4.214821] [msg_test/INFO] Declared tracing categories:
 > [4.214821] [msg_test/INFO] request
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 > [4.214821] [msg_test/INFO] Declared tracing categories:
 > [4.214821] [msg_test/INFO] request


@@ -34,19 +34,19 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace-masterslave$EXEEXT ${srcdir:=.}/config_traci
 > [4.214821] [msg_test/INFO] Declared marks:
 > [4.214821] [msg_test/INFO] msmark
 
 > [4.214821] [msg_test/INFO] Declared marks:
 > [4.214821] [msg_test/INFO] msmark
 

-p Not tracing master/slave application
-$ $SG_TEST_EXENV ${bindir:=.}/trace-masterslave$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave-mailbox/masterslave-mailbox_d.xml
+p Not tracing master/worker application
+$ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterworker-mailbox/masterworker-mailbox_d.xml

 
 p Testing tracing by process
 
 p Testing tracing by process

-$ $SG_TEST_EXENV ${bindir:=.}/trace-masterslave$EXEEXT --cfg=tracing:yes --cfg=tracing/msg/process:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:trace-masterslave.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:trace-masterslave.cat.plist --cfg=viva/uncategorized:trace-masterslave.uncat.plist ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave-mailbox/masterslave-mailbox_d.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT --cfg=tracing:yes --cfg=tracing/msg/process:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:trace-masterworker.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:trace-masterworker.cat.plist --cfg=viva/uncategorized:trace-masterworker.uncat.plist ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterworker-mailbox/masterworker-mailbox_d.xml

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'

-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace-masterslave.trace'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace-masterworker.trace'

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'

-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'trace-masterslave.cat.plist'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'trace-masterslave.uncat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'trace-masterworker.cat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'trace-masterworker.uncat.plist'

 > [4.214821] [msg_test/INFO] Declared tracing categories:
 > [4.214821] [msg_test/INFO] request
 > [4.214821] [msg_test/INFO] finalize
 > [4.214821] [msg_test/INFO] Declared tracing categories:
 > [4.214821] [msg_test/INFO] request
 > [4.214821] [msg_test/INFO] finalize


@@ -55,7 +55,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace-masterslave$EXEEXT --cfg=tracing:yes --cfg=t
 > [4.214821] [msg_test/INFO] Declared marks:
 > [4.214821] [msg_test/INFO] msmark
 
 > [4.214821] [msg_test/INFO] Declared marks:
 > [4.214821] [msg_test/INFO] msmark
 

-$ $SG_TEST_EXENV cat trace-masterslave.uncat.plist
+$ $SG_TEST_EXENV cat trace-masterworker.uncat.plist

 >   node = ("HOST","LINK");
 >   edge = ("0-LINK13-LINK13","0-LINK13-HOST1","0-HOST1-LINK13");
 > 
 >   node = ("HOST","LINK");
 >   edge = ("0-LINK13-LINK13","0-LINK13-HOST1","0-HOST1-LINK13");
 > 


@@ -70,7 +70,7 @@ $ $SG_TEST_EXENV cat trace-masterslave.uncat.plist
 >     values = ("bandwidth_used");
 >   };
 
 >     values = ("bandwidth_used");
 >   };
 

-$ $SG_TEST_EXENV cat trace-masterslave.cat.plist
+$ $SG_TEST_EXENV cat trace-masterworker.cat.plist

 >   node = ("HOST","LINK");
 >   edge = ("0-LINK13-LINK13","0-LINK13-HOST1","0-HOST1-LINK13");
 > 
 >   node = ("HOST","LINK");
 >   edge = ("0-LINK13-LINK13","0-LINK13-HOST1","0-HOST1-LINK13");
 > 


@@ -85,4 +85,4 @@ $ $SG_TEST_EXENV cat trace-masterslave.cat.plist
 >     values = ("bcompute","breport","bfinalize","brequest");
 >   };
 
 >     values = ("bcompute","breport","bfinalize","brequest");
 >   };
 

-$ rm -rf trace-masterslave.trace trace-masterslave.cat.plist trace-masterslave.uncat.plist
+$ rm -rf trace-masterworker.trace trace-masterworker.cat.plist trace-masterworker.uncat.plist

diff --git a/examples/msg/trace-user-variables/trace-user-variables.c b/examples/msg/trace-user-variables/trace-user-variables.c
index 5e6a057..3510047 100644 (file)
--- a/examples/msg/trace-user-variables/trace-user-variables.c
+++ b/examples/msg/trace-user-variables/trace-user-variables.c
@@ -17,7 +17,7 @@
 
 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 int master(int argc, char *argv[])
+static int trace_fun(int argc, char *argv[])

 {
   const char *hostname = MSG_host_get_name(MSG_host_self());
   int i;
 {
   const char *hostname = MSG_host_get_name(MSG_host_self());
   int i;


@@ -61,8 +61,8 @@ int main(int argc, char *argv[])
   TRACE_host_variable_declare("HDD_utilization");
 
   //register functions and launch deployment
   TRACE_host_variable_declare("HDD_utilization");
 
   //register functions and launch deployment

-  MSG_function_register("master", master);
-  MSG_function_register("slave", master);
+  MSG_function_register("master", trace_fun);
+  MSG_function_register("worker", trace_fun);

   MSG_launch_application(argv[2]);
 
   MSG_main();
   MSG_launch_application(argv[2]);
 
   MSG_main();

diff --git a/examples/msg/trace-user-variables/trace-user-variables.tesh b/examples/msg/trace-user-variables/trace-user-variables.tesh
index 7e77460..42d3e50 100644 (file)
--- a/examples/msg/trace-user-variables/trace-user-variables.tesh
+++ b/examples/msg/trace-user-variables/trace-user-variables.tesh
@@ -1,7 +1,7 @@
 #! ./tesh
 
 p Tracing user variables
 #! ./tesh
 
 p Tracing user variables

-$ $SG_TEST_EXENV ${bindir:=.}/trace-user-variables$EXEEXT --cfg=tracing:yes  --cfg=tracing/platform:yes ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave-mailbox/masterslave-mailbox_d.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-user-variables$EXEEXT --cfg=tracing:yes  --cfg=tracing/platform:yes ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterworker-mailbox/masterworker-mailbox_d.xml

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes'
 > [0.004078] [msg_test/INFO] Declared host variables:
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes'
 > [0.004078] [msg_test/INFO] Declared host variables:


@@ -19,4 +19,4 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace-user-variables$EXEEXT --cfg=tracing:yes  --c
 $ rm -f viva_graph.plist
 
 p Not tracing user variables
 $ rm -f viva_graph.plist
 
 p Not tracing user variables

-$ $SG_TEST_EXENV ${bindir:=.}/trace-user-variables$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave-mailbox/masterslave-mailbox_d.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-user-variables$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterworker-mailbox/masterworker-mailbox_d.xml

diff --git a/examples/platforms/config_tracing.xml b/examples/platforms/config_tracing.xml
index 9b32ad8..496876d 100644 (file)
--- a/examples/platforms/config_tracing.xml
+++ b/examples/platforms/config_tracing.xml
@@ -5,9 +5,9 @@
     <prop id="tracing/uncategorized" value="yes"/>
     <prop id="tracing/buffer" value="yes"/>
     <prop id="tracing" value="yes"/>
     <prop id="tracing/uncategorized" value="yes"/>
     <prop id="tracing/buffer" value="yes"/>
     <prop id="tracing" value="yes"/>

-    <prop id="viva/categorized" value="trace-masterslave.cat.plist"/>
-    <prop id="tracing/filename" value="trace-masterslave.trace"/>
-    <prop id="viva/uncategorized" value="trace-masterslave.uncat.plist"/>
+    <prop id="viva/categorized" value="trace-masterworker.cat.plist"/>
+    <prop id="tracing/filename" value="trace-masterworker.trace"/>
+    <prop id="viva/uncategorized" value="trace-masterworker.uncat.plist"/>

     <prop id="tracing/categorized" value="yes"/>
   </config>
 
     <prop id="tracing/categorized" value="yes"/>
   </config>