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

diff --git a/.gitignore b/.gitignore
index b0af184..1ac9db6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -184,19 +184,15 @@ examples/msg/process-suspend/process-suspend
 examples/msg/tasks.trace
 examples/msg/token_ring/token_ring
 examples/msg/trace/test_trace_integration
-examples/msg/tracing/categories
+examples/msg/trace-categories/trace-categories
 examples/msg/tracing/link_srcdst_user_variables
 examples/msg/tracing/link_user_variables
 examples/msg/tracing/ms
 examples/msg/tracing/procmig
-examples/msg/tracing/simple
+examples/msg/trace-simple/trace-simple
 examples/msg/tracing/tasks
-examples/msg/tracing/trace_platform
+examples/msg/trace-platform/trace-platform
 examples/msg/tracing/user_variables
-examples/msg/tracing/volume
-examples/msg/volume.trace
-examples/msg/z_gtnets.trace
-examples/msg/zmsg_test.trace
 examples/s4u/basic/s4u_basic
 examples/s4u/io/s4u_io
 examples/simdag/dax/sd_dax

diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt
index d37f6f1..e2cfd02 100644 (file)
--- a/examples/msg/CMakeLists.txt
+++ b/examples/msg/CMakeLists.txt
@@ -1,7 +1,7 @@
 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)
