Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Massive cleanup in masterslave
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Tue, 29 Mar 2016 11:55:38 +0000 (13:55 +0200)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Tue, 29 Mar 2016 12:00:00 +0000 (14:00 +0200)
  broke one test: (in masterslave/masterslave_cpu_ti.tesh,
  case w/ TI and w/o crosstraffic).
  Comment it for now at examples/msg/CMakeLists.txt:106

28 files changed:
.gitignore
examples/msg/CMakeLists.txt
examples/msg/failures/failures.tesh
examples/msg/masterslave-mailbox/masterslave-mailbox-multicore.tesh [moved from examples/msg/masterslave/masterslave_multicore.tesh with 91% similarity]
examples/msg/masterslave-mailbox/masterslave-mailbox-multicore_d.xml [moved from examples/msg/masterslave/deployment_masterslave_mailbox_multicore.xml with 100% similarity]
examples/msg/masterslave-mailbox/masterslave-mailbox-vivaldi.tesh [moved from examples/msg/masterslave/masterslave_vivaldi.tesh with 91% similarity]
examples/msg/masterslave-mailbox/masterslave-mailbox-vivaldi_d.xml [moved from examples/msg/masterslave/deployment_masterslave_vivaldi.xml with 100% similarity]
examples/msg/masterslave-mailbox/masterslave-mailbox.c [moved from examples/msg/masterslave/masterslave_mailbox.c with 95% similarity]
examples/msg/masterslave-mailbox/masterslave-mailbox.tesh [new file with mode: 0644]
examples/msg/masterslave-mailbox/masterslave-mailbox_d.xml [moved from examples/msg/masterslave/deployment_masterslave_mailbox.xml with 100% similarity]
examples/msg/masterslave/CMakeLists.txt [deleted file]
examples/msg/masterslave/deployment_masterslave_forwarder.xml [deleted file]
examples/msg/masterslave/masterslave.c [moved from examples/msg/masterslave/masterslave_forwarder.c with 61% similarity]
examples/msg/masterslave/masterslave.tesh
examples/msg/masterslave/masterslave_cpu_ti.tesh
examples/msg/masterslave/masterslave_cpu_ti_crosstraffic.tesh [deleted file]
examples/msg/masterslave/masterslave_crosstraffic.tesh [deleted file]
examples/msg/masterslave/masterslave_d.xml [moved from examples/msg/masterslave/deployment_masterslave.xml with 100% similarity]
examples/msg/masterslave/masterslave_forwarder.tesh [deleted file]
examples/msg/masterslave/masterslave_forwarder_crosstraffic.tesh [deleted file]
examples/msg/masterslave/masterslave_mailbox.tesh [deleted file]
examples/msg/masterslave/masterslave_mailbox_crosstraffic.tesh [deleted file]
examples/msg/trace-categories/trace-categories.tesh
examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables.tesh
examples/msg/trace-link-user-variables/trace-link-user-variables.tesh
examples/msg/trace-masterslave/trace-masterslave.tesh
examples/msg/trace-user-variables/trace-user-variables.tesh
tools/cmake/DefinePackages.cmake

index 97e699b..71fb91f 100644 (file)
@@ -144,14 +144,10 @@ examples/msg/io-file/io-file
 examples/msg/io-file-unlink/io-file-unlink
 examples/msg/io-remote/io-remote
 examples/msg/io-storage/io-storage
-examples/msg/irc_isend/peer
-examples/msg/irc_isend/toto.txt
-examples/msg/masterslave/masterslave_arg
 examples/msg/failures/failures
-examples/msg/masterslave/masterslave_forwarder
+examples/msg/masterslave/masterslave
 examples/msg/process-kill/process-kill
-examples/msg/masterslave/masterslave_mailbox
-examples/msg/masterslave/toto.txt
+examples/msg/masterslave-mailbox/masterslave-mailbox
 examples/msg/mc/bugged1
 examples/msg/mc/bugged1_liveness
 examples/msg/mc/bugged1_stateful
index b48743d..abac8c2 100644 (file)
@@ -1,8 +1,9 @@
 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 pmm priority process-kill process-migration process-suspend properties sendrecv set-maestro
-          start_kill_time synchro token_ring trace-categories trace-link-srcdst-user-variables trace-link-user-variables
-          trace-masterslave trace-platform trace-process-migration trace-simple trace-user-variables)
+          io-storage masterslave masterslave-mailbox pmm priority process-kill process-migration process-suspend 
+          properties sendrecv set-maestro start_kill_time synchro token_ring trace-categories 
+          trace-link-srcdst-user-variables trace-link-user-variables trace-masterslave trace-platform 
+          trace-process-migration trace-simple trace-user-variables)
   add_executable       (${x}     ${x}/${x}.c)
   target_link_libraries(${x}     simgrid)
   set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -38,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 
-         dht-kademlia dht-pastry io-remote priority properties sendrecv set-maestro)
+         dht-kademlia dht-pastry io-remote masterslave masterslave-mailbox priority properties sendrecv set-maestro)
   set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/${file}/${file}_d.xml)
 endforeach()
 
@@ -56,12 +57,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
+                                  ${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}/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}/ns3/3hosts_2links_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/ns3/3links-timer_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/ns3/3links_d.xml
@@ -76,8 +82,8 @@ set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/action
                                   ${CMAKE_CURRENT_SOURCE_DIR}/start_kill_time/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 priority process-kill process-migration process-suspend 
-        properties sendrecv synchro start_kill_time token_ring)
+        failures io-file io-file-unlink io-remote io-storage masterslave masterslave-mailbox priority process-kill 
+        process-migration process-suspend properties sendrecv synchro start_kill_time 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()
 
@@ -97,6 +103,12 @@ 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-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)
+
+# 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(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)
 
 if(HAVE_NS3)
index 30d0a33..7d80ba5 100644 (file)
@@ -3,7 +3,7 @@
 p Testing a simple master/slave example application handling failures TCP crosstraffic DISABLED
 
 ! 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/deployment_masterslave.xml --cfg=path:${srcdir} --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $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) :
 > [  0.000000] (1:master@Tremblay) Jupiter
@@ -104,7 +104,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/failures$EXEEXT --log=xbt_cfg.thres:critical --log
 p Testing a simple master/slave example application handling failures. TCP crosstraffic ENABLED
 
 ! 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/deployment_masterslave.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $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) :
 > [  0.000000] (1:master@Tremblay) Jupiter
@@ -205,7 +205,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/failures$EXEEXT --log=xbt_cfg.thres:critical --log
 p Testing a simple master/slave example application handling failures. CPU_TI optimization enabled
 
 ! 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/deployment_masterslave.xml --cfg=path:${srcdir} -cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $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) :
 > [  0.000000] (1:master@Tremblay) Jupiter
@@ -2,7 +2,7 @@
 
 p Testing a simple master/slave example application
 
