Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
refactor 3 more examples
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Thu, 24 Mar 2016 11:09:57 +0000 (12:09 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Thu, 24 Mar 2016 11:09:57 +0000 (12:09 +0100)
17 files changed:
.gitignore
examples/msg/CMakeLists.txt
examples/msg/sendrecv/CMakeLists.txt [deleted file]
examples/msg/sendrecv/README [deleted file]
examples/msg/sendrecv/sendrecv.tesh [new file with mode: 0644]
examples/msg/sendrecv/sendrecv_CLM03.tesh [deleted file]
examples/msg/sendrecv/sendrecv_Reno.tesh [deleted file]
examples/msg/sendrecv/sendrecv_Vegas.tesh [deleted file]
examples/msg/sendrecv/sendrecv_d.xml [moved from examples/msg/sendrecv/deployment_sendrecv.xml with 73% similarity]
examples/msg/set-maestro/CMakeLists.txt [deleted file]
examples/msg/start_kill_time/CMakeLists.txt [deleted file]
examples/msg/start_kill_time/baseline_d.xml [moved from examples/msg/start_kill_time/deployment.xml with 100% similarity]
examples/msg/start_kill_time/kill_d.xml [moved from examples/msg/start_kill_time/deployment_kill.xml with 100% similarity]
examples/msg/start_kill_time/start_d.xml [moved from examples/msg/start_kill_time/deployment_start.xml with 100% similarity]
examples/msg/start_kill_time/start_kill_d.xml [moved from examples/msg/start_kill_time/deployment_start_kill.xml with 100% similarity]
examples/msg/start_kill_time/start_kill_time.tesh
tools/cmake/DefinePackages.cmake

index 100e2be..7768a97 100644 (file)
@@ -121,7 +121,6 @@ examples/msg/actions-mpi/actions-mpi
 examples/msg/actions-storage/actions-storage
 examples/msg/bittorrent/bittorrent
 examples/msg/bittorrent/bittorrent_platfgen
-examples/msg/categories.trace
 examples/msg/chainsend/chainsend
 examples/msg/cloud/bound
 examples/msg/cloud/master_worker_vm
@@ -139,11 +138,9 @@ examples/msg/energy-pstate/energy-pstate
 examples/msg/energy-ptask/energy-ptask
 examples/msg/energy-vm/energy-vm
 examples/msg/gtnets/gtnets
-examples/msg/icomms/.kdbgrc.peer3
 examples/msg/icomms/peer
 examples/msg/icomms/peer2
 examples/msg/icomms/peer3
-examples/msg/icomms/toto.txt
 examples/msg/io/file
 examples/msg/io/file_unlink
 examples/msg/io/remote
index fd87a1d..b3ae847 100644 (file)
@@ -1,6 +1,6 @@
 foreach(x actions-mpi actions-storage dht-chord dht-pastry 
           exception energy-consumption energy-onoff energy-pstate energy-ptask energy-vm 
-          migration pmm priority properties suspend synchro token_ring)
+          migration pmm priority properties sendrecv set-maestro suspend start_kill_time synchro token_ring)
   add_executable       (${x}     ${x}/${x}.c)
   target_link_libraries(${x}     simgrid)
   set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -28,9 +28,16 @@ set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/action
                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-pastry/pastry10.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/energy-onoff/platform_onoff.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/priority/priority_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/properties/properties_d.xml                  PARENT_SCOPE)
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/properties/properties_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv/sendrecv_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/set-maestro/set-maestro_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/start_kill_time/baseline_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/start_kill_time/kill_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/start_kill_time/start_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/start_kill_time/start_kill_d.xml             PARENT_SCOPE)
 