+          set-maestro start_kill_time synchro token_ring trace-categories trace-platform trace-simple)
   add_executable       (${x}     ${x}/${x}.c)
   target_link_libraries(${x}     simgrid)
   set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -50,6 +50,10 @@ foreach (example consumption onoff pstate vm)
   ADD_TESH_FACTORIES(msg-energy-${example} "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-${example}/energy-${example}.tesh)
 endforeach()
 
+foreach (x categories platform simple)
+  ADD_TESH(msg-trace-${x} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/trace-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/trace-${x} trace-${x}.tesh)
+endforeach()
+
 ADD_TESH_FACTORIES(msg-dht-chord-crosstraffic          "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord_crosstraffic.tesh)
 ADD_TESH_FACTORIES(msg-dht-chord-crosstraffic-parallel "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord_crosstraffic.tesh)
 ADD_TESH_FACTORIES(msg-dht-chord-parallel              "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord.tesh)
@@ -58,7 +62,7 @@ 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(msg-pmm  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm.tesh)
+ADD_TESH(msg-pmm  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm.tesh)
 
 # These one are not usable:
 # ADD_TESH_FACTORIES(msg-exception "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/exception/exception.tesh)

diff --git a/examples/msg/masterslave/CMakeLists.txt b/examples/msg/masterslave/CMakeLists.txt
index 2e5c09c..356b67c 100644 (file)
--- a/examples/msg/masterslave/CMakeLists.txt
+++ b/examples/msg/masterslave/CMakeLists.txt
@@ -20,7 +20,6 @@ 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_cas01_im.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

diff --git a/examples/msg/masterslave/masterslave_cas01_im.tesh b/examples/msg/masterslave/masterslave_cas01_im.tesh
deleted file mode 100644 (file)
index 98c025a..0000000
--- a/examples/msg/masterslave/masterslave_cas01_im.tesh
+++ /dev/null
@@ -1,501 +0,0 @@
-#! ./tesh
-
-p Testing a simple master/slave example application
-
-$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=cpu_model:Cas01_IM
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01_IM'
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 5 slaves and 20 tasks to process
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" to "Jupiter"
-> [Tremblay:master:(1) 0.165962] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 0.165962] [msg_test/INFO] Sending "Task_1" to "Fafard"
-> [Jupiter:slave:(3) 0.165962] [msg_test/INFO] Received "Task_0"
-> [Jupiter:slave:(3) 0.165962] [msg_test/INFO] Processing "Task_0"
-> [Fafard:slave:(4) 0.384115] [msg_test/INFO] Received "Task_1"
-> [Fafard:slave:(4) 0.384115] [msg_test/INFO] Processing "Task_1"
-> [Tremblay:master:(1) 0.384115] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 0.384115] [msg_test/INFO] Sending "Task_2" to "Ginette"
-> [Ginette:slave:(5) 0.524575] [msg_test/INFO] Received "Task_2"
-> [Ginette:slave:(5) 0.524575] [msg_test/INFO] Processing "Task_2"
-> [Tremblay:master:(1) 0.524575] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 0.524575] [msg_test/INFO] Sending "Task_3" to "Bourassa"
-> [Bourassa:slave:(6) 0.740447] [msg_test/INFO] Received "Task_3"
-> [Bourassa:slave:(6) 0.740447] [msg_test/INFO] Processing "Task_3"
-> [Tremblay:master:(1) 0.740447] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 0.740447] [msg_test/INFO] Sending "Task_4" to "Tremblay"
-> [Tremblay:master:(1) 0.740447] [msg_test/INFO] Hey ! It's me ! :)
-> [Tremblay:slave:(2) 0.742786] [msg_test/INFO] Received "Task_4"
-> [Tremblay:slave:(2) 0.742786] [msg_test/INFO] Processing "Task_4"
-> [Tremblay:master:(1) 0.742786] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 0.742786] [msg_test/INFO] Sending "Task_5" to "Jupiter"
-> [Jupiter:slave:(3) 0.821304] [msg_test/INFO] "Task_0" done
-> [Tremblay:master:(1) 0.987266] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 0.987266] [msg_test/INFO] Sending "Task_6" to "Fafard"
-> [Jupiter:slave:(3) 0.987266] [msg_test/INFO] Received "Task_5"
-> [Jupiter:slave:(3) 0.987266] [msg_test/INFO] Processing "Task_5"
-> [Fafard:slave:(4) 1.039457] [msg_test/INFO] "Task_1" done
-> [Tremblay:slave:(2) 1.252495] [msg_test/INFO] "Task_4" done
-> [Tremblay:master:(1) 1.257610] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 1.257610] [msg_test/INFO] Sending "Task_7" to "Ginette"
-> [Fafard:slave:(4) 1.257610] [msg_test/INFO] Received "Task_6"
-> [Fafard:slave:(4) 1.257610] [msg_test/INFO] Processing "Task_6"
-> [Ginette:slave:(5) 1.555672] [msg_test/INFO] "Task_2" done
-> [Jupiter:slave:(3) 1.642608] [msg_test/INFO] "Task_5" done
-> [Tremblay:master:(1) 1.696132] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 1.696132] [msg_test/INFO] Sending "Task_8" to "Bourassa"
-> [Ginette:slave:(5) 1.696132] [msg_test/INFO] Received "Task_7"
-> [Ginette:slave:(5) 1.696132] [msg_test/INFO] Processing "Task_7"
-> [Bourassa:slave:(6) 1.771545] [msg_test/INFO] "Task_3" done
-> [Fafard:slave:(4) 1.912953] [msg_test/INFO] "Task_6" done
-> [Tremblay:master:(1) 1.987417] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 1.987417] [msg_test/INFO] Sending "Task_9" to "Tremblay"
-> [Tremblay:master:(1) 1.987417] [msg_test/INFO] Hey ! It's me ! :)
-> [Bourassa:slave:(6) 1.987417] [msg_test/INFO] Received "Task_8"
-> [Bourassa:slave:(6) 1.987417] [msg_test/INFO] Processing "Task_8"
-> [Tremblay:slave:(2) 1.989756] [msg_test/INFO] Received "Task_9"
-> [Tremblay:slave:(2) 1.989756] [msg_test/INFO] Processing "Task_9"
-> [Tremblay:master:(1) 1.989756] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 1.989756] [msg_test/INFO] Sending "Task_10" to "Jupiter"
-> [Jupiter:slave:(3) 2.155718] [msg_test/INFO] Received "Task_10"
-> [Jupiter:slave:(3) 2.155718] [msg_test/INFO] Processing "Task_10"
-> [Tremblay:master:(1) 2.155718] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 2.155718] [msg_test/INFO] Sending "Task_11" to "Fafard"
-> [Fafard:slave:(4) 2.373871] [msg_test/INFO] Received "Task_11"
-> [Fafard:slave:(4) 2.373871] [msg_test/INFO] Processing "Task_11"
-> [Tremblay:master:(1) 2.373871] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 2.373871] [msg_test/INFO] Sending "Task_12" to "Ginette"
-> [Tremblay:slave:(2) 2.499466] [msg_test/INFO] "Task_9" done
-> [Ginette:slave:(5) 2.727230] [msg_test/INFO] "Task_7" done
-> [Jupiter:slave:(3) 2.811060] [msg_test/INFO] "Task_10" done
-> [Tremblay:master:(1) 2.867690] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 2.867690] [msg_test/INFO] Sending "Task_13" to "Bourassa"
-> [Ginette:slave:(5) 2.867690] [msg_test/INFO] Received "Task_12"
-> [Ginette:slave:(5) 2.867690] [msg_test/INFO] Processing "Task_12"
-> [Bourassa:slave:(6) 3.018515] [msg_test/INFO] "Task_8" done
-> [Fafard:slave:(4) 3.029213] [msg_test/INFO] "Task_11" done
-> [Tremblay:master:(1) 3.234387] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 3.234387] [msg_test/INFO] Sending "Task_14" to "Tremblay"
-> [Tremblay:master:(1) 3.234387] [msg_test/INFO] Hey ! It's me ! :)
-> [Bourassa:slave:(6) 3.234387] [msg_test/INFO] Received "Task_13"
-> [Bourassa:slave:(6) 3.234387] [msg_test/INFO] Processing "Task_13"
-> [Tremblay:slave:(2) 3.236726] [msg_test/INFO] Received "Task_14"
-> [Tremblay:slave:(2) 3.236726] [msg_test/INFO] Processing "Task_14"
-> [Tremblay:master:(1) 3.236726] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 3.236726] [msg_test/INFO] Sending "Task_15" to "Jupiter"
-> [Jupiter:slave:(3) 3.402688] [msg_test/INFO] Received "Task_15"
-> [Jupiter:slave:(3) 3.402688] [msg_test/INFO] Processing "Task_15"
-> [Tremblay:master:(1) 3.402688] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 3.402688] [msg_test/INFO] Sending "Task_16" to "Fafard"
-> [Fafard:slave:(4) 3.620841] [msg_test/INFO] Received "Task_16"
-> [Fafard:slave:(4) 3.620841] [msg_test/INFO] Processing "Task_16"
-> [Tremblay:master:(1) 3.620841] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 3.620841] [msg_test/INFO] Sending "Task_17" to "Ginette"
-> [Tremblay:slave:(2) 3.746436] [msg_test/INFO] "Task_14" done
-> [Ginette:slave:(5) 3.898788] [msg_test/INFO] "Task_12" done
-> [Tremblay:master:(1) 4.039247] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 4.039247] [msg_test/INFO] Sending "Task_18" to "Bourassa"
-> [Ginette:slave:(5) 4.039247] [msg_test/INFO] Received "Task_17"
-> [Ginette:slave:(5) 4.039247] [msg_test/INFO] Processing "Task_17"
-> [Jupiter:slave:(3) 4.058030] [msg_test/INFO] "Task_15" done
-> [Bourassa:slave:(6) 4.265485] [msg_test/INFO] "Task_13" done
-> [Fafard:slave:(4) 4.276183] [msg_test/INFO] "Task_16" done
-> [Tremblay:master:(1) 4.481357] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 4.481357] [msg_test/INFO] Sending "Task_19" to "Tremblay"
-> [Tremblay:master:(1) 4.481357] [msg_test/INFO] Hey ! It's me ! :)
-> [Bourassa:slave:(6) 4.481357] [msg_test/INFO] Received "Task_18"
-> [Bourassa:slave:(6) 4.481357] [msg_test/INFO] Processing "Task_18"
-> [Tremblay:slave:(2) 4.483696] [msg_test/INFO] Received "Task_19"
-> [Tremblay:slave:(2) 4.483696] [msg_test/INFO] Processing "Task_19"
-> [Tremblay:master:(1) 4.483696] [msg_test/INFO] Sent
-> [Tremblay:master:(1) 4.483696] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over.
-> [Jupiter:slave:(3) 4.498896] [msg_test/INFO] Received "finalize"
-> [Jupiter:slave:(3) 4.498896] [msg_test/INFO] I'm done. See you!
-> [Fafard:slave:(4) 4.519447] [msg_test/INFO] Received "finalize"
-> [Fafard:slave:(4) 4.519447] [msg_test/INFO] I'm done. See you!
-> [Tremblay:slave:(2) 4.993406] [msg_test/INFO] "Task_19" done
-> [Ginette:slave:(5) 5.070345] [msg_test/INFO] "Task_17" done
-> [Ginette:slave:(5) 5.083577] [msg_test/INFO] Received "finalize"
-> [Ginette:slave:(5) 5.083577] [msg_test/INFO] I'm done. See you!
-> [Bourassa:slave:(6) 5.512455] [msg_test/INFO] "Task_18" done
-> [Bourassa:slave:(6) 5.532791] [msg_test/INFO] Received "finalize"
-> [Bourassa:slave:(6) 5.532791] [msg_test/INFO] I'm done. See you!
-> [Tremblay:slave:(2) 5.532947] [msg_test/INFO] Received "finalize"
-> [Tremblay:slave:(2) 5.532947] [msg_test/INFO] I'm done. See you!
-> [Tremblay:master:(1) 5.532947] [msg_test/INFO] Goodbye now!
-> [5.532947] [msg_test/INFO] Simulation time 5.53295
-
-p Testing a master/slave example application with a forwarder module
-
-$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/msg_platform.xml ${srcdir:=.}/masterslave/deployment_masterslave_forwarder.xml --cfg=cpu_model:Cas01_IM
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01_IM'
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] Got 5 slaves and 20 tasks to process
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" to "iRMX"
-> [Jacquelin:master:(1) 4.772530] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 4.772530] [msg_test/INFO] Sending "Task_1" to "Casavant"
-> [iRMX:slave:(4) 4.772530] [msg_test/INFO] Received "Task_0"
-> [iRMX:slave:(4) 4.772530] [msg_test/INFO] Processing "Task_0"
-> [iRMX:slave:(4) 4.845345] [msg_test/INFO] "Task_0" done
-> [Casavant:forwarder:(3) 6.900351] [msg_test/INFO] Received "Task_1"
-> [Casavant:forwarder:(3) 6.900351] [msg_test/INFO] Sending "Task_1" to "Robert"
-> [Jacquelin:master:(1) 6.900351] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 6.900351] [msg_test/INFO] Sending "Task_2" to "Bousquet"
-> [Bousquet:slave:(5) 8.491392] [msg_test/INFO] Received "Task_2"
-> [Bousquet:slave:(5) 8.491392] [msg_test/INFO] Processing "Task_2"
-> [Jacquelin:master:(1) 8.491392] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 8.491392] [msg_test/INFO] Sending "Task_3" to "Soucy"
-> [Bousquet:slave:(5) 8.607896] [msg_test/INFO] "Task_2" done
-> [Robert:slave:(10) 9.260549] [msg_test/INFO] Received "Task_1"
-> [Robert:slave:(10) 9.260549] [msg_test/INFO] Processing "Task_1"
-> [Robert:slave:(10) 9.296956] [msg_test/INFO] "Task_1" done
-> [Soucy:slave:(6) 10.755127] [msg_test/INFO] Received "Task_3"
-> [Soucy:slave:(6) 10.755127] [msg_test/INFO] Processing "Task_3"
-> [Jacquelin:master:(1) 10.755127] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 10.755127] [msg_test/INFO] Sending "Task_4" to "Jackson"
-> [Soucy:slave:(6) 10.791535] [msg_test/INFO] "Task_3" done
-> [Jackson:forwarder:(2) 12.090242] [msg_test/INFO] Received "Task_4"
-> [Jackson:forwarder:(2) 12.090242] [msg_test/INFO] Sending "Task_4" to "Kuenning"
-> [Jacquelin:master:(1) 12.090242] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 12.090242] [msg_test/INFO] Sending "Task_5" to "iRMX"
-> [Kuenning:slave:(7) 12.173866] [msg_test/INFO] Received "Task_4"
-> [Kuenning:slave:(7) 12.173866] [msg_test/INFO] Processing "Task_4"
-> [Kuenning:slave:(7) 12.232118] [msg_test/INFO] "Task_4" done
-> [iRMX:slave:(4) 16.862772] [msg_test/INFO] Received "Task_5"
-> [iRMX:slave:(4) 16.862772] [msg_test/INFO] Processing "Task_5"
-> [Jacquelin:master:(1) 16.862772] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 16.862772] [msg_test/INFO] Sending "Task_6" to "Casavant"
-> [iRMX:slave:(4) 16.935587] [msg_test/INFO] "Task_5" done
-> [Casavant:forwarder:(3) 18.990593] [msg_test/INFO] Received "Task_6"
-> [Casavant:forwarder:(3) 18.990593] [msg_test/INFO] Sending "Task_6" to "Sirois"
-> [Jacquelin:master:(1) 18.990593] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 18.990593] [msg_test/INFO] Sending "Task_7" to "Bousquet"
-> [Sirois:slave:(11) 19.793293] [msg_test/INFO] Received "Task_6"
-> [Sirois:slave:(11) 19.793293] [msg_test/INFO] Processing "Task_6"
-> [Sirois:slave:(11) 19.836983] [msg_test/INFO] "Task_6" done
-> [Bousquet:slave:(5) 20.581634] [msg_test/INFO] Received "Task_7"
-> [Bousquet:slave:(5) 20.581634] [msg_test/INFO] Processing "Task_7"
-> [Jacquelin:master:(1) 20.581634] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 20.581634] [msg_test/INFO] Sending "Task_8" to "Soucy"
-> [Bousquet:slave:(5) 20.698138] [msg_test/INFO] "Task_7" done
-> [Soucy:slave:(6) 22.845369] [msg_test/INFO] Received "Task_8"
-> [Soucy:slave:(6) 22.845369] [msg_test/INFO] Processing "Task_8"
-> [Jacquelin:master:(1) 22.845369] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 22.845369] [msg_test/INFO] Sending "Task_9" to "Jackson"
-> [Soucy:slave:(6) 22.881777] [msg_test/INFO] "Task_8" done
-> [Jackson:forwarder:(2) 24.180485] [msg_test/INFO] Received "Task_9"
-> [Jackson:forwarder:(2) 24.180485] [msg_test/INFO] Sending "Task_9" to "Browne"
-> [Jacquelin:master:(1) 24.180485] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 24.180485] [msg_test/INFO] Sending "Task_10" to "iRMX"
-> [Browne:slave:(8) 27.009931] [msg_test/INFO] Received "Task_9"
-> [Browne:slave:(8) 27.009931] [msg_test/INFO] Processing "Task_9"
-> [Browne:slave:(8) 27.046339] [msg_test/INFO] "Task_9" done
-> [iRMX:slave:(4) 28.953014] [msg_test/INFO] Received "Task_10"
-> [iRMX:slave:(4) 28.953014] [msg_test/INFO] Processing "Task_10"
-> [Jacquelin:master:(1) 28.953014] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 28.953014] [msg_test/INFO] Sending "Task_11" to "Casavant"
-> [iRMX:slave:(4) 29.025830] [msg_test/INFO] "Task_10" done
-> [Casavant:forwarder:(3) 31.080835] [msg_test/INFO] Received "Task_11"
-> [Casavant:forwarder:(3) 31.080835] [msg_test/INFO] Sending "Task_11" to "Monique"
-> [Jacquelin:master:(1) 31.080835] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 31.080835] [msg_test/INFO] Sending "Task_12" to "Bousquet"
-> [Monique:slave:(12) 32.472434] [msg_test/INFO] Received "Task_11"
-> [Monique:slave:(12) 32.472434] [msg_test/INFO] Processing "Task_11"
-> [Monique:slave:(12) 32.516124] [msg_test/INFO] "Task_11" done
-> [Bousquet:slave:(5) 32.671876] [msg_test/INFO] Received "Task_12"
-> [Bousquet:slave:(5) 32.671876] [msg_test/INFO] Processing "Task_12"
-> [Jacquelin:master:(1) 32.671876] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 32.671876] [msg_test/INFO] Sending "Task_13" to "Soucy"
-> [Bousquet:slave:(5) 32.788380] [msg_test/INFO] "Task_12" done
-> [Soucy:slave:(6) 34.935611] [msg_test/INFO] Received "Task_13"
-> [Soucy:slave:(6) 34.935611] [msg_test/INFO] Processing "Task_13"
-> [Jacquelin:master:(1) 34.935611] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 34.935611] [msg_test/INFO] Sending "Task_14" to "Jackson"
-> [Soucy:slave:(6) 34.972019] [msg_test/INFO] "Task_13" done
-> [Jackson:forwarder:(2) 36.270727] [msg_test/INFO] Received "Task_14"
-> [Jackson:forwarder:(2) 36.270727] [msg_test/INFO] Sending "Task_14" to "Stephen"
-> [Jacquelin:master:(1) 36.270727] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 36.270727] [msg_test/INFO] Sending "Task_15" to "iRMX"
-> [Stephen:slave:(9) 40.508273] [msg_test/INFO] Received "Task_14"
-> [Stephen:slave:(9) 40.508273] [msg_test/INFO] Processing "Task_14"
-> [Stephen:slave:(9) 40.581088] [msg_test/INFO] "Task_14" done
-> [iRMX:slave:(4) 41.043257] [msg_test/INFO] Received "Task_15"
-> [iRMX:slave:(4) 41.043257] [msg_test/INFO] Processing "Task_15"
-> [Jacquelin:master:(1) 41.043257] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 41.043257] [msg_test/INFO] Sending "Task_16" to "Casavant"
-> [iRMX:slave:(4) 41.116072] [msg_test/INFO] "Task_15" done
-> [Casavant:forwarder:(3) 43.171078] [msg_test/INFO] Received "Task_16"
-> [Casavant:forwarder:(3) 43.171078] [msg_test/INFO] Sending "Task_16" to "Robert"
-> [Jacquelin:master:(1) 43.171078] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 43.171078] [msg_test/INFO] Sending "Task_17" to "Bousquet"
-> [Bousquet:slave:(5) 44.762118] [msg_test/INFO] Received "Task_17"
-> [Bousquet:slave:(5) 44.762118] [msg_test/INFO] Processing "Task_17"
-> [Jacquelin:master:(1) 44.762118] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 44.762118] [msg_test/INFO] Sending "Task_18" to "Soucy"
-> [Bousquet:slave:(5) 44.878622] [msg_test/INFO] "Task_17" done
-> [Robert:slave:(10) 45.531275] [msg_test/INFO] Received "Task_16"
-> [Robert:slave:(10) 45.531275] [msg_test/INFO] Processing "Task_16"
-> [Robert:slave:(10) 45.567683] [msg_test/INFO] "Task_16" done
-> [Soucy:slave:(6) 47.025854] [msg_test/INFO] Received "Task_18"
-> [Soucy:slave:(6) 47.025854] [msg_test/INFO] Processing "Task_18"
-> [Jacquelin:master:(1) 47.025854] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 47.025854] [msg_test/INFO] Sending "Task_19" to "Jackson"
-> [Soucy:slave:(6) 47.062262] [msg_test/INFO] "Task_18" done
-> [Jackson:forwarder:(2) 48.360969] [msg_test/INFO] Received "Task_19"
-> [Jackson:forwarder:(2) 48.360969] [msg_test/INFO] Sending "Task_19" to "Kuenning"
-> [Jacquelin:master:(1) 48.360969] [msg_test/INFO] Sent
-> [Jacquelin:master:(1) 48.360969] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over.
-> [Kuenning:slave:(7) 48.444592] [msg_test/INFO] Received "Task_19"
-> [Kuenning:slave:(7) 48.444592] [msg_test/INFO] Processing "Task_19"
-> [Kuenning:slave:(7) 48.502845] [msg_test/INFO] "Task_19" done
-> [iRMX:slave:(4) 50.794024] [msg_test/INFO] Received "finalize"
-> [iRMX:slave:(4) 50.794024] [msg_test/INFO] I'm done. See you!
-> [Casavant:forwarder:(3) 51.878795] [msg_test/INFO] Received "finalize"
-> [Casavant:forwarder:(3) 51.878795] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over.
-> [Bousquet:slave:(5) 52.689914] [msg_test/INFO] Received "finalize"
-> [Bousquet:slave:(5) 52.689914] [msg_test/INFO] I'm done. See you!
-> [Robert:slave:(10) 53.082033] [msg_test/INFO] Received "finalize"
-> [Robert:slave:(10) 53.082033] [msg_test/INFO] I'm done. See you!
-> [Sirois:slave:(11) 53.491253] [msg_test/INFO] Received "finalize"
-> [Sirois:slave:(11) 53.491253] [msg_test/INFO] I'm done. See you!
-> [Soucy:slave:(6) 53.843975] [msg_test/INFO] Received "finalize"
-> [Soucy:slave:(6) 53.843975] [msg_test/INFO] I'm done. See you!
-> [Monique:slave:(12) 54.200695] [msg_test/INFO] Received "finalize"
-> [Monique:slave:(12) 54.200695] [msg_test/INFO] I'm done. See you!
-> [Casavant:forwarder:(3) 54.200695] [msg_test/INFO] I'm done. See you!
-> [Jackson:forwarder:(2) 54.524622] [msg_test/INFO] Received "finalize"
-> [Jackson:forwarder:(2) 54.524622] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over.
-> [Jacquelin:master:(1) 54.524622] [msg_test/INFO] Goodbye now!
-> [Kuenning:slave:(7) 54.529294] [msg_test/INFO] Received "finalize"
-> [Kuenning:slave:(7) 54.529294] [msg_test/INFO] I'm done. See you!
-> [Browne:slave:(8) 55.971757] [msg_test/INFO] Received "finalize"
-> [Browne:slave:(8) 55.971757] [msg_test/INFO] I'm done. See you!
-> [Stephen:slave:(9) 58.132075] [msg_test/INFO] Received "finalize"
-> [Stephen:slave:(9) 58.132075] [msg_test/INFO] I'm done. See you!
-> [Jackson:forwarder:(2) 58.132075] [msg_test/INFO] I'm done. See you!
-> [58.132075] [msg_test/INFO] Simulation time 58.1321
-
-p Testing a simple master/slave example application handling failures
-
-$ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=path:${srcdir} --cfg=cpu_model:Cas01_IM
-> [0.000000] [simix_process/WARNING] Cannot launch process 'slave' on failed host 'Fafard'
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 5 slave(s) :
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Jupiter
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Fafard
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Ginette
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Bourassa
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Tremblay
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 20 task to process :
-> [Tremblay:master:(1) 0.165962] [msg_test/INFO] Send completed
-> [Jupiter:slave:(3) 0.165962] [msg_test/INFO] Received "Task"
-> [Jupiter:slave:(3) 0.165962] [msg_test/INFO] Communication time : "0.165962"
-> [Jupiter:slave:(3) 0.165962] [msg_test/INFO] Processing "Task"
-> [Jupiter:slave:(3) 0.821304] [msg_test/INFO] "Task" done
-> [Jupiter:slave:(3) 1.100000] [msg_test/INFO] Gloups. The cpu on which I'm running just turned off!. See you!
-> [Tremblay:master:(1) 10.165962] [msg_test/INFO] Mmh. Something went wrong with 'Fafard'. Nevermind. Let's keep going!
-> [Ginette:slave:(4) 10.306421] [msg_test/INFO] Received "Task"
-> [Ginette:slave:(4) 10.306421] [msg_test/INFO] Communication time : "0.140460"
-> [Ginette:slave:(4) 10.306421] [msg_test/INFO] Processing "Task"
-> [Tremblay:master:(1) 10.306421] [msg_test/INFO] Send completed
-> [Bourassa:slave:(5) 10.522294] [msg_test/INFO] Received "Task"
-> [Bourassa:slave:(5) 10.522294] [msg_test/INFO] Communication time : "0.215872"
-> [Bourassa:slave:(5) 10.522294] [msg_test/INFO] Processing "Task"
-> [Tremblay:master:(1) 10.522294] [msg_test/INFO] Send completed
-> [Tremblay:slave:(2) 10.524632] [msg_test/INFO] Received "Task"
-> [Tremblay:slave:(2) 10.524632] [msg_test/INFO] Communication time : "0.002339"
-> [Tremblay:slave:(2) 10.524632] [msg_test/INFO] Processing "Task"
-> [Tremblay:master:(1) 10.524632] [msg_test/INFO] Send completed
-> [Tremblay:slave:(2) 11.034342] [msg_test/INFO] "Task" done
-> [Ginette:slave:(4) 11.337519] [msg_test/INFO] "Task" done
-> [Bourassa:slave:(5) 11.553392] [msg_test/INFO] "Task" done
-> [Tremblay:master:(1) 20.524632] [msg_test/INFO] Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going!
-> [Tremblay:master:(1) 30.524632] [msg_test/INFO] Mmh. Something went wrong with 'Fafard'. Nevermind. Let's keep going!
-> [Ginette:slave:(4) 30.524632] [msg_test/INFO] Mmh. Something went wrong. Nevermind. Let's keep going!
-> [Tremblay:master:(1) 30.524632] [msg_test/INFO] Mmh. Something went wrong with 'Ginette'. Nevermind. Let's keep going!
-> [Bourassa:slave:(5) 30.740505] [msg_test/INFO] Received "Task"
-> [Bourassa:slave:(5) 30.740505] [msg_test/INFO] Communication time : "0.215872"
-> [Bourassa:slave:(5) 30.740505] [msg_test/INFO] Processing "Task"
-> [Tremblay:master:(1) 30.740505] [msg_test/INFO] Send completed
-> [Tremblay:slave:(2) 30.742843] [msg_test/INFO] Received "Task"
-> [Tremblay:slave:(2) 30.742843] [msg_test/INFO] Communication time : "0.002339"
-> [Tremblay:slave:(2) 30.742843] [msg_test/INFO] Processing "Task"
-> [Tremblay:master:(1) 30.742843] [msg_test/INFO] Send completed
-> [Tremblay:slave:(2) 31.252553] [msg_test/INFO] "Task" done
-> [Bourassa:slave:(5) 31.771603] [msg_test/INFO] "Task" done
-> [Tremblay:master:(1) 40.742843] [msg_test/INFO] Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going!
-> [Tremblay:master:(1) 50.742843] [msg_test/INFO] Mmh. Something went wrong with 'Fafard'. Nevermind. Let's keep going!
-> [Ginette:slave:(4) 50.883303] [msg_test/INFO] Received "Task"
-> [Ginette:slave:(4) 50.883303] [msg_test/INFO] Communication time : "0.140460"
-> [Ginette:slave:(4) 50.883303] [msg_test/INFO] Processing "Task"
-> [Tremblay:master:(1) 50.883303] [msg_test/INFO] Send completed
-> [Bourassa:slave:(5) 51.099175] [msg_test/INFO] Received "Task"
-> [Bourassa:slave:(5) 51.099175] [msg_test/INFO] Communication time : "0.215872"
-> [Bourassa:slave:(5) 51.099175] [msg_test/INFO] Processing "Task"
-> [Tremblay:master:(1) 51.099175] [msg_test/INFO] Send completed
-> [Tremblay:slave:(2) 51.101514] [msg_test/INFO] Received "Task"
-> [Tremblay:slave:(2) 51.101514] [msg_test/INFO] Communication time : "0.002339"
-> [Tremblay:slave:(2) 51.101514] [msg_test/INFO] Processing "Task"
-> [Tremblay:master:(1) 51.101514] [msg_test/INFO] Send completed
-> [Tremblay:slave:(2) 51.611224] [msg_test/INFO] "Task" done
-> [Ginette:slave:(4) 51.914401] [msg_test/INFO] "Task" done
-> [Bourassa:slave:(5) 52.130273] [msg_test/INFO] "Task" done
-> [Tremblay:master:(1) 61.101514] [msg_test/INFO] Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going!
-> [Tremblay:master:(1) 71.101514] [msg_test/INFO] Mmh. Something went wrong with 'Fafard'. Nevermind. Let's keep going!
-> [Ginette:slave:(4) 71.241973] [msg_test/INFO] Received "Task"
-> [Ginette:slave:(4) 71.241973] [msg_test/INFO] Communication time : "0.140460"
-> [Ginette:slave:(4) 71.241973] [msg_test/INFO] Processing "Task"
-> [Tremblay:master:(1) 71.241973] [msg_test/INFO] Send completed
-> [Bourassa:slave:(5) 71.457846] [msg_test/INFO] Received "Task"
-> [Bourassa:slave:(5) 71.457846] [msg_test/INFO] Communication time : "0.215872"
-> [Bourassa:slave:(5) 71.457846] [msg_test/INFO] Processing "Task"
-> [Tremblay:master:(1) 71.457846] [msg_test/INFO] Send completed
-> [Tremblay:slave:(2) 71.460184] [msg_test/INFO] Received "Task"
-> [Tremblay:slave:(2) 71.460184] [msg_test/INFO] Communication time : "0.002339"
-> [Tremblay:slave:(2) 71.460184] [msg_test/INFO] Processing "Task"
-> [Tremblay:master:(1) 71.460184] [msg_test/INFO] Send completed
-> [Tremblay:master:(1) 71.460184] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over.
-> [Tremblay:slave:(2) 71.969894] [msg_test/INFO] "Task" done
-> [Ginette:slave:(4) 72.273071] [msg_test/INFO] "Task" done
-> [Tremblay:master:(1) 72.460184] [msg_test/INFO] Mmh. Can't reach 'Jupiter'! Nevermind. Let's keep going!
-> [Bourassa:slave:(5) 72.488944] [msg_test/INFO] "Task" done
-> [Tremblay:master:(1) 73.460184] [msg_test/INFO] Mmh. Can't reach 'Fafard'! Nevermind. Let's keep going!
-> [Ginette:slave:(4) 73.473416] [msg_test/INFO] Received "finalize"
-> [Ginette:slave:(4) 73.473416] [msg_test/INFO] I'm done. See you!
-> [Bourassa:slave:(5) 73.493752] [msg_test/INFO] Received "finalize"
-> [Bourassa:slave:(5) 73.493752] [msg_test/INFO] I'm done. See you!
-> [Tremblay:slave:(2) 73.493908] [msg_test/INFO] Received "finalize"
-> [Tremblay:slave:(2) 73.493908] [msg_test/INFO] I'm done. See you!
-> [Tremblay:master:(1) 73.493908] [msg_test/INFO] Goodbye now!
-> [73.493908] [msg_test/INFO] Simulation time 73.4939
-
-p Testing the bypassing of the flexml parser
-
-$ $SG_TEST_EXENV masterslave/masterslave_bypass --log=no_loc --cfg=cpu_model:Cas01_IM
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu_model' to 'Cas01_IM'
-> [0.000000] [surf_parse/WARNING] Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code.
-> [host A:master:(1) 0.000000] [msg_test/INFO] Got 1 slave(s) :
-> [host A:master:(1) 0.000000] [msg_test/INFO]          host B
-> [host A:master:(1) 0.000000] [msg_test/INFO] Got 20 task to process :
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_0"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_1"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_2"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_3"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_4"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_5"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_6"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_7"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_8"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_9"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_10"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_11"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_12"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_13"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_14"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_15"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_16"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_17"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_18"
-> [host A:master:(1) 0.000000] [msg_test/INFO]         "Task_19"
-> [host A:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" to "host B"
-> [host B:slave:(2) 0.000000] [msg_test/INFO] I'm a slave
-> [host A:master:(1) 4.080000] [msg_test/INFO] Send completed
-> [host A:master:(1) 4.080000] [msg_test/INFO] Sending "Task_1" to "host B"
-> [host B:slave:(2) 4.080000] [msg_test/INFO] Received "Task_0"
-> [host B:slave:(2) 4.080000] [msg_test/INFO] Processing "Task_0"
-> [host B:slave:(2) 4.130000] [msg_test/INFO] "Task_0" done
-> [host A:master:(1) 8.210000] [msg_test/INFO] Send completed
-> [host A:master:(1) 8.210000] [msg_test/INFO] Sending "Task_2" to "host B"
-> [host B:slave:(2) 8.210000] [msg_test/INFO] Received "Task_1"
-> [host B:slave:(2) 8.210000] [msg_test/INFO] Processing "Task_1"
-> [host B:slave:(2) 8.260000] [msg_test/INFO] "Task_1" done
-> [host A:master:(1) 12.340000] [msg_test/INFO] Send completed
-> [host A:master:(1) 12.340000] [msg_test/INFO] Sending "Task_3" to "host B"
-> [host B:slave:(2) 12.340000] [msg_test/INFO] Received "Task_2"
-> [host B:slave:(2) 12.340000] [msg_test/INFO] Processing "Task_2"
-> [host B:slave:(2) 12.390000] [msg_test/INFO] "Task_2" done
-> [host A:master:(1) 16.470000] [msg_test/INFO] Send completed
-> [host A:master:(1) 16.470000] [msg_test/INFO] Sending "Task_4" to "host B"
-> [host B:slave:(2) 16.470000] [msg_test/INFO] Received "Task_3"
-> [host B:slave:(2) 16.470000] [msg_test/INFO] Processing "Task_3"
-> [host B:slave:(2) 16.520000] [msg_test/INFO] "Task_3" done
-> [host A:master:(1) 20.600000] [msg_test/INFO] Send completed
-> [host A:master:(1) 20.600000] [msg_test/INFO] Sending "Task_5" to "host B"
-> [host B:slave:(2) 20.600000] [msg_test/INFO] Received "Task_4"
-> [host B:slave:(2) 20.600000] [msg_test/INFO] Processing "Task_4"
-> [host B:slave:(2) 20.650000] [msg_test/INFO] "Task_4" done
-> [host A:master:(1) 24.730000] [msg_test/INFO] Send completed
-> [host A:master:(1) 24.730000] [msg_test/INFO] Sending "Task_6" to "host B"
-> [host B:slave:(2) 24.730000] [msg_test/INFO] Received "Task_5"
-> [host B:slave:(2) 24.730000] [msg_test/INFO] Processing "Task_5"
-> [host B:slave:(2) 24.780000] [msg_test/INFO] "Task_5" done
-> [host A:master:(1) 28.860000] [msg_test/INFO] Send completed
-> [host A:master:(1) 28.860000] [msg_test/INFO] Sending "Task_7" to "host B"
-> [host B:slave:(2) 28.860000] [msg_test/INFO] Received "Task_6"
-> [host B:slave:(2) 28.860000] [msg_test/INFO] Processing "Task_6"
-> [host B:slave:(2) 28.910000] [msg_test/INFO] "Task_6" done
-> [host A:master:(1) 32.990000] [msg_test/INFO] Send completed
-> [host A:master:(1) 32.990000] [msg_test/INFO] Sending "Task_8" to "host B"
-> [host B:slave:(2) 32.990000] [msg_test/INFO] Received "Task_7"
-> [host B:slave:(2) 32.990000] [msg_test/INFO] Processing "Task_7"
-> [host B:slave:(2) 33.040000] [msg_test/INFO] "Task_7" done
-> [host A:master:(1) 37.120000] [msg_test/INFO] Send completed
-> [host A:master:(1) 37.120000] [msg_test/INFO] Sending "Task_9" to "host B"
-> [host B:slave:(2) 37.120000] [msg_test/INFO] Received "Task_8"
-> [host B:slave:(2) 37.120000] [msg_test/INFO] Processing "Task_8"
-> [host B:slave:(2) 37.170000] [msg_test/INFO] "Task_8" done
-> [host A:master:(1) 41.250000] [msg_test/INFO] Send completed
-> [host A:master:(1) 41.250000] [msg_test/INFO] Sending "Task_10" to "host B"
-> [host B:slave:(2) 41.250000] [msg_test/INFO] Received "Task_9"
-> [host B:slave:(2) 41.250000] [msg_test/INFO] Processing "Task_9"
-> [host B:slave:(2) 41.300000] [msg_test/INFO] "Task_9" done
-> [host A:master:(1) 45.380000] [msg_test/INFO] Send completed
-> [host A:master:(1) 45.380000] [msg_test/INFO] Sending "Task_11" to "host B"
-> [host B:slave:(2) 45.380000] [msg_test/INFO] Received "Task_10"
-> [host B:slave:(2) 45.380000] [msg_test/INFO] Processing "Task_10"
-> [host B:slave:(2) 45.430000] [msg_test/INFO] "Task_10" done
-> [host A:master:(1) 49.510000] [msg_test/INFO] Send completed
-> [host A:master:(1) 49.510000] [msg_test/INFO] Sending "Task_12" to "host B"
-> [host B:slave:(2) 49.510000] [msg_test/INFO] Received "Task_11"
-> [host B:slave:(2) 49.510000] [msg_test/INFO] Processing "Task_11"
-> [host B:slave:(2) 49.560000] [msg_test/INFO] "Task_11" done
-> [host A:master:(1) 53.640000] [msg_test/INFO] Send completed
-> [host A:master:(1) 53.640000] [msg_test/INFO] Sending "Task_13" to "host B"
-> [host B:slave:(2) 53.640000] [msg_test/INFO] Received "Task_12"
-> [host B:slave:(2) 53.640000] [msg_test/INFO] Processing "Task_12"
-> [host B:slave:(2) 53.690000] [msg_test/INFO] "Task_12" done
-> [host A:master:(1) 57.770000] [msg_test/INFO] Send completed
-> [host A:master:(1) 57.770000] [msg_test/INFO] Sending "Task_14" to "host B"
-> [host B:slave:(2) 57.770000] [msg_test/INFO] Received "Task_13"
-> [host B:slave:(2) 57.770000] [msg_test/INFO] Processing "Task_13"
-> [host B:slave:(2) 57.820000] [msg_test/INFO] "Task_13" done
-> [host A:master:(1) 61.900000] [msg_test/INFO] Send completed
-> [host A:master:(1) 61.900000] [msg_test/INFO] Sending "Task_15" to "host B"
-> [host B:slave:(2) 61.900000] [msg_test/INFO] Received "Task_14"
-> [host B:slave:(2) 61.900000] [msg_test/INFO] Processing "Task_14"
-> [host B:slave:(2) 61.950000] [msg_test/INFO] "Task_14" done
-> [host A:master:(1) 66.030000] [msg_test/INFO] Send completed
-> [host A:master:(1) 66.030000] [msg_test/INFO] Sending "Task_16" to "host B"
-> [host B:slave:(2) 66.030000] [msg_test/INFO] Received "Task_15"
-> [host B:slave:(2) 66.030000] [msg_test/INFO] Processing "Task_15"
-> [host B:slave:(2) 66.080000] [msg_test/INFO] "Task_15" done
-> [host A:master:(1) 70.160000] [msg_test/INFO] Send completed
-> [host A:master:(1) 70.160000] [msg_test/INFO] Sending "Task_17" to "host B"
-> [host B:slave:(2) 70.160000] [msg_test/INFO] Received "Task_16"
-> [host B:slave:(2) 70.160000] [msg_test/INFO] Processing "Task_16"
-> [host B:slave:(2) 70.210000] [msg_test/INFO] "Task_16" done
-> [host A:master:(1) 74.290000] [msg_test/INFO] Send completed
-> [host A:master:(1) 74.290000] [msg_test/INFO] Sending "Task_18" to "host B"
-> [host B:slave:(2) 74.290000] [msg_test/INFO] Received "Task_17"
-> [host B:slave:(2) 74.290000] [msg_test/INFO] Processing "Task_17"
-> [host B:slave:(2) 74.340000] [msg_test/INFO] "Task_17" done
-> [host A:master:(1) 78.420000] [msg_test/INFO] Send completed
-> [host A:master:(1) 78.420000] [msg_test/INFO] Sending "Task_19" to "host B"
-> [host B:slave:(2) 78.420000] [msg_test/INFO] Received "Task_18"
-> [host B:slave:(2) 78.420000] [msg_test/INFO] Processing "Task_18"
-> [host B:slave:(2) 78.470000] [msg_test/INFO] "Task_18" done
-> [host A:master:(1) 82.550000] [msg_test/INFO] Send completed
-> [host A:master:(1) 82.550000] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over.
-> [host B:slave:(2) 82.550000] [msg_test/INFO] Received "Task_19"
-> [host B:slave:(2) 82.550000] [msg_test/INFO] Processing "Task_19"
-> [host B:slave:(2) 82.600000] [msg_test/INFO] "Task_19" done
-> [host A:master:(1) 84.680000] [msg_test/INFO] Goodbye now!
-> [host B:slave:(2) 84.680000] [msg_test/INFO] Received "finalize"
-> [host B:slave:(2) 84.680000] [msg_test/INFO] I'm done. See you!
-> [84.680000] [msg_test/INFO] Simulation time 84.68

diff --git a/examples/msg/tracing/categories.c b/examples/msg/trace-categories/trace-categories.c
similarity index 95%
rename from examples/msg/tracing/categories.c
rename to examples/msg/trace-categories/trace-categories.c
index 43963e3..22d2c47 100644 (file)
--- a/examples/msg/tracing/categories.c
+++ b/examples/msg/trace-categories/trace-categories.c
@@ -78,10 +78,8 @@ static int slave(int argc, char *argv[])
 int main(int argc, char *argv[])
 {
   MSG_init(&argc, argv);
-  if (argc < 3) {
-    printf("Usage: %s platform_file deployment_file\n", argv[0]);
-    exit(1);
-  }
+  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
+             "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
 
   MSG_create_environment(argv[1]);
 

diff --git a/examples/msg/tracing/categories.tesh b/examples/msg/trace-categories/trace-categories.tesh
similarity index 62%
rename from examples/msg/tracing/categories.tesh
rename to examples/msg/trace-categories/trace-categories.tesh
index 5ca8fe1..3168b2a 100644 (file)
--- a/examples/msg/tracing/categories.tesh
+++ b/examples/msg/trace-categories/trace-categories.tesh
@@ -2,16 +2,16 @@
 
 p Tracing multiple categories master/slave application
 
-$ $SG_TEST_EXENV ${bindir:=.}/tracing/categories$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:tracing/categories.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:tracing/categories.cat.plist --cfg=viva/uncategorized:tracing/categories.uncat.plist ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/tracing/deployment.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/deployment_masterslave_mailbox.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 'tracing/categories.trace'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'categories.trace'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'tracing/categories.cat.plist'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'tracing/categories.uncat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'categories.cat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'categories.uncat.plist'
 
-$ $SG_TEST_EXENV cat tracing/categories.cat.plist
+$ $SG_TEST_EXENV cat categories.cat.plist
 >   node = ("HOST","LINK");
 >   edge = ("0-LINK4-LINK4","0-HOST1-LINK4","0-LINK4-HOST1");
 >
@@ -26,7 +26,7 @@ $ $SG_TEST_EXENV cat tracing/categories.cat.plist
 >     values = ("bdata","bcompute","bfinalize","brequest");
 >   };
 
-$ $SG_TEST_EXENV cat tracing/categories.uncat.plist
+$ $SG_TEST_EXENV cat categories.uncat.plist
 >   node = ("HOST","LINK");
 >   edge = ("0-LINK4-LINK4","0-HOST1-LINK4","0-LINK4-HOST1");
 >
@@ -41,4 +41,4 @@ $ $SG_TEST_EXENV cat tracing/categories.uncat.plist
 >     values = ("bandwidth_used");
 >   };
 