-$ $SG_TEST_EXENV ./masterslave/masterslave_mailbox ${srcdir:=.}/../platforms/multicore_machine.xml ${srcdir:=.}/masterslave/deployment_masterslave_mailbox_multicore.xml --cfg=cpu/model:Cas01 --cfg=cpu/optim:Full
+$ $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
 > [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
@@ -2,7 +2,7 @@
 
 p Testing a simple master/slave example application
 
-$ $SG_TEST_EXENV ./masterslave/masterslave_mailbox  ${srcdir:=.}/../platforms/vivaldi.xml ${srcdir:=.}/masterslave/deployment_masterslave_vivaldi.xml --cfg=network/latency_factor:1.0 --cfg=network/bandwidth_factor:1.0
+$ $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'
@@ -49,14 +49,12 @@ static int slave(int argc, char *argv[])
 {
   msg_task_t task = NULL;
   XBT_ATTRIB_UNUSED int res;
-  int id = -1;
   char mailbox[80];
   XBT_ATTRIB_UNUSED int read;
 
-  read = sscanf(argv[1], "%d", &id);
-  xbt_assert(read, "Invalid argument %s\n", argv[1]);
+  long id= xbt_str_parse_int(argv[1], "Invalid argument %s");
 
-  sprintf(mailbox, "slave-%d", id);
+  sprintf(mailbox, "slave-%ld", id);
 
   while (1) {
     res = MSG_task_receive(&(task), mailbox);
diff --git a/examples/msg/masterslave-mailbox/masterslave-mailbox.tesh b/examples/msg/masterslave-mailbox/masterslave-mailbox.tesh
new file mode 100644 (file)
index 0000000..2c86e25
--- /dev/null
@@ -0,0 +1,65 @@
+#! ./tesh
+
+p Testing a simple master/slave example application (mailbox version)
+
+! 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"
+> [  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"
+> [  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!
+> [  5.094868] (0:maestro@) Simulation time 5.09487
+> [  5.094868] (6:slave@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"
+> [  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!
+> [  5.133855] (0:maestro@) Simulation time 5.13386
diff --git a/examples/msg/masterslave/CMakeLists.txt b/examples/msg/masterslave/CMakeLists.txt
deleted file mode 100644 (file)
index 356b67c..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-foreach (example masterslave_forwarder masterslave_mailbox)
-  add_executable       (${example} ${example}.c)
-  target_link_libraries(${example} simgrid)
-  set(examples_src  ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${example}.c)
-  set(tesh_files  ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${example}.tesh 
-                                ${CMAKE_CURRENT_SOURCE_DIR}/${example}_crosstraffic.tesh)
-
-  ADD_TESH_FACTORIES(msg-${example} "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/${example}_crosstraffic.tesh)
-  ADD_TESH_FACTORIES(msg-${example}-no-crosstraffic   "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/${example}.tesh)
-endforeach()
-
-ADD_TESH_FACTORIES(msg-masterslave             "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_crosstraffic.tesh)
-ADD_TESH_FACTORIES(msg-masterslave-multicore   "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_multicore.tesh)
-ADD_TESH_FACTORIES(msg-masterslave-cpu-ti      "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/masterslave --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti_crosstraffic.tesh)
-ADD_TESH_FACTORIES(msg-masterslave-vivaldi     "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh)
-ADD_TESH_FACTORIES(msg-masterslave-no-crosstraffic "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave.tesh)
-
-set(examples_src  ${examples_src}                                                                          PARENT_SCOPE)
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/masterslave.tesh
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_crosstraffic.tesh
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_cpu_ti.tesh
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_cpu_ti_crosstraffic.tesh
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_multicore.tesh
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_vivaldi.tesh                    PARENT_SCOPE)
-set(xml_files   ${xml_files}       ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_forwarder.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_mailbox.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_mailbox_multicore.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_vivaldi.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave.xml                  PARENT_SCOPE)
diff --git a/examples/msg/masterslave/deployment_masterslave_forwarder.xml b/examples/msg/masterslave/deployment_masterslave_forwarder.xml
deleted file mode 100644 (file)
index babf6ae..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Jacquelin" function="master">
-     <argument value="20"/>       <!-- Number of tasks -->
-     <argument value="5000000"/>  <!-- Computation size of tasks -->
-     <argument value="100000"/>   <!-- Communication size of tasks -->
-     <argument value="iRMX"/>     <!-- First slave -->
-     <argument value="Casavant"/> <!-- Second slave -->
-     <argument value="Bousquet"/> <!-- Third slave -->
-     <argument value="Soucy"/>    <!-- Fourth slave -->
-     <argument value="Jackson"/>  <!-- Last slave -->
-  </process>
-  <process host="Jackson" function="forwarder">
-     <argument value="Kuenning"/>
-     <argument value="Browne"/> 
-     <argument value="Stephen"/>
- </process>
-  <process host="Casavant" function="forwarder">
-     <argument value="Robert"/>
-     <argument value="Sirois"/> 
-     <argument value="Monique"/>
- </process>
-  <process host="iRMX" function="slave"/>
-  <process host="Bousquet" function="slave"/>
-  <process host="Soucy" function="slave"/>
-  <process host="Kuenning" function="slave"/>
-  <process host="Browne" function="slave"/>
-  <process host="Stephen" function="slave"/>
-  <process host="Robert" function="slave"/>
-  <process host="Sirois" function="slave"/>
-  <process host="Monique" function="slave"/>
-</platform>
similarity index 61%
rename from examples/msg/masterslave/masterslave_forwarder.c
rename to examples/msg/masterslave/masterslave.c
index 74e3858..c731acd 100644 (file)
@@ -10,31 +10,23 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example")
 
 /** @addtogroup MSG_examples
  * 
- *  - <b>masterslave/masterslave_forwarder.c: Master/slaves example</b>. This good old example is also very simple. Its
+ *  - <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
  *    same directory.
  */
 
 #define FINALIZE ((void*)221297)        /* a magic number to tell people to stop working */
 
-/** Emitter function  */
 static int master(int argc, char *argv[])
 {
-  int slaves_count = 0;
   msg_host_t *slaves = NULL;
   msg_task_t *todo = NULL;
-  int number_of_tasks = 0;
-  double task_comp_size = 0;
-  double task_comm_size = 0;
-
+  long slaves_count = 0;
   int i;
 
-  XBT_ATTRIB_UNUSED int res = sscanf(argv[1], "%d", &number_of_tasks);
-  xbt_assert(res,"Invalid argument %s\n", argv[1]);
-  res = sscanf(argv[2], "%lg", &task_comp_size);
-  xbt_assert(res, "Invalid argument %s\n", argv[2]);
-  res = sscanf(argv[3], "%lg", &task_comm_size);
-  xbt_assert(res, "Invalid argument %s\n", argv[3]);
+  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");
 
   {                             /*  Task creation */
     char sprintf_buffer[64];
@@ -57,7 +49,7 @@ static int master(int argc, char *argv[])
     }
   }
 
-  XBT_INFO("Got %d slaves and %d tasks to process", slaves_count, number_of_tasks);
+  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]));
 
@@ -107,53 +99,6 @@ static int slave(int argc, char *argv[])
   return 0;
 }
 
-static int forwarder(int argc, char *argv[])
-{
-  int i;
-  int slaves_count;
-  msg_host_t *slaves;
-
-  {                             /* Process organization */
-    slaves_count = argc - 1;
-    slaves = xbt_new0(msg_host_t, slaves_count);
-
-    for (i = 1; i < argc; i++) {
-      slaves[i - 1] = MSG_host_by_name(argv[i]);
-      if (slaves[i - 1] == NULL) {
-        XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]);
-        abort();
-      }
-    }
-  }
-
-  i = 0;
-  while (1) {
-    msg_task_t task = NULL;
-    int a;
-    a = MSG_task_receive(&(task),MSG_host_get_name(MSG_host_self()));
-    if (a == MSG_OK) {
-      XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
-      if (MSG_task_get_data(task) == FINALIZE) {
-        XBT_INFO("All tasks have been dispatched. Let's tell everybody the computation is over.");
-        for (i = 0; i < slaves_count; i++)
-          MSG_task_send(MSG_task_create("finalize", 0, 0, FINALIZE), MSG_host_get_name(slaves[i]));
-        MSG_task_destroy(task);
-        break;
-      }
-      XBT_INFO("Sending \"%s\" to \"%s\"", MSG_task_get_name(task), MSG_host_get_name(slaves[i % slaves_count]));
-      MSG_task_send(task, MSG_host_get_name(slaves[i % slaves_count]));
-      i++;
-    } else {
-      XBT_INFO("Hey ?! What's up ? ");
-      xbt_die("Unexpected behavior");
-    }
-  }
-  xbt_free(slaves);
-
-  XBT_INFO("I'm done. See you!");
-  return 0;
-}
-
 int main(int argc, char *argv[])
 {
   msg_error_t res = MSG_OK;
@@ -166,7 +111,6 @@ int main(int argc, char *argv[])
 
   MSG_function_register("master", master);
   MSG_function_register("slave", slave);
-  MSG_function_register("forwarder", forwarder);
   MSG_launch_application(argv[2]);
 
   res = MSG_main();
index bfbcb45..dedea57 100644 (file)
@@ -1,9 +1,9 @@
 #! ./tesh
 
-p Testing a simple master/slave example application
+p Testing a simple master/slave example application. TCP crosstraffic DISABLED
 
 ! output sort 19
-$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platforms/small_platform_with_routers.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=network/crosstraffic:0 --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $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"
@@ -123,3 +123,125 @@ $ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platfo
 > [  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
index bdad446..53d2099 100644 (file)
@@ -3,7 +3,131 @@
 p Testing a simple master/slave example application
 
 ! output sort 19
-$ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml masterslave/deployment_masterslave.xml --cfg=network/crosstraffic:0 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $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
@@ -125,383 +249,3 @@ $ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platf
 > [  5.532947] (2:slave@Tremblay) Received "finalize"
 > [  5.532947] (2:slave@Tremblay) I'm done. See you!
 
-p Testing a master/slave example application with a forwarder module
-
-! output sort 19
-$ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT msg_platform.xml masterslave/deployment_masterslave_forwarder.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@Jacquelin) Got 5 slaves and 20 tasks to process
-> [  0.000000] (1:master@Jacquelin) Sending "Task_0" to "iRMX"
-> [  4.772530] (1:master@Jacquelin) Sent
-> [  4.772530] (1:master@Jacquelin) Sending "Task_1" to "Casavant"
-> [  4.772530] (4:slave@iRMX) Received "Task_0"
-> [  4.772530] (4:slave@iRMX) Processing "Task_0"
-> [  4.845345] (4:slave@iRMX) "Task_0" done
-> [  6.900351] (1:master@Jacquelin) Sent
-> [  6.900351] (1:master@Jacquelin) Sending "Task_2" to "Bousquet"
-> [  6.900351] (3:forwarder@Casavant) Received "Task_1"
-> [  6.900351] (3:forwarder@Casavant) Sending "Task_1" to "Robert"
-> [  8.491392] (1:master@Jacquelin) Sent
-> [  8.491392] (1:master@Jacquelin) Sending "Task_3" to "Soucy"
-> [  8.491392] (5:slave@Bousquet) Received "Task_2"
-> [  8.491392] (5:slave@Bousquet) Processing "Task_2"
-> [  8.607896] (5:slave@Bousquet) "Task_2" done
-> [  9.260549] (10:slave@Robert) Received "Task_1"
-> [  9.260549] (10:slave@Robert) Processing "Task_1"
-> [  9.296956] (10:slave@Robert) "Task_1" done
-> [ 10.755127] (1:master@Jacquelin) Sent
-> [ 10.755127] (1:master@Jacquelin) Sending "Task_4" to "Jackson"
-> [ 10.755127] (6:slave@Soucy) Received "Task_3"
-> [ 10.755127] (6:slave@Soucy) Processing "Task_3"
-> [ 10.791535] (6:slave@Soucy) "Task_3" done
-> [ 12.090242] (1:master@Jacquelin) Sent
-> [ 12.090242] (1:master@Jacquelin) Sending "Task_5" to "iRMX"
-> [ 12.090242] (2:forwarder@Jackson) Received "Task_4"
-> [ 12.090242] (2:forwarder@Jackson) Sending "Task_4" to "Kuenning"
-> [ 12.173866] (7:slave@Kuenning) Received "Task_4"
-> [ 12.173866] (7:slave@Kuenning) Processing "Task_4"
-> [ 12.232118] (7:slave@Kuenning) "Task_4" done
-> [ 16.862772] (1:master@Jacquelin) Sent
-> [ 16.862772] (1:master@Jacquelin) Sending "Task_6" to "Casavant"
-> [ 16.862772] (4:slave@iRMX) Received "Task_5"
-> [ 16.862772] (4:slave@iRMX) Processing "Task_5"
-> [ 16.935587] (4:slave@iRMX) "Task_5" done
-> [ 18.990593] (1:master@Jacquelin) Sent
-> [ 18.990593] (1:master@Jacquelin) Sending "Task_7" to "Bousquet"
-> [ 18.990593] (3:forwarder@Casavant) Received "Task_6"
-> [ 18.990593] (3:forwarder@Casavant) Sending "Task_6" to "Sirois"
-> [ 19.793293] (11:slave@Sirois) Received "Task_6"
-> [ 19.793293] (11:slave@Sirois) Processing "Task_6"
-> [ 19.836983] (11:slave@Sirois) "Task_6" done
-> [ 20.581634] (1:master@Jacquelin) Sent
-> [ 20.581634] (1:master@Jacquelin) Sending "Task_8" to "Soucy"
-> [ 20.581634] (5:slave@Bousquet) Received "Task_7"
-> [ 20.581634] (5:slave@Bousquet) Processing "Task_7"
-> [ 20.698138] (5:slave@Bousquet) "Task_7" done
-> [ 22.845369] (1:master@Jacquelin) Sent
-> [ 22.845369] (1:master@Jacquelin) Sending "Task_9" to "Jackson"
-> [ 22.845369] (6:slave@Soucy) Received "Task_8"
-> [ 22.845369] (6:slave@Soucy) Processing "Task_8"
-> [ 22.881777] (6:slave@Soucy) "Task_8" done
-> [ 24.180485] (1:master@Jacquelin) Sent
-> [ 24.180485] (1:master@Jacquelin) Sending "Task_10" to "iRMX"
-> [ 24.180485] (2:forwarder@Jackson) Received "Task_9"
-> [ 24.180485] (2:forwarder@Jackson) Sending "Task_9" to "Browne"
-> [ 27.009931] (8:slave@Browne) Received "Task_9"
-> [ 27.009931] (8:slave@Browne) Processing "Task_9"
-> [ 27.046339] (8:slave@Browne) "Task_9" done
-> [ 28.953014] (1:master@Jacquelin) Sent
-> [ 28.953014] (1:master@Jacquelin) Sending "Task_11" to "Casavant"
-> [ 28.953014] (4:slave@iRMX) Received "Task_10"
-> [ 28.953014] (4:slave@iRMX) Processing "Task_10"
-> [ 29.025830] (4:slave@iRMX) "Task_10" done
-> [ 31.080835] (1:master@Jacquelin) Sent
-> [ 31.080835] (1:master@Jacquelin) Sending "Task_12" to "Bousquet"
-> [ 31.080835] (3:forwarder@Casavant) Received "Task_11"
-> [ 31.080835] (3:forwarder@Casavant) Sending "Task_11" to "Monique"
-> [ 32.472434] (12:slave@Monique) Received "Task_11"
-> [ 32.472434] (12:slave@Monique) Processing "Task_11"
-> [ 32.516124] (12:slave@Monique) "Task_11" done
-> [ 32.671876] (1:master@Jacquelin) Sent
-> [ 32.671876] (1:master@Jacquelin) Sending "Task_13" to "Soucy"
-> [ 32.671876] (5:slave@Bousquet) Received "Task_12"
-> [ 32.671876] (5:slave@Bousquet) Processing "Task_12"
-> [ 32.788380] (5:slave@Bousquet) "Task_12" done
-> [ 34.935611] (1:master@Jacquelin) Sent
-> [ 34.935611] (1:master@Jacquelin) Sending "Task_14" to "Jackson"
-> [ 34.935611] (6:slave@Soucy) Received "Task_13"
-> [ 34.935611] (6:slave@Soucy) Processing "Task_13"
-> [ 34.972019] (6:slave@Soucy) "Task_13" done
-> [ 36.270727] (1:master@Jacquelin) Sent
-> [ 36.270727] (1:master@Jacquelin) Sending "Task_15" to "iRMX"
-> [ 36.270727] (2:forwarder@Jackson) Received "Task_14"
-> [ 36.270727] (2:forwarder@Jackson) Sending "Task_14" to "Stephen"
-> [ 40.508273] (9:slave@Stephen) Received "Task_14"
-> [ 40.508273] (9:slave@Stephen) Processing "Task_14"
-> [ 40.581088] (9:slave@Stephen) "Task_14" done
-> [ 41.043257] (1:master@Jacquelin) Sent
-> [ 41.043257] (1:master@Jacquelin) Sending "Task_16" to "Casavant"
-> [ 41.043257] (4:slave@iRMX) Received "Task_15"
-> [ 41.043257] (4:slave@iRMX) Processing "Task_15"
-> [ 41.116072] (4:slave@iRMX) "Task_15" done
-> [ 43.171078] (1:master@Jacquelin) Sent
-> [ 43.171078] (1:master@Jacquelin) Sending "Task_17" to "Bousquet"
-> [ 43.171078] (3:forwarder@Casavant) Received "Task_16"
-> [ 43.171078] (3:forwarder@Casavant) Sending "Task_16" to "Robert"
-> [ 44.762118] (1:master@Jacquelin) Sent
-> [ 44.762118] (1:master@Jacquelin) Sending "Task_18" to "Soucy"
-> [ 44.762118] (5:slave@Bousquet) Received "Task_17"
-> [ 44.762118] (5:slave@Bousquet) Processing "Task_17"
-> [ 44.878622] (5:slave@Bousquet) "Task_17" done
-> [ 45.531275] (10:slave@Robert) Received "Task_16"
-> [ 45.531275] (10:slave@Robert) Processing "Task_16"
-> [ 45.567683] (10:slave@Robert) "Task_16" done
-> [ 47.025854] (1:master@Jacquelin) Sent
-> [ 47.025854] (1:master@Jacquelin) Sending "Task_19" to "Jackson"
-> [ 47.025854] (6:slave@Soucy) Received "Task_18"
-> [ 47.025854] (6:slave@Soucy) Processing "Task_18"
-> [ 47.062262] (6:slave@Soucy) "Task_18" done
-> [ 48.360969] (1:master@Jacquelin) Sent
-> [ 48.360969] (1:master@Jacquelin) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [ 48.360969] (2:forwarder@Jackson) Received "Task_19"
-> [ 48.360969] (2:forwarder@Jackson) Sending "Task_19" to "Kuenning"
-> [ 48.444592] (7:slave@Kuenning) Received "Task_19"
-> [ 48.444592] (7:slave@Kuenning) Processing "Task_19"
-> [ 48.502845] (7:slave@Kuenning) "Task_19" done
-> [ 50.794024] (4:slave@iRMX) Received "finalize"
-> [ 50.794024] (4:slave@iRMX) I'm done. See you!
-> [ 51.878795] (3:forwarder@Casavant) Received "finalize"
-> [ 51.878795] (3:forwarder@Casavant) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [ 52.689914] (5:slave@Bousquet) Received "finalize"
-> [ 52.689914] (5:slave@Bousquet) I'm done. See you!
-> [ 53.082033] (10:slave@Robert) Received "finalize"
-> [ 53.082033] (10:slave@Robert) I'm done. See you!
-> [ 53.491253] (11:slave@Sirois) Received "finalize"
-> [ 53.491253] (11:slave@Sirois) I'm done. See you!
-> [ 53.843975] (6:slave@Soucy) Received "finalize"
-> [ 53.843975] (6:slave@Soucy) I'm done. See you!
-> [ 54.200695] (12:slave@Monique) Received "finalize"
-> [ 54.200695] (12:slave@Monique) I'm done. See you!
-> [ 54.200695] (3:forwarder@Casavant) I'm done. See you!
-> [ 54.524622] (1:master@Jacquelin) Goodbye now!
-> [ 54.524622] (2:forwarder@Jackson) Received "finalize"
-> [ 54.524622] (2:forwarder@Jackson) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [ 54.529294] (7:slave@Kuenning) Received "finalize"
-> [ 54.529294] (7:slave@Kuenning) I'm done. See you!
-> [ 55.971757] (8:slave@Browne) Received "finalize"
-> [ 55.971757] (8:slave@Browne) I'm done. See you!
-> [ 58.132075] (0:maestro@) Simulation time 58.1321
-> [ 58.132075] (2:forwarder@Jackson) I'm done. See you!
-> [ 58.132075] (9:slave@Stephen) Received "finalize"
-> [ 58.132075] (9:slave@Stephen) I'm done. See you!
-
-p Testing a simple master/slave example application handling failures
-
-! output sort 19
-$ ${bindir:=.}/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc small_platform_with_failures.xml masterslave/deployment_masterslave.xml --cfg=network/crosstraffic:0 --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) :
-> [  0.000000] (1:master@Tremblay) Jupiter
-> [  0.000000] (1:master@Tremblay) Fafard
-> [  0.000000] (1:master@Tremblay) Ginette
-> [  0.000000] (1:master@Tremblay) Bourassa
-> [  0.000000] (1:master@Tremblay) Tremblay
-> [  0.000000] (1:master@Tremblay) Got 20 task to process :
-> [  0.165962] (1:master@Tremblay) Send completed
-> [  0.165962] (3:slave@Jupiter) Received "Task"
-> [  0.165962] (3:slave@Jupiter) Communication time : "0.165962"
-> [  0.165962] (3:slave@Jupiter) Processing "Task"
-> [  0.821304] (3:slave@Jupiter) "Task" done
-> [  1.100000] (3:slave@Jupiter) Gloups. The cpu on which I'm running just turned off!. See you!
-> [ 10.165962] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
-> [ 10.306421] (1:master@Tremblay) Send completed
-> [ 10.306421] (4:slave@Ginette) Received "Task"
-> [ 10.306421] (4:slave@Ginette) Communication time : "0.140460"
-> [ 10.306421] (4:slave@Ginette) Processing "Task"
-> [ 10.522294] (1:master@Tremblay) Send completed
-> [ 10.522294] (5:slave@Bourassa) Received "Task"
-> [ 10.522294] (5:slave@Bourassa) Communication time : "0.215872"
-> [ 10.522294] (5:slave@Bourassa) Processing "Task"
-> [ 10.524632] (1:master@Tremblay) Send completed
-> [ 10.524632] (2:slave@Tremblay) Received "Task"
-> [ 10.524632] (2:slave@Tremblay) Communication time : "0.002339"
-> [ 10.524632] (2:slave@Tremblay) Processing "Task"
-> [ 11.034342] (2:slave@Tremblay) "Task" done
-> [ 11.337519] (4:slave@Ginette) "Task" done
-> [ 11.553392] (5:slave@Bourassa) "Task" done
-> [ 20.524632] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
-> [ 30.524632] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
-> [ 30.524632] (1:master@Tremblay) Mmh. Something went wrong with 'Ginette'. Nevermind. Let's keep going!
-> [ 30.524632] (4:slave@Ginette) Mmh. Something went wrong. Nevermind. Let's keep going!
-> [ 30.740505] (1:master@Tremblay) Send completed
-> [ 30.740505] (5:slave@Bourassa) Received "Task"
-> [ 30.740505] (5:slave@Bourassa) Communication time : "0.215872"
-> [ 30.740505] (5:slave@Bourassa) Processing "Task"
-> [ 30.742843] (1:master@Tremblay) Send completed
-> [ 30.742843] (2:slave@Tremblay) Received "Task"
-> [ 30.742843] (2:slave@Tremblay) Communication time : "0.002339"
-> [ 30.742843] (2:slave@Tremblay) Processing "Task"
-> [ 31.252553] (2:slave@Tremblay) "Task" done
-> [ 31.771603] (5:slave@Bourassa) "Task" done
-> [ 40.742843] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
-> [ 50.742843] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
-> [ 50.883303] (1:master@Tremblay) Send completed
-> [ 50.883303] (4:slave@Ginette) Received "Task"
-> [ 50.883303] (4:slave@Ginette) Communication time : "0.140460"
-> [ 50.883303] (4:slave@Ginette) Processing "Task"
-> [ 51.099175] (1:master@Tremblay) Send completed
-> [ 51.099175] (5:slave@Bourassa) Received "Task"
-> [ 51.099175] (5:slave@Bourassa) Communication time : "0.215872"
-> [ 51.099175] (5:slave@Bourassa) Processing "Task"
-> [ 51.101514] (1:master@Tremblay) Send completed
-> [ 51.101514] (2:slave@Tremblay) Received "Task"
-> [ 51.101514] (2:slave@Tremblay) Communication time : "0.002339"
-> [ 51.101514] (2:slave@Tremblay) Processing "Task"
-> [ 51.611224] (2:slave@Tremblay) "Task" done
-> [ 51.914401] (4:slave@Ginette) "Task" done
-> [ 52.130273] (5:slave@Bourassa) "Task" done
-> [ 61.101514] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
-> [ 71.101514] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
-> [ 71.241973] (1:master@Tremblay) Send completed
-> [ 71.241973] (4:slave@Ginette) Received "Task"
-> [ 71.241973] (4:slave@Ginette) Communication time : "0.140460"
-> [ 71.241973] (4:slave@Ginette) Processing "Task"
-> [ 71.457846] (1:master@Tremblay) Send completed
-> [ 71.457846] (5:slave@Bourassa) Received "Task"
-> [ 71.457846] (5:slave@Bourassa) Communication time : "0.215872"
-> [ 71.457846] (5:slave@Bourassa) Processing "Task"
-> [ 71.460184] (1:master@Tremblay) Send completed
-> [ 71.460184] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [ 71.460184] (2:slave@Tremblay) Received "Task"
-> [ 71.460184] (2:slave@Tremblay) Communication time : "0.002339"
-> [ 71.460184] (2:slave@Tremblay) Processing "Task"
-> [ 71.969894] (2:slave@Tremblay) "Task" done
-> [ 72.273071] (4:slave@Ginette) "Task" done
-> [ 72.460184] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
-> [ 72.488944] (5:slave@Bourassa) "Task" done
-> [ 73.460184] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
-> [ 73.473416] (4:slave@Ginette) Received "finalize"
-> [ 73.473416] (4:slave@Ginette) I'm done. See you!
-> [ 73.493752] (5:slave@Bourassa) Received "finalize"
-> [ 73.493752] (5:slave@Bourassa) I'm done. See you!
-> [ 73.493908] (0:maestro@) Simulation time 73.4939
-> [ 73.493908] (1:master@Tremblay) Goodbye now!
-> [ 73.493908] (2:slave@Tremblay) Received "finalize"
-> [ 73.493908] (2:slave@Tremblay) I'm done. See you!
-
-p Testing the bypassing of the flexml parser
-
-! output sort 19
-$ $SG_TEST_EXENV ${bindir:=.}/masterslave_bypass --log=no_loc --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] (0:maestro@) Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code.
-> [  0.000000] (1:master@host A) Got 1 slave(s) :
-> [  0.000000] (1:master@host A)        host B
-> [  0.000000] (1:master@host A) Got 20 task to process :
-> [  0.000000] (1:master@host A)       "Task_0"
-> [  0.000000] (1:master@host A)       "Task_1"
-> [  0.000000] (1:master@host A)       "Task_2"
-> [  0.000000] (1:master@host A)       "Task_3"
-> [  0.000000] (1:master@host A)       "Task_4"
-> [  0.000000] (1:master@host A)       "Task_5"
-> [  0.000000] (1:master@host A)       "Task_6"
-> [  0.000000] (1:master@host A)       "Task_7"
-> [  0.000000] (1:master@host A)       "Task_8"
-> [  0.000000] (1:master@host A)       "Task_9"
-> [  0.000000] (1:master@host A)       "Task_10"
-> [  0.000000] (1:master@host A)       "Task_11"
-> [  0.000000] (1:master@host A)       "Task_12"
-> [  0.000000] (1:master@host A)       "Task_13"
-> [  0.000000] (1:master@host A)       "Task_14"
-> [  0.000000] (1:master@host A)       "Task_15"
-> [  0.000000] (1:master@host A)       "Task_16"
-> [  0.000000] (1:master@host A)       "Task_17"
-> [  0.000000] (1:master@host A)       "Task_18"
-> [  0.000000] (1:master@host A)       "Task_19"
-> [  0.000000] (1:master@host A) Sending "Task_0" to "host B"
-> [  0.000000] (2:slave@host B) I'm a slave
-> [  4.080000] (1:master@host A) Send completed
-> [  4.080000] (1:master@host A) Sending "Task_1" to "host B"
-> [  4.080000] (2:slave@host B) Received "Task_0"
-> [  4.080000] (2:slave@host B) Processing "Task_0"
-> [  4.130000] (2:slave@host B) "Task_0" done
-> [  8.210000] (1:master@host A) Send completed
-> [  8.210000] (1:master@host A) Sending "Task_2" to "host B"
-> [  8.210000] (2:slave@host B) Received "Task_1"
-> [  8.210000] (2:slave@host B) Processing "Task_1"
-> [  8.260000] (2:slave@host B) "Task_1" done
-> [ 12.340000] (1:master@host A) Send completed
-> [ 12.340000] (1:master@host A) Sending "Task_3" to "host B"
-> [ 12.340000] (2:slave@host B) Received "Task_2"
-> [ 12.340000] (2:slave@host B) Processing "Task_2"
-> [ 12.390000] (2:slave@host B) "Task_2" done
-> [ 16.470000] (1:master@host A) Send completed
-> [ 16.470000] (1:master@host A) Sending "Task_4" to "host B"
-> [ 16.470000] (2:slave@host B) Received "Task_3"
-> [ 16.470000] (2:slave@host B) Processing "Task_3"
-> [ 16.520000] (2:slave@host B) "Task_3" done
-> [ 20.600000] (1:master@host A) Send completed
-> [ 20.600000] (1:master@host A) Sending "Task_5" to "host B"
-> [ 20.600000] (2:slave@host B) Received "Task_4"
-> [ 20.600000] (2:slave@host B) Processing "Task_4"
-> [ 20.650000] (2:slave@host B) "Task_4" done
-> [ 24.730000] (1:master@host A) Send completed
-> [ 24.730000] (1:master@host A) Sending "Task_6" to "host B"
-> [ 24.730000] (2:slave@host B) Received "Task_5"
-> [ 24.730000] (2:slave@host B) Processing "Task_5"
-> [ 24.780000] (2:slave@host B) "Task_5" done
-> [ 28.860000] (1:master@host A) Send completed
-> [ 28.860000] (1:master@host A) Sending "Task_7" to "host B"
-> [ 28.860000] (2:slave@host B) Received "Task_6"
-> [ 28.860000] (2:slave@host B) Processing "Task_6"
-> [ 28.910000] (2:slave@host B) "Task_6" done
-> [ 32.990000] (1:master@host A) Send completed
-> [ 32.990000] (1:master@host A) Sending "Task_8" to "host B"
-> [ 32.990000] (2:slave@host B) Received "Task_7"
-> [ 32.990000] (2:slave@host B) Processing "Task_7"
-> [ 33.040000] (2:slave@host B) "Task_7" done
-> [ 37.120000] (1:master@host A) Send completed
-> [ 37.120000] (1:master@host A) Sending "Task_9" to "host B"
-> [ 37.120000] (2:slave@host B) Received "Task_8"
-> [ 37.120000] (2:slave@host B) Processing "Task_8"
-> [ 37.170000] (2:slave@host B) "Task_8" done
-> [ 41.250000] (1:master@host A) Send completed
-> [ 41.250000] (1:master@host A) Sending "Task_10" to "host B"
-> [ 41.250000] (2:slave@host B) Received "Task_9"
-> [ 41.250000] (2:slave@host B) Processing "Task_9"
-> [ 41.300000] (2:slave@host B) "Task_9" done
-> [ 45.380000] (1:master@host A) Send completed
-> [ 45.380000] (1:master@host A) Sending "Task_11" to "host B"
-> [ 45.380000] (2:slave@host B) Received "Task_10"
-> [ 45.380000] (2:slave@host B) Processing "Task_10"
-> [ 45.430000] (2:slave@host B) "Task_10" done
-> [ 49.510000] (1:master@host A) Send completed
-> [ 49.510000] (1:master@host A) Sending "Task_12" to "host B"
-> [ 49.510000] (2:slave@host B) Received "Task_11"
-> [ 49.510000] (2:slave@host B) Processing "Task_11"
-> [ 49.560000] (2:slave@host B) "Task_11" done
-> [ 53.640000] (1:master@host A) Send completed
-> [ 53.640000] (1:master@host A) Sending "Task_13" to "host B"
-> [ 53.640000] (2:slave@host B) Received "Task_12"
-> [ 53.640000] (2:slave@host B) Processing "Task_12"
-> [ 53.690000] (2:slave@host B) "Task_12" done
-> [ 57.770000] (1:master@host A) Send completed
-> [ 57.770000] (1:master@host A) Sending "Task_14" to "host B"
-> [ 57.770000] (2:slave@host B) Received "Task_13"
-> [ 57.770000] (2:slave@host B) Processing "Task_13"
-> [ 57.820000] (2:slave@host B) "Task_13" done
-> [ 61.900000] (1:master@host A) Send completed
-> [ 61.900000] (1:master@host A) Sending "Task_15" to "host B"
-> [ 61.900000] (2:slave@host B) Received "Task_14"
-> [ 61.900000] (2:slave@host B) Processing "Task_14"
-> [ 61.950000] (2:slave@host B) "Task_14" done
-> [ 66.030000] (1:master@host A) Send completed
-> [ 66.030000] (1:master@host A) Sending "Task_16" to "host B"
-> [ 66.030000] (2:slave@host B) Received "Task_15"
-> [ 66.030000] (2:slave@host B) Processing "Task_15"
-> [ 66.080000] (2:slave@host B) "Task_15" done
-> [ 70.160000] (1:master@host A) Send completed
-> [ 70.160000] (1:master@host A) Sending "Task_17" to "host B"
-> [ 70.160000] (2:slave@host B) Received "Task_16"
-> [ 70.160000] (2:slave@host B) Processing "Task_16"
-> [ 70.210000] (2:slave@host B) "Task_16" done
-> [ 74.290000] (1:master@host A) Send completed
-> [ 74.290000] (1:master@host A) Sending "Task_18" to "host B"
-> [ 74.290000] (2:slave@host B) Received "Task_17"
-> [ 74.290000] (2:slave@host B) Processing "Task_17"
-> [ 74.340000] (2:slave@host B) "Task_17" done
-> [ 78.420000] (1:master@host A) Send completed
-> [ 78.420000] (1:master@host A) Sending "Task_19" to "host B"
-> [ 78.420000] (2:slave@host B) Received "Task_18"
-> [ 78.420000] (2:slave@host B) Processing "Task_18"
-> [ 78.470000] (2:slave@host B) "Task_18" done
-> [ 82.550000] (1:master@host A) Send completed
-> [ 82.550000] (1:master@host A) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [ 82.550000] (2:slave@host B) Received "Task_19"
-> [ 82.550000] (2:slave@host B) Processing "Task_19"
-> [ 82.600000] (2:slave@host B) "Task_19" done
-> [ 84.680000] (0:maestro@) Simulation time 84.68
-> [ 84.680000] (1:master@host A) Goodbye now!
-> [ 84.680000] (2:slave@host B) Received "finalize"
-> [ 84.680000] (2:slave@host B) I'm done. See you!
diff --git a/examples/msg/masterslave/masterslave_cpu_ti_crosstraffic.tesh b/examples/msg/masterslave/masterslave_cpu_ti_crosstraffic.tesh
deleted file mode 100644 (file)
index b3e8b1d..0000000
+++ /dev/null
@@ -1,276 +0,0 @@
-#! ./tesh
-
-p Testing a simple master/slave example application
-
-! output sort 19
-$ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml masterslave/deployment_masterslave.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 master/slave example application with a forwarder module
-
-! output sort 19
-$ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platforms/platform.xml masterslave/deployment_masterslave_forwarder.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@Jacquelin) Got 5 slaves and 20 tasks to process
-> [  0.000000] (1:master@Jacquelin) Sending "Task_0" to "iRMX"
-> [  3.222579] (1:master@Jacquelin) Sent
-> [  3.222579] (1:master@Jacquelin) Sending "Task_1" to "Casavant"
-> [  3.222579] (4:slave@iRMX) Received "Task_0"
-> [  3.222579] (4:slave@iRMX) Processing "Task_0"
-> [  3.295394] (4:slave@iRMX) "Task_0" done
-> [  4.648793] (1:master@Jacquelin) Sent
-> [  4.648793] (1:master@Jacquelin) Sending "Task_2" to "Bousquet"
-> [  4.648793] (3:forwarder@Casavant) Received "Task_1"
-> [  4.648793] (3:forwarder@Casavant) Sending "Task_1" to "Robert"
-> [  5.858161] (1:master@Jacquelin) Sent
-> [  5.858161] (1:master@Jacquelin) Sending "Task_3" to "Soucy"
-> [  5.858161] (5:slave@Bousquet) Received "Task_2"
-> [  5.858161] (5:slave@Bousquet) Processing "Task_2"
-> [  5.974665] (5:slave@Bousquet) "Task_2" done
-> [  6.227754] (10:slave@Robert) Received "Task_1"
-> [  6.227754] (10:slave@Robert) Processing "Task_1"
-> [  6.264162] (10:slave@Robert) "Task_1" done
-> [  7.375604] (1:master@Jacquelin) Sent
-> [  7.375604] (1:master@Jacquelin) Sending "Task_4" to "Jackson"
-> [  7.375604] (6:slave@Soucy) Received "Task_3"
-> [  7.375604] (6:slave@Soucy) Processing "Task_3"
-> [  7.412012] (6:slave@Soucy) "Task_3" done
-> [  8.268969] (1:master@Jacquelin) Sent
-> [  8.268969] (1:master@Jacquelin) Sending "Task_5" to "iRMX"
-> [  8.268969] (2:forwarder@Jackson) Received "Task_4"
-> [  8.268969] (2:forwarder@Jackson) Sending "Task_4" to "Kuenning"
-> [  8.353439] (7:slave@Kuenning) Received "Task_4"
-> [  8.353439] (7:slave@Kuenning) Processing "Task_4"
-> [  8.411691] (7:slave@Kuenning) "Task_4" done
-> [ 11.491547] (1:master@Jacquelin) Sent
-> [ 11.491547] (1:master@Jacquelin) Sending "Task_6" to "Casavant"
-> [ 11.491547] (4:slave@iRMX) Received "Task_5"
-> [ 11.491547] (4:slave@iRMX) Processing "Task_5"
-> [ 11.564363] (4:slave@iRMX) "Task_5" done
-> [ 12.917761] (1:master@Jacquelin) Sent
-> [ 12.917761] (1:master@Jacquelin) Sending "Task_7" to "Bousquet"
-> [ 12.917761] (3:forwarder@Casavant) Received "Task_6"
-> [ 12.917761] (3:forwarder@Casavant) Sending "Task_6" to "Sirois"
-> [ 13.503436] (11:slave@Sirois) Received "Task_6"
-> [ 13.503436] (11:slave@Sirois) Processing "Task_6"
-> [ 13.547126] (11:slave@Sirois) "Task_6" done
-> [ 14.127129] (1:master@Jacquelin) Sent
-> [ 14.127129] (1:master@Jacquelin) Sending "Task_8" to "Soucy"
-> [ 14.127129] (5:slave@Bousquet) Received "Task_7"
-> [ 14.127129] (5:slave@Bousquet) Processing "Task_7"
-> [ 14.243633] (5:slave@Bousquet) "Task_7" done
-> [ 15.644572] (1:master@Jacquelin) Sent
-> [ 15.644572] (1:master@Jacquelin) Sending "Task_9" to "Jackson"
-> [ 15.644572] (6:slave@Soucy) Received "Task_8"
-> [ 15.644572] (6:slave@Soucy) Processing "Task_8"
-> [ 15.680980] (6:slave@Soucy) "Task_8" done
-> [ 16.537937] (1:master@Jacquelin) Sent
-> [ 16.537937] (1:master@Jacquelin) Sending "Task_10" to "iRMX"
-> [ 16.537937] (2:forwarder@Jackson) Received "Task_9"
-> [ 16.537937] (2:forwarder@Jackson) Sending "Task_9" to "Browne"
-> [ 18.357416] (8:slave@Browne) Received "Task_9"
-> [ 18.357416] (8:slave@Browne) Processing "Task_9"
-> [ 18.393824] (8:slave@Browne) "Task_9" done
-> [ 19.760516] (1:master@Jacquelin) Sent
-> [ 19.760516] (1:master@Jacquelin) Sending "Task_11" to "Casavant"
-> [ 19.760516] (4:slave@iRMX) Received "Task_10"
-> [ 19.760516] (4:slave@iRMX) Processing "Task_10"
-> [ 19.833331] (4:slave@iRMX) "Task_10" done
-> [ 21.186730] (1:master@Jacquelin) Sent
-> [ 21.186730] (1:master@Jacquelin) Sending "Task_12" to "Bousquet"
-> [ 21.186730] (3:forwarder@Casavant) Received "Task_11"
-> [ 21.186730] (3:forwarder@Casavant) Sending "Task_11" to "Monique"
-> [ 22.143422] (12:slave@Monique) Received "Task_11"
-> [ 22.143422] (12:slave@Monique) Processing "Task_11"
-> [ 22.187111] (12:slave@Monique) "Task_11" done
-> [ 22.396098] (1:master@Jacquelin) Sent
-> [ 22.396098] (1:master@Jacquelin) Sending "Task_13" to "Soucy"
-> [ 22.396098] (5:slave@Bousquet) Received "Task_12"
-> [ 22.396098] (5:slave@Bousquet) Processing "Task_12"
-> [ 22.512602] (5:slave@Bousquet) "Task_12" done
-> [ 23.913541] (1:master@Jacquelin) Sent
-> [ 23.913541] (1:master@Jacquelin) Sending "Task_14" to "Jackson"
-> [ 23.913541] (6:slave@Soucy) Received "Task_13"
-> [ 23.913541] (6:slave@Soucy) Processing "Task_13"
-> [ 23.949949] (6:slave@Soucy) "Task_13" done
-> [ 24.806906] (1:master@Jacquelin) Sent
-> [ 24.806906] (1:master@Jacquelin) Sending "Task_15" to "iRMX"
-> [ 24.806906] (2:forwarder@Jackson) Received "Task_14"
-> [ 24.806906] (2:forwarder@Jackson) Sending "Task_14" to "Stephen"
-> [ 27.882486] (9:slave@Stephen) Received "Task_14"
-> [ 27.882486] (9:slave@Stephen) Processing "Task_14"
-> [ 27.955301] (9:slave@Stephen) "Task_14" done
-> [ 28.029484] (1:master@Jacquelin) Sent
-> [ 28.029484] (1:master@Jacquelin) Sending "Task_16" to "Casavant"
-> [ 28.029484] (4:slave@iRMX) Received "Task_15"
-> [ 28.029484] (4:slave@iRMX) Processing "Task_15"
-> [ 28.102300] (4:slave@iRMX) "Task_15" done
-> [ 29.455698] (1:master@Jacquelin) Sent
-> [ 29.455698] (1:master@Jacquelin) Sending "Task_17" to "Bousquet"
-> [ 29.455698] (3:forwarder@Casavant) Received "Task_16"
-> [ 29.455698] (3:forwarder@Casavant) Sending "Task_16" to "Robert"
-> [ 30.665066] (1:master@Jacquelin) Sent
-> [ 30.665066] (1:master@Jacquelin) Sending "Task_18" to "Soucy"
-> [ 30.665066] (5:slave@Bousquet) Received "Task_17"
-> [ 30.665066] (5:slave@Bousquet) Processing "Task_17"
-> [ 30.781570] (5:slave@Bousquet) "Task_17" done
-> [ 31.034660] (10:slave@Robert) Received "Task_16"
-> [ 31.034660] (10:slave@Robert) Processing "Task_16"
-> [ 31.071067] (10:slave@Robert) "Task_16" done
-> [ 32.182509] (1:master@Jacquelin) Sent
-> [ 32.182509] (1:master@Jacquelin) Sending "Task_19" to "Jackson"
-> [ 32.182509] (6:slave@Soucy) Received "Task_18"
-> [ 32.182509] (6:slave@Soucy) Processing "Task_18"
-> [ 32.218917] (6:slave@Soucy) "Task_18" done
-> [ 33.075874] (1:master@Jacquelin) Sent
-> [ 33.075874] (1:master@Jacquelin) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [ 33.075874] (2:forwarder@Jackson) Received "Task_19"
-> [ 33.075874] (2:forwarder@Jackson) Sending "Task_19" to "Kuenning"
-> [ 33.160344] (7:slave@Kuenning) Received "Task_19"
-> [ 33.160344] (7:slave@Kuenning) Processing "Task_19"
-> [ 33.218597] (7:slave@Kuenning) "Task_19" done
-> [ 36.119532] (4:slave@iRMX) Received "finalize"
-> [ 36.119532] (4:slave@iRMX) I'm done. See you!
-> [ 37.476539] (3:forwarder@Casavant) Received "finalize"
-> [ 37.476539] (3:forwarder@Casavant) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [ 38.491217] (5:slave@Bousquet) Received "finalize"
-> [ 38.491217] (5:slave@Bousquet) I'm done. See you!
-> [ 38.981743] (10:slave@Robert) Received "finalize"
-> [ 38.981743] (10:slave@Robert) I'm done. See you!
-> [ 39.493662] (11:slave@Sirois) Received "finalize"
-> [ 39.493662] (11:slave@Sirois) I'm done. See you!
-> [ 39.934903] (6:slave@Soucy) Received "finalize"
-> [ 39.934903] (6:slave@Soucy) I'm done. See you!
-> [ 40.381147] (12:slave@Monique) Received "finalize"
-> [ 40.381147] (12:slave@Monique) I'm done. See you!
-> [ 40.381147] (3:forwarder@Casavant) I'm done. See you!
-> [ 40.786367] (1:master@Jacquelin) Goodbye now!
-> [ 40.786367] (2:forwarder@Jackson) Received "finalize"
-> [ 40.786367] (2:forwarder@Jackson) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [ 40.792212] (7:slave@Kuenning) Received "finalize"
-> [ 40.792212] (7:slave@Kuenning) I'm done. See you!
-> [ 42.596677] (8:slave@Browne) Received "finalize"
-> [ 42.596677] (8:slave@Browne) I'm done. See you!
-> [ 45.299152] (0:maestro@) Simulation time 45.2992
-> [ 45.299152] (2:forwarder@Jackson) I'm done. See you!
-> [ 45.299152] (9:slave@Stephen) Received "finalize"
-> [ 45.299152] (9:slave@Stephen) I'm done. See you!
diff --git a/examples/msg/masterslave/masterslave_crosstraffic.tesh b/examples/msg/masterslave/masterslave_crosstraffic.tesh
deleted file mode 100644 (file)
index 4f38eb4..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-#! ./tesh
-
-p Testing a simple master/slave example application
-
-$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platforms/small_platform_with_routers.xml ${srcdir:=.}/masterslave/deployment_masterslave.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_forwarder.tesh b/examples/msg/masterslave/masterslave_forwarder.tesh
deleted file mode 100644 (file)
index 65f5eb9..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-#! ./tesh
-
-p Testing a master/slave example application with a forwarder module
-
-! output sort 19
-$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platforms/platform.xml ${srcdir:=.}/masterslave/deployment_masterslave_forwarder.xml --cfg=network/crosstraffic:0 "--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@Jacquelin) Got 5 slaves and 20 tasks to process
-> [  0.000000] (1:master@Jacquelin) Sending "Task_0" to "iRMX"
-> [  3.214059] (1:master@Jacquelin) Sent
-> [  3.214059] (1:master@Jacquelin) Sending "Task_1" to "Casavant"
-> [  3.214059] (4:slave@iRMX) Received "Task_0"
-> [  3.214059] (4:slave@iRMX) Processing "Task_0"
-> [  3.286874] (4:slave@iRMX) "Task_0" done
-> [  4.636977] (1:master@Jacquelin) Sent
-> [  4.636977] (1:master@Jacquelin) Sending "Task_2" to "Bousquet"
-> [  4.636977] (3:forwarder@Casavant) Received "Task_1"
-> [  4.636977] (3:forwarder@Casavant) Sending "Task_1" to "Robert"
-> [  5.837074] (1:master@Jacquelin) Sent
-> [  5.837074] (1:master@Jacquelin) Sending "Task_3" to "Soucy"
-> [  5.837074] (5:slave@Bousquet) Received "Task_2"
-> [  5.837074] (5:slave@Bousquet) Processing "Task_2"
-> [  5.953578] (5:slave@Bousquet) "Task_2" done
-> [  6.212426] (10:slave@Robert) Received "Task_1"
-> [  6.212426] (10:slave@Robert) Processing "Task_1"
-> [  6.248834] (10:slave@Robert) "Task_1" done
-> [  7.351005] (1:master@Jacquelin) Sent
-> [  7.351005] (1:master@Jacquelin) Sending "Task_4" to "Jackson"
-> [  7.351005] (6:slave@Soucy) Received "Task_3"
-> [  7.351005] (6:slave@Soucy) Processing "Task_3"
-> [  7.387413] (6:slave@Soucy) "Task_3" done
-> [  8.242374] (1:master@Jacquelin) Sent
-> [  8.242374] (1:master@Jacquelin) Sending "Task_5" to "iRMX"
-> [  8.242374] (2:forwarder@Jackson) Received "Task_4"
-> [  8.242374] (2:forwarder@Jackson) Sending "Task_4" to "Kuenning"
-> [  8.323101] (7:slave@Kuenning) Received "Task_4"
-> [  8.323101] (7:slave@Kuenning) Processing "Task_4"
-> [  8.381353] (7:slave@Kuenning) "Task_4" done
-> [ 11.456433] (1:master@Jacquelin) Sent
-> [ 11.456433] (1:master@Jacquelin) Sending "Task_6" to "Casavant"
-> [ 11.456433] (4:slave@iRMX) Received "Task_5"
-> [ 11.456433] (4:slave@iRMX) Processing "Task_5"
-> [ 11.529248] (4:slave@iRMX) "Task_5" done
-> [ 12.879351] (1:master@Jacquelin) Sent
-> [ 12.879351] (1:master@Jacquelin) Sending "Task_7" to "Bousquet"
-> [ 12.879351] (3:forwarder@Casavant) Received "Task_6"
-> [ 12.879351] (3:forwarder@Casavant) Sending "Task_6" to "Sirois"
-> [ 13.461514] (11:slave@Sirois) Received "Task_6"
-> [ 13.461514] (11:slave@Sirois) Processing "Task_6"
-> [ 13.505204] (11:slave@Sirois) "Task_6" done
-> [ 14.079449] (1:master@Jacquelin) Sent
-> [ 14.079449] (1:master@Jacquelin) Sending "Task_8" to "Soucy"
-> [ 14.079449] (5:slave@Bousquet) Received "Task_7"
-> [ 14.079449] (5:slave@Bousquet) Processing "Task_7"
-> [ 14.195953] (5:slave@Bousquet) "Task_7" done
-> [ 15.593379] (1:master@Jacquelin) Sent
-> [ 15.593379] (1:master@Jacquelin) Sending "Task_9" to "Jackson"
-> [ 15.593379] (6:slave@Soucy) Received "Task_8"
-> [ 15.593379] (6:slave@Soucy) Processing "Task_8"
-> [ 15.629787] (6:slave@Soucy) "Task_8" done
-> [ 16.484749] (1:master@Jacquelin) Sent
-> [ 16.484749] (1:master@Jacquelin) Sending "Task_10" to "iRMX"
-> [ 16.484749] (2:forwarder@Jackson) Received "Task_9"
-> [ 16.484749] (2:forwarder@Jackson) Sending "Task_9" to "Browne"
-> [ 18.303513] (8:slave@Browne) Received "Task_9"
-> [ 18.303513] (8:slave@Browne) Processing "Task_9"
-> [ 18.339921] (8:slave@Browne) "Task_9" done
-> [ 19.698808] (1:master@Jacquelin) Sent
-> [ 19.698808] (1:master@Jacquelin) Sending "Task_11" to "Casavant"
-> [ 19.698808] (4:slave@iRMX) Received "Task_10"
-> [ 19.698808] (4:slave@iRMX) Processing "Task_10"
-> [ 19.771623] (4:slave@iRMX) "Task_10" done
-> [ 21.121726] (1:master@Jacquelin) Sent
-> [ 21.121726] (1:master@Jacquelin) Sending "Task_12" to "Bousquet"
-> [ 21.121726] (3:forwarder@Casavant) Received "Task_11"
-> [ 21.121726] (3:forwarder@Casavant) Sending "Task_11" to "Monique"
-> [ 22.075122] (12:slave@Monique) Received "Task_11"
-> [ 22.075122] (12:slave@Monique) Processing "Task_11"
-> [ 22.118812] (12:slave@Monique) "Task_11" done
-> [ 22.321823] (1:master@Jacquelin) Sent
-> [ 22.321823] (1:master@Jacquelin) Sending "Task_13" to "Soucy"
-> [ 22.321823] (5:slave@Bousquet) Received "Task_12"
-> [ 22.321823] (5:slave@Bousquet) Processing "Task_12"
-> [ 22.438327] (5:slave@Bousquet) "Task_12" done
-> [ 23.835754] (1:master@Jacquelin) Sent
-> [ 23.835754] (1:master@Jacquelin) Sending "Task_14" to "Jackson"
-> [ 23.835754] (6:slave@Soucy) Received "Task_13"
-> [ 23.835754] (6:slave@Soucy) Processing "Task_13"
-> [ 23.872162] (6:slave@Soucy) "Task_13" done
-> [ 24.727123] (1:master@Jacquelin) Sent
-> [ 24.727123] (1:master@Jacquelin) Sending "Task_15" to "iRMX"
-> [ 24.727123] (2:forwarder@Jackson) Received "Task_14"
-> [ 24.727123] (2:forwarder@Jackson) Sending "Task_14" to "Stephen"
-> [ 27.784937] (9:slave@Stephen) Received "Task_14"
-> [ 27.784937] (9:slave@Stephen) Processing "Task_14"
-> [ 27.857752] (9:slave@Stephen) "Task_14" done
-> [ 27.941182] (1:master@Jacquelin) Sent
-> [ 27.941182] (1:master@Jacquelin) Sending "Task_16" to "Casavant"
-> [ 27.941182] (4:slave@iRMX) Received "Task_15"
-> [ 27.941182] (4:slave@iRMX) Processing "Task_15"
-> [ 28.013997] (4:slave@iRMX) "Task_15" done
-> [ 29.364100] (1:master@Jacquelin) Sent
-> [ 29.364100] (1:master@Jacquelin) Sending "Task_17" to "Bousquet"
-> [ 29.364100] (3:forwarder@Casavant) Received "Task_16"
-> [ 29.364100] (3:forwarder@Casavant) Sending "Task_16" to "Robert"
-> [ 30.564197] (1:master@Jacquelin) Sent
-> [ 30.564197] (1:master@Jacquelin) Sending "Task_18" to "Soucy"
-> [ 30.564197] (5:slave@Bousquet) Received "Task_17"
-> [ 30.564197] (5:slave@Bousquet) Processing "Task_17"
-> [ 30.680701] (5:slave@Bousquet) "Task_17" done
-> [ 30.939549] (10:slave@Robert) Received "Task_16"
-> [ 30.939549] (10:slave@Robert) Processing "Task_16"
-> [ 30.975957] (10:slave@Robert) "Task_16" done
-> [ 32.078128] (1:master@Jacquelin) Sent
-> [ 32.078128] (1:master@Jacquelin) Sending "Task_19" to "Jackson"
-> [ 32.078128] (6:slave@Soucy) Received "Task_18"
-> [ 32.078128] (6:slave@Soucy) Processing "Task_18"
-> [ 32.114536] (6:slave@Soucy) "Task_18" done
-> [ 32.969498] (1:master@Jacquelin) Sent
-> [ 32.969498] (1:master@Jacquelin) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [ 32.969498] (2:forwarder@Jackson) Received "Task_19"
-> [ 32.969498] (2:forwarder@Jackson) Sending "Task_19" to "Kuenning"
-> [ 33.050224] (7:slave@Kuenning) Received "Task_19"
-> [ 33.050224] (7:slave@Kuenning) Processing "Task_19"
-> [ 33.108477] (7:slave@Kuenning) "Task_19" done
-> [ 36.013155] (4:slave@iRMX) Received "finalize"
-> [ 36.013155] (4:slave@iRMX) I'm done. See you!
-> [ 37.370163] (3:forwarder@Casavant) Received "finalize"
-> [ 37.370163] (3:forwarder@Casavant) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [ 38.384841] (5:slave@Bousquet) Received "finalize"
-> [ 38.384841] (5:slave@Bousquet) I'm done. See you!
-> [ 38.875367] (10:slave@Robert) Received "finalize"
-> [ 38.875367] (10:slave@Robert) I'm done. See you!
-> [ 39.387285] (11:slave@Sirois) Received "finalize"
-> [ 39.387285] (11:slave@Sirois) I'm done. See you!
-> [ 39.828527] (6:slave@Soucy) Received "finalize"
-> [ 39.828527] (6:slave@Soucy) I'm done. See you!
-> [ 40.274771] (12:slave@Monique) Received "finalize"
-> [ 40.274771] (12:slave@Monique) I'm done. See you!
-> [ 40.274771] (3:forwarder@Casavant) I'm done. See you!
-> [ 40.679990] (1:master@Jacquelin) Goodbye now!
-> [ 40.679990] (2:forwarder@Jackson) Received "finalize"
-> [ 40.679990] (2:forwarder@Jackson) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [ 40.685835] (7:slave@Kuenning) Received "finalize"
-> [ 40.685835] (7:slave@Kuenning) I'm done. See you!
-> [ 42.490301] (8:slave@Browne) Received "finalize"
-> [ 42.490301] (8:slave@Browne) I'm done. See you!
-> [ 45.192775] (0:maestro@) Simulation time 45.1928
-> [ 45.192775] (2:forwarder@Jackson) I'm done. See you!
-> [ 45.192775] (9:slave@Stephen) Received "finalize"
-> [ 45.192775] (9:slave@Stephen) I'm done. See you!
diff --git a/examples/msg/masterslave/masterslave_forwarder_crosstraffic.tesh b/examples/msg/masterslave/masterslave_forwarder_crosstraffic.tesh
deleted file mode 100644 (file)
index fb4202d..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-#! ./tesh
-
-p Testing a master/slave example application with a forwarder module
-
-$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platforms/platform.xml ${srcdir:=.}/masterslave/deployment_masterslave_forwarder.xml  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (1:master@Jacquelin) Got 5 slaves and 20 tasks to process
-> [  0.000000] (1:master@Jacquelin) Sending "Task_0" to "iRMX"
-> [  3.222579] (4:slave@iRMX) Received "Task_0"
-> [  3.222579] (4:slave@iRMX) Processing "Task_0"
-> [  3.222579] (1:master@Jacquelin) Sent
-> [  3.222579] (1:master@Jacquelin) Sending "Task_1" to "Casavant"
-> [  3.295394] (4:slave@iRMX) "Task_0" done
-> [  4.648793] (3:forwarder@Casavant) Received "Task_1"
-> [  4.648793] (3:forwarder@Casavant) Sending "Task_1" to "Robert"
-> [  4.648793] (1:master@Jacquelin) Sent
-> [  4.648793] (1:master@Jacquelin) Sending "Task_2" to "Bousquet"
-> [  5.858161] (5:slave@Bousquet) Received "Task_2"
-> [  5.858161] (5:slave@Bousquet) Processing "Task_2"
-> [  5.858161] (1:master@Jacquelin) Sent
-> [  5.858161] (1:master@Jacquelin) Sending "Task_3" to "Soucy"
-> [  5.974665] (5:slave@Bousquet) "Task_2" done
-> [  6.227754] (10:slave@Robert) Received "Task_1"
-> [  6.227754] (10:slave@Robert) Processing "Task_1"
-> [  6.264162] (10:slave@Robert) "Task_1" done
-> [  7.375604] (6:slave@Soucy) Received "Task_3"
-> [  7.375604] (6:slave@Soucy) Processing "Task_3"
-> [  7.375604] (1:master@Jacquelin) Sent
-> [  7.375604] (1:master@Jacquelin) Sending "Task_4" to "Jackson"
-> [  7.412012] (6:slave@Soucy) "Task_3" done
-> [  8.268969] (2:forwarder@Jackson) Received "Task_4"
-> [  8.268969] (2:forwarder@Jackson) Sending "Task_4" to "Kuenning"
-> [  8.268969] (1:master@Jacquelin) Sent
-> [  8.268969] (1:master@Jacquelin) Sending "Task_5" to "iRMX"
-> [  8.353439] (7:slave@Kuenning) Received "Task_4"
-> [  8.353439] (7:slave@Kuenning) Processing "Task_4"
-> [  8.411691] (7:slave@Kuenning) "Task_4" done
-> [ 11.491547] (4:slave@iRMX) Received "Task_5"
-> [ 11.491547] (4:slave@iRMX) Processing "Task_5"
-> [ 11.491547] (1:master@Jacquelin) Sent
-> [ 11.491547] (1:master@Jacquelin) Sending "Task_6" to "Casavant"
-> [ 11.564363] (4:slave@iRMX) "Task_5" done
-> [ 12.917761] (3:forwarder@Casavant) Received "Task_6"
-> [ 12.917761] (3:forwarder@Casavant) Sending "Task_6" to "Sirois"
-> [ 12.917761] (1:master@Jacquelin) Sent
-> [ 12.917761] (1:master@Jacquelin) Sending "Task_7" to "Bousquet"
-> [ 13.503436] (11:slave@Sirois) Received "Task_6"
-> [ 13.503436] (11:slave@Sirois) Processing "Task_6"
-> [ 13.547126] (11:slave@Sirois) "Task_6" done
-> [ 14.127129] (5:slave@Bousquet) Received "Task_7"
-> [ 14.127129] (5:slave@Bousquet) Processing "Task_7"
-> [ 14.127129] (1:master@Jacquelin) Sent
-> [ 14.127129] (1:master@Jacquelin) Sending "Task_8" to "Soucy"
-> [ 14.243633] (5:slave@Bousquet) "Task_7" done
-> [ 15.644572] (6:slave@Soucy) Received "Task_8"
-> [ 15.644572] (6:slave@Soucy) Processing "Task_8"
-> [ 15.644572] (1:master@Jacquelin) Sent
-> [ 15.644572] (1:master@Jacquelin) Sending "Task_9" to "Jackson"
-> [ 15.680980] (6:slave@Soucy) "Task_8" done
-> [ 16.537937] (2:forwarder@Jackson) Received "Task_9"
-> [ 16.537937] (2:forwarder@Jackson) Sending "Task_9" to "Browne"
-> [ 16.537937] (1:master@Jacquelin) Sent
-> [ 16.537937] (1:master@Jacquelin) Sending "Task_10" to "iRMX"
-> [ 18.357416] (8:slave@Browne) Received "Task_9"
-> [ 18.357416] (8:slave@Browne) Processing "Task_9"
-> [ 18.393824] (8:slave@Browne) "Task_9" done
-> [ 19.760516] (4:slave@iRMX) Received "Task_10"
-> [ 19.760516] (4:slave@iRMX) Processing "Task_10"
-> [ 19.760516] (1:master@Jacquelin) Sent
-> [ 19.760516] (1:master@Jacquelin) Sending "Task_11" to "Casavant"
-> [ 19.833331] (4:slave@iRMX) "Task_10" done
-> [ 21.186730] (3:forwarder@Casavant) Received "Task_11"
-> [ 21.186730] (3:forwarder@Casavant) Sending "Task_11" to "Monique"
-> [ 21.186730] (1:master@Jacquelin) Sent
-> [ 21.186730] (1:master@Jacquelin) Sending "Task_12" to "Bousquet"
-> [ 22.143422] (12:slave@Monique) Received "Task_11"
-> [ 22.143422] (12:slave@Monique) Processing "Task_11"
-> [ 22.187111] (12:slave@Monique) "Task_11" done
-> [ 22.396098] (5:slave@Bousquet) Received "Task_12"
-> [ 22.396098] (5:slave@Bousquet) Processing "Task_12"
-> [ 22.396098] (1:master@Jacquelin) Sent
-> [ 22.396098] (1:master@Jacquelin) Sending "Task_13" to "Soucy"
-> [ 22.512602] (5:slave@Bousquet) "Task_12" done
-> [ 23.913541] (6:slave@Soucy) Received "Task_13"
-> [ 23.913541] (6:slave@Soucy) Processing "Task_13"
-> [ 23.913541] (1:master@Jacquelin) Sent
-> [ 23.913541] (1:master@Jacquelin) Sending "Task_14" to "Jackson"
-> [ 23.949949] (6:slave@Soucy) "Task_13" done
-> [ 24.806906] (2:forwarder@Jackson) Received "Task_14"
-> [ 24.806906] (2:forwarder@Jackson) Sending "Task_14" to "Stephen"
-> [ 24.806906] (1:master@Jacquelin) Sent
-> [ 24.806906] (1:master@Jacquelin) Sending "Task_15" to "iRMX"
-> [ 27.882486] (9:slave@Stephen) Received "Task_14"
-> [ 27.882486] (9:slave@Stephen) Processing "Task_14"
-> [ 27.955301] (9:slave@Stephen) "Task_14" done
-> [ 28.029484] (4:slave@iRMX) Received "Task_15"
-> [ 28.029484] (4:slave@iRMX) Processing "Task_15"
-> [ 28.029484] (1:master@Jacquelin) Sent
-> [ 28.029484] (1:master@Jacquelin) Sending "Task_16" to "Casavant"
-> [ 28.102300] (4:slave@iRMX) "Task_15" done
-> [ 29.455698] (3:forwarder@Casavant) Received "Task_16"
-> [ 29.455698] (3:forwarder@Casavant) Sending "Task_16" to "Robert"
-> [ 29.455698] (1:master@Jacquelin) Sent
-> [ 29.455698] (1:master@Jacquelin) Sending "Task_17" to "Bousquet"
-> [ 30.665066] (5:slave@Bousquet) Received "Task_17"
-> [ 30.665066] (5:slave@Bousquet) Processing "Task_17"
-> [ 30.665066] (1:master@Jacquelin) Sent
-> [ 30.665066] (1:master@Jacquelin) Sending "Task_18" to "Soucy"
-> [ 30.781570] (5:slave@Bousquet) "Task_17" done
-> [ 31.034660] (10:slave@Robert) Received "Task_16"
-> [ 31.034660] (10:slave@Robert) Processing "Task_16"
-> [ 31.071067] (10:slave@Robert) "Task_16" done
-> [ 32.182509] (6:slave@Soucy) Received "Task_18"
-> [ 32.182509] (6:slave@Soucy) Processing "Task_18"
-> [ 32.182509] (1:master@Jacquelin) Sent
-> [ 32.182509] (1:master@Jacquelin) Sending "Task_19" to "Jackson"
-> [ 32.218917] (6:slave@Soucy) "Task_18" done
-> [ 33.075874] (2:forwarder@Jackson) Received "Task_19"
-> [ 33.075874] (2:forwarder@Jackson) Sending "Task_19" to "Kuenning"
-> [ 33.075874] (1:master@Jacquelin) Sent
-> [ 33.075874] (1:master@Jacquelin) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [ 33.160344] (7:slave@Kuenning) Received "Task_19"
-> [ 33.160344] (7:slave@Kuenning) Processing "Task_19"
-> [ 33.218597] (7:slave@Kuenning) "Task_19" done
-> [ 36.119532] (4:slave@iRMX) Received "finalize"
-> [ 36.119532] (4:slave@iRMX) I'm done. See you!
-> [ 37.476539] (3:forwarder@Casavant) Received "finalize"
-> [ 37.476539] (3:forwarder@Casavant) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [ 38.491217] (5:slave@Bousquet) Received "finalize"
-> [ 38.491217] (5:slave@Bousquet) I'm done. See you!
-> [ 38.981743] (10:slave@Robert) Received "finalize"
-> [ 38.981743] (10:slave@Robert) I'm done. See you!
-> [ 39.493662] (11:slave@Sirois) Received "finalize"
-> [ 39.493662] (11:slave@Sirois) I'm done. See you!
-> [ 39.934903] (6:slave@Soucy) Received "finalize"
-> [ 39.934903] (6:slave@Soucy) I'm done. See you!
-> [ 40.381147] (12:slave@Monique) Received "finalize"
-> [ 40.381147] (12:slave@Monique) I'm done. See you!
-> [ 40.381147] (3:forwarder@Casavant) I'm done. See you!
-> [ 40.786367] (2:forwarder@Jackson) Received "finalize"
-> [ 40.786367] (2:forwarder@Jackson) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [ 40.786367] (1:master@Jacquelin) Goodbye now!
-> [ 40.792212] (7:slave@Kuenning) Received "finalize"
-> [ 40.792212] (7:slave@Kuenning) I'm done. See you!
-> [ 42.596677] (8:slave@Browne) Received "finalize"
-> [ 42.596677] (8:slave@Browne) I'm done. See you!
-> [ 45.299152] (9:slave@Stephen) Received "finalize"
-> [ 45.299152] (9:slave@Stephen) I'm done. See you!
-> [ 45.299152] (2:forwarder@Jackson) I'm done. See you!
-> [ 45.299152] (0:maestro@) Simulation time 45.2992
diff --git a/examples/msg/masterslave/masterslave_mailbox.tesh b/examples/msg/masterslave/masterslave_mailbox.tesh
deleted file mode 100644 (file)
index 2e8cecd..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-#! ./tesh
-
-p Testing a simple master/slave example application (mailbox version)
-
-! output sort 19
-$ $SG_TEST_EXENV masterslave/masterslave_mailbox$EXEEXT ${srcdir:=.}/../platforms/small_platform_with_routers.xml ${srcdir:=.}/masterslave/deployment_masterslave_mailbox.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" (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"
-> [  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!
-> [  5.094868] (0:maestro@) Simulation time 5.09487
-> [  5.094868] (6:slave@Bourassa) I'm done. See you!
diff --git a/examples/msg/masterslave/masterslave_mailbox_crosstraffic.tesh b/examples/msg/masterslave/masterslave_mailbox_crosstraffic.tesh
deleted file mode 100644 (file)
index 12859b4..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#! ./tesh
-
-p Testing a simple master/slave example application (mailbox version)
-
-$ $SG_TEST_EXENV masterslave/masterslave_mailbox$EXEEXT ${srcdir:=.}/../platforms/small_platform_with_routers.xml ${srcdir:=.}/masterslave/deployment_masterslave_mailbox.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"
-> [  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!
-> [  5.133855] (0:maestro@) Simulation time 5.13386
index 3168b2a..cbbde48 100644 (file)
@@ -2,7 +2,7 @@
 
 p Tracing multiple categories master/slave 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/deployment_masterslave_mailbox.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/masterslave-mailbox/masterslave-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'
index 44bd99b..87f0aad 100644 (file)
@@ -1,7 +1,7 @@
 #! ./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/deployment_masterslave_mailbox.xml
+$ $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
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes'
 
index bdf9177..ca53d3d 100644 (file)
@@ -1,7 +1,7 @@
 #! ./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/deployment_masterslave_mailbox.xml
+$ $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
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes'
 
index e166581..f0d6da8 100644 (file)
@@ -1,7 +1,7 @@
 #! ./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/deployment_masterslave_mailbox.xml
+$ $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
 > [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'
@@ -18,7 +18,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace-masterslave$EXEEXT --cfg=tracing:yes --cfg=t
 > [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/deployment_masterslave_mailbox.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-masterslave$EXEEXT ${srcdir:=.}/config_tracing.xml ${srcdir:=.}/../msg/masterslave-mailbox/masterslave-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'
@@ -35,10 +35,10 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace-masterslave$EXEEXT ${srcdir:=.}/config_traci
 > [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/deployment_masterslave_mailbox.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-masterslave$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave-mailbox/masterslave-mailbox_d.xml
 
 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/deployment_masterslave_mailbox.xml
+$ $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
 > [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'
index d6942a6..7e77460 100644 (file)
@@ -1,7 +1,7 @@
 #! ./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/deployment_masterslave_mailbox.xml
+$ $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
 > [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
-$ $SG_TEST_EXENV ${bindir:=.}/trace-user-variables$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave/deployment_masterslave_mailbox.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-user-variables$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave-mailbox/masterslave-mailbox_d.xml
index 0c3838d..bff93d0 100644 (file)
@@ -945,7 +945,6 @@ set(CMAKEFILES_TXT
   
   examples/msg/CMakeLists.txt
     examples/msg/cloud/CMakeLists.txt
-    examples/msg/masterslave/CMakeLists.txt
     examples/msg/mc/CMakeLists.txt
   examples/s4u/CMakeLists.txt
   examples/simdag/CMakeLists.txt