-foreach(x actions-mpi actions-storage dht-chord migration priority properties suspend synchro token_ring)
+foreach(x actions-mpi actions-storage dht-chord migration priority properties sendrecv suspend 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()
 
@@ -41,10 +48,11 @@ 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)
-# ADD_TESH_FACTORIES(msg-dht-pastry "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/dht-pastry --cd ${CMAKE_BINARY_DIR}/examples/msg/dht-pastry dht-pastry.tesh)
+# ADD_TESH_FACTORIES(msg-dht-pastry                    "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/dht-pastry --cd ${CMAKE_BINARY_DIR}/examples/msg/dht-pastry dht-pastry.tesh)
 ADD_TESH_FACTORIES(msg-energy-pstate-ptask             "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-pstate/energy-pstate.tesh)
 ADD_TESH_FACTORIES(msg-energy-consumption-ptask        "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-consumption/energy-consumption.tesh)
 ADD_TESH_FACTORIES(msg-energy-ptask                    "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-ptask/energy-ptask.tesh)
+ADD_TESH_FACTORIES(msg-set-maestro                     "thread" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/set-maestro/set-maestro.tesh)
 
 ADD_TESH(msg-pmm  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm.tesh)
 # This one is not usable:
diff --git a/examples/msg/sendrecv/CMakeLists.txt b/examples/msg/sendrecv/CMakeLists.txt
deleted file mode 100644 (file)
index 35fcac7..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-add_executable       (sendrecv      sendrecv.c)
-target_link_libraries(sendrecv      simgrid)
-
-ADD_TESH_FACTORIES(msg-sendrecv-CLM03 "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_CLM03.tesh)
-ADD_TESH_FACTORIES(msg-sendrecv-Vegas "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Vegas.tesh)
-ADD_TESH_FACTORIES(msg-sendrecv-Reno  "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Reno.tesh)
-
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv_CLM03.tesh
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv_Reno.tesh
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv_Vegas.tesh      PARENT_SCOPE)
-set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/deployment_sendrecv.xml  PARENT_SCOPE)
-set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv.c               PARENT_SCOPE)
-set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/README                   PARENT_SCOPE)
diff --git a/examples/msg/sendrecv/README b/examples/msg/sendrecv/README
deleted file mode 100644 (file)
index 5577d64..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-====================================================
-           Send/Recv - Simple MSG Example
-====================================================
-Directory : SG_INSTALL_DIR/examples/msg/sendrecv
-Content   : Simple sendrecv msg example
-Author    : SimGrid Team
-====================================================
-
-
-This directory contains a simple send/recv example 
-using MSG. The platform file is composed by two 
-hosts called Imnos and Bellevue. Two process are 
-implemented in sendrecv.c : sender and receiver. 
-Sender process runs on "Imnos" host taking as 
-parameter the receiver hostname "Bellevue". Receiver 
-process runs on "Bellevue" listening to messages 
-from any host.
-
-
-
-
-
diff --git a/examples/msg/sendrecv/sendrecv.tesh b/examples/msg/sendrecv/sendrecv.tesh
new file mode 100644 (file)
index 0000000..f542117
--- /dev/null
@@ -0,0 +1,73 @@
+#! ./tesh
+
+p Testing with default compound
+
+$ $SG_TEST_EXENV ${bindir:=.}/sendrecv$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/sendrecv/sendrecv_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (1:sender@Tremblay) sender
+> [  0.000000] (1:sender@Tremblay) host = Jupiter
+> [  0.000000] (1:sender@Tremblay) task_la->data = 0.000000e+00
+> [  0.000000] (2:receiver@Jupiter) receiver
+> [  0.019014] (2:receiver@Jupiter) Task received : latency task
+> [  0.019014] (2:receiver@Jupiter) Communic. time 1.901449e-02
+> [  0.019014] (2:receiver@Jupiter) --- la 0.019014 ----
+> [  0.019014] (1:sender@Tremblay) task_bw->data = 1.901449e-02
+> [150.178356] (2:receiver@Jupiter) Task received : bandwidth task
+> [150.178356] (2:receiver@Jupiter) Communic. time 1.501593e+02
+> [150.178356] (2:receiver@Jupiter) --- bw 6659592.318450 ----
+> [150.178356] (0:maestro@) Total simulation time: 1.501784e+02
+
+p Testing the deprecated CM02 network model
+
+$ $SG_TEST_EXENV ${bindir:=.}/sendrecv$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/sendrecv/sendrecv_d.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
+> [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
+> [  0.000000] (1:sender@Tremblay) sender
+> [  0.000000] (1:sender@Tremblay) host = Jupiter
+> [  0.000000] (1:sender@Tremblay) task_la->data = 0.000000e+00
+> [  0.000000] (2:receiver@Jupiter) receiver
+> [  0.001462] (2:receiver@Jupiter) Task received : latency task
+> [  0.001462] (2:receiver@Jupiter) Communic. time 1.461663e-03
+> [  0.001462] (2:receiver@Jupiter) --- la 0.001462 ----
+> [  0.001462] (1:sender@Tremblay) task_bw->data = 1.461663e-03
+> [145.639041] (2:receiver@Jupiter) Task received : bandwidth task
+> [145.639041] (2:receiver@Jupiter) Communic. time 1.456376e+02
+> [145.639041] (2:receiver@Jupiter) --- bw 6866359.664748 ----
+> [145.639041] (0:maestro@) Total simulation time: 1.456390e+02
+
+p Testing the surf network Reno fairness model using lagrangian approach
+
+$ $SG_TEST_EXENV ${bindir:=.}/sendrecv$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/sendrecv/sendrecv_d.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
+> [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
+> [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Reno'
+> [  0.000000] (1:sender@Tremblay) sender
+> [  0.000000] (1:sender@Tremblay) host = Jupiter
+> [  0.000000] (1:sender@Tremblay) task_la->data = 0.000000e+00
+> [  0.000000] (2:receiver@Jupiter) receiver
+> [  0.015200] (2:receiver@Jupiter) Task received : latency task
+> [  0.015200] (2:receiver@Jupiter) Communic. time 1.519994e-02
+> [  0.015200] (2:receiver@Jupiter) --- la 0.015200 ----
+> [  0.015200] (1:sender@Tremblay) task_bw->data = 1.519994e-02
+> [158.330528] (2:receiver@Jupiter) Task received : bandwidth task
+> [158.330528] (2:receiver@Jupiter) Communic. time 1.583153e+02
+> [158.330528] (2:receiver@Jupiter) --- bw 6316507.782677 ----
+> [158.330528] (0:maestro@) Total simulation time: 1.583305e+02
+
+p Testing the surf network Vegas fairness model using lagrangian approach
+
+$ $SG_TEST_EXENV ${bindir:=.}/sendrecv$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/sendrecv/sendrecv_d.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Vegas" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
+> [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
+> [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Vegas'
+> [  0.000000] (1:sender@Tremblay) sender
+> [  0.000000] (1:sender@Tremblay) host = Jupiter
+> [  0.000000] (1:sender@Tremblay) task_la->data = 0.000000e+00
+> [  0.000000] (2:receiver@Jupiter) receiver
+> [  0.015200] (2:receiver@Jupiter) Task received : latency task
+> [  0.015200] (2:receiver@Jupiter) Communic. time 1.519994e-02
+> [  0.015200] (2:receiver@Jupiter) --- la 0.015200 ----
+> [  0.015200] (1:sender@Tremblay) task_bw->data = 1.519994e-02
+> [158.330528] (2:receiver@Jupiter) Task received : bandwidth task
+> [158.330528] (2:receiver@Jupiter) Communic. time 1.583153e+02
+> [158.330528] (2:receiver@Jupiter) --- bw 6316507.782677 ----
+> [158.330528] (0:maestro@) Total simulation time: 1.583305e+02
diff --git a/examples/msg/sendrecv/sendrecv_CLM03.tesh b/examples/msg/sendrecv/sendrecv_CLM03.tesh
deleted file mode 100644 (file)
index fb32644..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#! ./tesh
-
-p Testing the deprecated CM02 network model
-
-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
-> [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
-> [  0.000000] (1:sender@Tremblay) sender
-> [  0.000000] (1:sender@Tremblay) host = Jupiter
-> [  0.000000] (1:sender@Tremblay) task_la->data = 0.000000e+00
-> [  0.000000] (2:receiver@Jupiter) receiver
-> [  0.001462] (2:receiver@Jupiter) Task received : latency task
-> [  0.001462] (2:receiver@Jupiter) Communic. time 1.461663e-03
-> [  0.001462] (2:receiver@Jupiter) --- la 0.001462 ----
-> [  0.001462] (1:sender@Tremblay) task_bw->data = 1.461663e-03
-> [145.639041] (2:receiver@Jupiter) Task received : bandwidth task
-> [145.639041] (2:receiver@Jupiter) Communic. time 1.456376e+02
-> [145.639041] (2:receiver@Jupiter) --- bw 6866359.664748 ----
-> [145.639041] (0:maestro@) Total simulation time: 1.456390e+02
diff --git a/examples/msg/sendrecv/sendrecv_Reno.tesh b/examples/msg/sendrecv/sendrecv_Reno.tesh
deleted file mode 100644 (file)
index 9227592..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#! ./tesh
-
-p Testing the surf network Reno fairness model using lagrangian approach
-
-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
-> [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
-> [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Reno'
-> [  0.000000] (1:sender@Tremblay) sender
-> [  0.000000] (1:sender@Tremblay) host = Jupiter
-> [  0.000000] (1:sender@Tremblay) task_la->data = 0.000000e+00
-> [  0.000000] (2:receiver@Jupiter) receiver
-> [  0.015200] (2:receiver@Jupiter) Task received : latency task
-> [  0.015200] (2:receiver@Jupiter) Communic. time 1.519994e-02
-> [  0.015200] (2:receiver@Jupiter) --- la 0.015200 ----
-> [  0.015200] (1:sender@Tremblay) task_bw->data = 1.519994e-02
-> [158.330528] (2:receiver@Jupiter) Task received : bandwidth task
-> [158.330528] (2:receiver@Jupiter) Communic. time 1.583153e+02
-> [158.330528] (2:receiver@Jupiter) --- bw 6316507.782677 ----
-> [158.330528] (0:maestro@) Total simulation time: 1.583305e+02
diff --git a/examples/msg/sendrecv/sendrecv_Vegas.tesh b/examples/msg/sendrecv/sendrecv_Vegas.tesh
deleted file mode 100644 (file)
index 20a2f5c..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#! ./tesh
-
-p Testing the surf network Vegas fairness model using lagrangian approach
-
-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Vegas" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
-> [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
-> [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Vegas'
-> [  0.000000] (1:sender@Tremblay) sender
-> [  0.000000] (1:sender@Tremblay) host = Jupiter
-> [  0.000000] (1:sender@Tremblay) task_la->data = 0.000000e+00
-> [  0.000000] (2:receiver@Jupiter) receiver
-> [  0.015200] (2:receiver@Jupiter) Task received : latency task
-> [  0.015200] (2:receiver@Jupiter) Communic. time 1.519994e-02
-> [  0.015200] (2:receiver@Jupiter) --- la 0.015200 ----
-> [  0.015200] (1:sender@Tremblay) task_bw->data = 1.519994e-02
-> [158.330528] (2:receiver@Jupiter) Task received : bandwidth task
-> [158.330528] (2:receiver@Jupiter) Communic. time 1.583153e+02
-> [158.330528] (2:receiver@Jupiter) --- bw 6316507.782677 ----
-> [158.330528] (0:maestro@) Total simulation time: 1.583305e+02
similarity index 73%
rename from examples/msg/sendrecv/deployment_sendrecv.xml
rename to examples/msg/sendrecv/sendrecv_d.xml
index 5396198..1c4bf8b 100644 (file)
@@ -2,9 +2,6 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <!-- For using with ping_pong, platform_sendrecv.xml -->
-
-  <process host="Tremblay" function="sender">
-       <argument value="Jupiter"/>
-  </process>
+  <process host="Tremblay" function="sender"> <argument value="Jupiter"/> </process>
   <process host="Jupiter" function="receiver"/>
 </platform>
diff --git a/examples/msg/set-maestro/CMakeLists.txt b/examples/msg/set-maestro/CMakeLists.txt
deleted file mode 100644 (file)
index 0070355..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-add_executable       (set-maestro set-maestro.c)
-target_link_libraries(set-maestro simgrid)
-
-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)
-
-set(tesh_files   ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/set-maestro.tesh  PARENT_SCOPE)
-set(xml_files    ${xml_files}    ${CMAKE_CURRENT_SOURCE_DIR}/set-maestro_d.xml PARENT_SCOPE)
-set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/set-maestro.c     PARENT_SCOPE)
diff --git a/examples/msg/start_kill_time/CMakeLists.txt b/examples/msg/start_kill_time/CMakeLists.txt
deleted file mode 100644 (file)
index 7235dc9..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-add_executable       (start_kill_time start_kill_time.c)
-target_link_libraries(start_kill_time simgrid)
-
-ADD_TESH(msg-start-kill-time --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/ --cd ${CMAKE_HOME_DIRECTORY}/examples/ ${CMAKE_HOME_DIRECTORY}/examples/msg/start_kill_time/start_kill_time.tesh)
-
-set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/start_kill_time.c             PARENT_SCOPE)
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/start_kill_time.tesh   PARENT_SCOPE)
-set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/deployment_kill.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_start_kill.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_start.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/deployment.xml        PARENT_SCOPE)
index c6c59c7..a3b2ed1 100644 (file)
@@ -2,7 +2,7 @@
 
 p Test0 Process without time
 
-$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/start_kill_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time ${srcdir:=.}/cluster.xml ${srcdir:=.}/../msg/start_kill_time/baseline_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep.
 > [ 10.000000] (1:sleeper@node-0.acme.org) Done sleeping.
 > [ 10.000000] (1:sleeper@node-0.acme.org) Exiting now (done sleeping or got killed).
@@ -10,7 +10,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/start_kill_time ${srcdir:=.}/examp
 
 p Test1 Process with start time
 
-$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/start_kill_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment_start.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time ${srcdir:=.}/cluster.xml ${srcdir:=.}/../msg/start_kill_time/start_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep.
 > [  1.000000] (2:sleeper@node-1.acme.org) Hello! I go to sleep.
 > [  2.000000] (3:sleeper@node-2.acme.org) Hello! I go to sleep.
@@ -33,7 +33,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/start_kill_time ${srcdir:=.}/examp
 
 p Test1 Process with kill time
 
-$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/start_kill_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment_kill.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time ${srcdir:=.}/cluster.xml ${srcdir:=.}/../msg/start_kill_time/kill_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sleeper@node-1.acme.org) Hello! I go to sleep.
 > [  0.000000] (2:sleeper@node-2.acme.org) Hello! I go to sleep.
 > [  0.000000] (3:sleeper@node-3.acme.org) Hello! I go to sleep.
@@ -45,7 +45,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/start_kill_time ${srcdir:=.}/examp
 
 p Test2 Process with start and kill times
 
-$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/start_kill_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment_start_kill.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time ${srcdir:=.}/cluster.xml ${srcdir:=.}/../msg/start_kill_time/start_kill_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep.
 > [  1.000000] (2:sleeper@node-1.acme.org) Hello! I go to sleep.
 > [  2.000000] (3:sleeper@node-2.acme.org) Hello! I go to sleep.
index 74b738d..e55b75a 100644 (file)
@@ -959,9 +959,6 @@ set(CMAKEFILES_TXT
     examples/msg/masterslave/CMakeLists.txt
     examples/msg/mc/CMakeLists.txt
     examples/msg/ns3/CMakeLists.txt
-    examples/msg/sendrecv/CMakeLists.txt
-    examples/msg/set-maestro/CMakeLists.txt
-    examples/msg/start_kill_time/CMakeLists.txt
     examples/msg/tracing/CMakeLists.txt
   examples/s4u/CMakeLists.txt
   examples/simdag/CMakeLists.txt