-$ rm -rf tracing/categories.trace tracing/categories.cat.plist tracing/categories.uncat.plist
+$ rm -rf categories.trace categories.cat.plist categories.uncat.plist

diff --git a/examples/msg/tracing/trace_platform.c b/examples/msg/trace-platform/trace-platform.c
similarity index 82%
rename from examples/msg/tracing/trace_platform.c
rename to examples/msg/trace-platform/trace-platform.c
index 9431a5f..6cb9d80 100644 (file)
--- a/examples/msg/tracing/trace_platform.c
+++ b/examples/msg/trace-platform/trace-platform.c
@@ -15,16 +15,10 @@
 
 #include "simgrid/msg.h"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
-
 int main(int argc, char *argv[])
 {
   MSG_init(&argc, argv);
-  if (argc < 2) {
-    printf("Usage: %s platform_file\n", argv[0]);
-    exit(1);
-  }
-
+  xbt_assert(argc > 1, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
   MSG_create_environment(argv[1]);
   MSG_main();
   return 0;

diff --git a/examples/msg/tracing/trace_platform.tesh b/examples/msg/trace-platform/trace-platform.tesh
similarity index 99%
rename from examples/msg/tracing/trace_platform.tesh
rename to examples/msg/trace-platform/trace-platform.tesh
index 0c61bfc..ee478a0 100644 (file)
--- a/examples/msg/tracing/trace_platform.tesh
+++ b/examples/msg/trace-platform/trace-platform.tesh
@@ -1,13 +1,12 @@
 #! ./tesh
 
-
-p Tracing master/slave application
-$ $SG_TEST_EXENV ${bindir:=.}/tracing/trace_platform$EXEEXT --cfg=tracing:yes --cfg=tracing/filename:tracing/trace_platform.trace --cfg=tracing/categorized:yes ${srcdir:=.}/../platforms/small_platform.xml
+p Tracing platform only
+$ $SG_TEST_EXENV ${bindir:=.}/trace-platform$EXEEXT --cfg=tracing:yes --cfg=tracing/filename:trace_platform.trace --cfg=tracing/categorized:yes ${srcdir:=.}/small_platform.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/trace_platform.trace'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace_platform.trace'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 
-$ tail -n +3 tracing/trace_platform.trace
+$ tail -n +3 trace_platform.trace
 > %EventDef PajeDefineContainerType 0
 > %       Alias string
 > %       Type string
@@ -218,14 +217,14 @@ $ tail -n +3 tracing/trace_platform.trace
 > 7 0 1 2
 > 7 0 1 4
 
-$ rm -rf tracing/trace_platform.trace
+$ rm -f trace_platform.trace
 
-$ $SG_TEST_EXENV ${bindir:=.}/tracing/trace_platform$EXEEXT --cfg=tracing:yes  --cfg=tracing/filename:tracing/trace_platform.trace --cfg=tracing/categorized:yes ${srcdir:=.}/../platforms/g5k.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-platform$EXEEXT --cfg=tracing:yes  --cfg=tracing/filename:trace_platform.trace --cfg=tracing/categorized:yes ${srcdir:=.}/g5k.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/trace_platform.trace'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace_platform.trace'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 
-$ tail -n +3 tracing/trace_platform.trace
+$ tail -n +3 trace_platform.trace
 > %EventDef PajeDefineContainerType 0
 > %       Alias string
 > %       Type string
@@ -30405,4 +30404,4 @@ $ tail -n +3 tracing/trace_platform.trace
 > 7 0 6 4094
 > 7 0 1 3921
 
-$ rm -rf tracing/trace_platform.trace
+$ rm -f trace_platform.trace

diff --git a/examples/msg/tracing/simple.c b/examples/msg/trace-simple/trace-simple.c
similarity index 59%
rename from examples/msg/tracing/simple.c
rename to examples/msg/trace-simple/trace-simple.c
index 876828f..27a08aa 100644 (file)
--- a/examples/msg/tracing/simple.c
+++ b/examples/msg/trace-simple/trace-simple.c
@@ -4,25 +4,18 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <stdio.h>
 #include "simgrid/msg.h"
-#include "xbt/sysdep.h"         /* calloc, printf */
 
 /** @addtogroup MSG_examples
  * 
  * @section MSG_ex_tracing Tracing and vizualisation features
  * 
- * - <b>tracing/simple.c</b> very simple program where each process creates, executes and
- *   destroy a task. You might want to run this program with the following parameters:
+ * - <b>tracing/simple.c</b> very simple program where each process creates, executes and destroy a task. You might want
+ *  to run this program with the following parameters:
  *   --cfg=tracing/uncategorized:yes
  *   (See \ref tracing_tracing_options for details)
  */
 
-/* Create a log channel to have nice outputs. */
-#include "xbt/log.h"
-#include "xbt/asserts.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
-
 static int simple_func(int argc, char *argv[])
 {
   msg_task_t task = MSG_task_create("task", 100, 0, NULL);
@@ -34,16 +27,11 @@ static int simple_func(int argc, char *argv[])
 int main(int argc, char *argv[])
 {
   MSG_init(&argc, argv);
-  if (argc < 3) {
-    printf("Usage: %s platform_file deployment_file\n", argv[0]);
-    exit(1);
-  }
+  xbt_assert(argc > 1, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
   MSG_create_environment(argv[1]);
-
-  MSG_function_register("master", simple_func);
-  MSG_function_register("slave", simple_func);
-  MSG_launch_application(argv[2]);
+  MSG_process_create("simple_func", simple_func, NULL, MSG_get_host_by_name("Tremblay"));
+  MSG_process_create("simple_func", simple_func, NULL, MSG_get_host_by_name("Fafard"));
 
   MSG_main();
   return 0;

diff --git a/examples/msg/trace-simple/trace-simple.tesh b/examples/msg/trace-simple/trace-simple.tesh
new file mode 100644 (file)
index 0000000..68c338d
--- /dev/null
+++ b/examples/msg/trace-simple/trace-simple.tesh
@@ -0,0 +1,232 @@
+#! ./tesh
+
+p Simple tracing example
+$ $SG_TEST_EXENV ${bindir:=.}/trace-simple$EXEEXT --cfg=tracing:yes --cfg=tracing/filename:trace_simple.trace --cfg=tracing/uncategorized:yes ${srcdir:=.}/small_platform.xml
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace_simple.trace'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'
+
+$ tail -n +3 trace_simple.trace
+> %EventDef PajeDefineContainerType 0
+> %       Alias string
+> %       Type string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDefineVariableType 1
+> %       Alias string
+> %       Type string
+> %       Name string
+> %       Color color
+> %EndEventDef
+> %EventDef PajeDefineStateType 2
+> %       Alias string
+> %       Type string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDefineEventType 3
+> %       Alias string
+> %       Type string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDefineLinkType 4
+> %       Alias string
+> %       Type string
+> %       StartContainerType string
+> %       EndContainerType string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDefineEntityValue 5
+> %       Alias string
+> %       Type string
+> %       Name string
+> %       Color color
+> %EndEventDef
+> %EventDef PajeCreateContainer 6
+> %       Time date
+> %       Alias string
+> %       Type string
+> %       Container string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDestroyContainer 7
+> %       Time date
+> %       Type string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeSetVariable 8
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value double
+> %EndEventDef
+> %EventDef PajeAddVariable 9
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value double
+> %EndEventDef
+> %EventDef PajeSubVariable 10
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value double
+> %EndEventDef
+> %EventDef PajeSetState 11
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
+> %EndEventDef
+> %EventDef PajePushState 12
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
+> %EndEventDef
+> %EventDef PajePopState 13
+> %       Time date
+> %       Type string
+> %       Container string
+> %EndEventDef
+> %EventDef PajeResetState 14
+> %       Time date
+> %       Type string
+> %       Container string
+> %EndEventDef
+> %EventDef PajeStartLink 15
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
+> %       StartContainer string
+> %       Key string
+> %EndEventDef
+> %EventDef PajeEndLink 16
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
+> %       EndContainer string
+> %       Key string
+> %EndEventDef
+> %EventDef PajeNewEvent 17
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
+> %EndEventDef
+> 0 1 0 HOST
+> 6 0 1 1 0 "Tremblay"
+> 1 2 1 power "1 1 1"
+> 1 3 1 power_used "0.5 0.5 0.5"
+> 6 0 2 1 0 "Jupiter"
+> 6 0 3 1 0 "Fafard"
+> 6 0 4 1 0 "Ginette"
+> 6 0 5 1 0 "Bourassa"
+> 0 4 0 LINK
+> 6 0 6 4 0 "6"
+> 1 5 4 bandwidth "1 1 1"
+> 1 6 4 latency "1 1 1"
+> 1 7 4 bandwidth_used "0.5 0.5 0.5"
+> 6 0 7 4 0 "3"
+> 6 0 8 4 0 "7"
+> 6 0 9 4 0 "9"
+> 6 0 10 4 0 "2"
+> 6 0 11 4 0 "8"
+> 6 0 12 4 0 "1"
+> 6 0 13 4 0 "4"
+> 6 0 14 4 0 "0"
+> 6 0 15 4 0 "5"
+> 6 0 16 4 0 "loopback"
+> 4 8 0 4 4 0-LINK4-LINK4
+> 4 9 0 1 4 0-HOST1-LINK4
+> 4 10 0 4 1 0-LINK4-HOST1
+> 8 0 2 1 98095000.000000
+> 8 0 2 2 76296000.000000
+> 8 0 2 3 76296000.000000
+> 8 0 2 4 48492000.000000
+> 8 0 2 5 48492000.000000
+> 8 0 5 6 41279125.000000
+> 8 0 6 6 0.000060
+> 8 0 5 7 34285625.000000
+> 8 0 6 7 0.000514
+> 8 0 5 8 11618875.000000
+> 8 0 6 8 0.000190
+> 8 0 5 9 7209750.000000
+> 8 0 6 9 0.001462
+> 8 0 5 10 118682500.000000
+> 8 0 6 10 0.000137
+> 8 0 5 11 8158000.000000
+> 8 0 6 11 0.000271
+> 8 0 5 12 34285625.000000
+> 8 0 6 12 0.000514
+> 8 0 5 13 10099625.000000
+> 8 0 6 13 0.000480
+> 8 0 5 14 41279125.000000
+> 8 0 6 14 0.000060
+> 8 0 5 15 27946250.000000
+> 8 0 6 15 0.000278
+> 8 0 5 16 498000000.000000
+> 8 0 6 16 0.000015
+> 15 0 8 0 topology 13 0
+> 16 0 8 0 topology 7 0
+> 15 0 8 0 topology 6 1
+> 16 0 8 0 topology 8 1
+> 15 0 9 0 topology 1 2
+> 16 0 9 0 topology 13 2
+> 15 0 9 0 topology 1 3
+> 16 0 9 0 topology 9 3
+> 15 0 10 0 topology 9 4
+> 16 0 10 0 topology 2 4
+> 15 0 8 0 topology 10 5
+> 16 0 8 0 topology 14 5
+> 15 0 8 0 topology 12 6
+> 16 0 8 0 topology 11 6
+> 15 0 8 0 topology 9 7
+> 16 0 8 0 topology 13 7
+> 15 0 10 0 topology 8 8
+> 16 0 10 0 topology 5 8
+> 15 0 8 0 topology 14 9
+> 16 0 8 0 topology 12 9
+> 15 0 10 0 topology 15 10
+> 16 0 10 0 topology 4 10
+> 15 0 8 0 topology 10 11
+> 16 0 8 0 topology 15 11
+> 15 0 8 0 topology 7 12
+> 16 0 8 0 topology 15 12
+> 15 0 10 0 topology 11 13
+> 16 0 10 0 topology 3 13
+> 15 0 8 0 topology 7 14
+> 16 0 8 0 topology 10 14
+> 15 0 8 0 topology 12 15
+> 16 0 8 0 topology 6 15
+> 15 0 8 0 topology 11 16
+> 16 0 8 0 topology 6 16
+> 8 0 3 1 0.000000
+> 9 0 3 1 98095000.000000
+> 10 0 3 1 98095000.000000
+> 8 0 3 3 0.000000
+> 9 0 3 3 76296000.000000
+> 10 0 3 3 76296000.000000
+> 9 0 3 1 98095000.000000
+> 9 0 3 3 76296000.000000
+> 10 0.000001 3 1 98095000.000000
+> 10 0.000001 3 3 76296000.000000
+> 7 0.000001 1 3
+> 7 0.000001 1 1
+> 7 0.000001 4 16
+> 7 0.000001 4 14
+> 7 0.000001 4 12
+> 7 0.000001 4 10
+> 7 0.000001 4 7
+> 7 0.000001 4 13
+> 7 0.000001 4 15
+> 7 0.000001 4 6
+> 7 0.000001 4 8
+> 7 0.000001 4 11
+> 7 0.000001 4 9
+> 7 0.000001 1 5
+> 7 0.000001 1 2
+> 7 0.000001 1 4
+
+$ rm -f trace_simple.trace

diff --git a/examples/msg/tracing/CMakeLists.txt b/examples/msg/tracing/CMakeLists.txt
index 3be1e6b..295887a 100644 (file)
--- a/examples/msg/tracing/CMakeLists.txt
+++ b/examples/msg/tracing/CMakeLists.txt
@@ -1,4 +1,4 @@
-foreach (example ms categories procmig trace_platform user_variables link_user_variables link_srcdst_user_variables)
+foreach (example ms procmig user_variables link_user_variables link_srcdst_user_variables)
   add_executable       (${example} ${example}.c)
   target_link_libraries(${example} simgrid)
   set(examples_src  ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${example}.c)
@@ -7,14 +7,10 @@ foreach (example ms categories procmig trace_platform user_variables link_user_v
   ADD_TESH(tracing-${example} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/${example}.tesh)
 endforeach()
 
-add_executable       (simple                     simple.c)
-target_link_libraries(simple                     simgrid)
-
 ## Clean generated files
 get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/ms.cat.plist;${CMAKE_CURRENT_BINARY_DIR}/ms.trace;${CMAKE_CURRENT_BINARY_DIR}/ms.uncat.plist;")
 
 set(tesh_files    ${tesh_files}                                                    PARENT_SCOPE)
-set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/simple.c            PARENT_SCOPE)
-set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/deployment.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/procmig-deploy.xml  PARENT_SCOPE)
+set(examples_src  ${examples_src}                                                  PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/deployment.xml      PARENT_SCOPE)

diff --git a/examples/msg/tracing/procmig-deploy.xml b/examples/msg/tracing/procmig-deploy.xml
deleted file mode 100644 (file)
index 0f08ee0..0000000
--- a/examples/msg/tracing/procmig-deploy.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Fafard" function="emigrant"/>
-  <process host="Tremblay" function="master"/>
-</platform>

diff --git a/examples/msg/tracing/procmig.c b/examples/msg/tracing/procmig.c
index a98786e..78f3616 100644 (file)
--- a/examples/msg/tracing/procmig.c
+++ b/examples/msg/tracing/procmig.c
@@ -74,20 +74,15 @@ static int master(int argc, char *argv[])
 int main(int argc, char *argv[])
 {
   MSG_init(&argc, argv);
-  if (argc < 3) {
-    XBT_CRITICAL("Usage: %s platform_file deployment_file\n", argv[0]);
-    exit(1);
-  }
+  xbt_assert(argc > 1, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
   MSG_create_environment(argv[1]);
 
   TRACE_category ("migration_order");
 
-  /* Application deployment */
-  MSG_function_register("emigrant", emigrant);
-  MSG_function_register("master", master);
-  MSG_launch_application(argv[2]);
+  MSG_process_create("emigrant", emigrant, NULL, MSG_get_host_by_name("Fafard"));
+  MSG_process_create("master", master, NULL, MSG_get_host_by_name("Tremblay"));
 
   MSG_main();
   return 0;
-}                               /* end_of_main */
+}