From: Frederic Suter Date: Wed, 30 Mar 2016 10:37:45 +0000 (+0200) Subject: rename to match C and Java version X-Git-Tag: v3_13~220 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9cf0b0c27998998f0dc3ea1e088802e149848b46?hp=2534be6f143eb3b32a2dc3ea116a0f4510d4f0d5 rename to match C and Java version --- diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt index abac8c2cfa..1cbec028ff 100644 --- 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 masterslave masterslave-mailbox pmm priority process-kill process-migration process-suspend - properties sendrecv set-maestro start_kill_time synchro token_ring trace-categories + properties sendrecv set-maestro process-startkilltime synchro token_ring trace-categories trace-link-srcdst-user-variables trace-link-user-variables trace-masterslave trace-platform trace-process-migration trace-simple trace-user-variables) add_executable (${x} ${x}/${x}.c) @@ -76,14 +76,14 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/action ${CMAKE_CURRENT_SOURCE_DIR}/ns3/onelink_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/ns3/one_cluster_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/ns3/two_clusters_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) + ${CMAKE_CURRENT_SOURCE_DIR}/process-startkilltime/baseline_d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/process-startkilltime/kill_d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/process-startkilltime/start_d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/process-startkilltime/start_kill_d.xml PARENT_SCOPE) foreach(x actions-mpi actions-storage async-wait async-waitall async-waitany bittorrent chainsend dht-chord dht-kademlia failures io-file io-file-unlink io-remote io-storage masterslave masterslave-mailbox priority process-kill - process-migration process-suspend properties sendrecv synchro start_kill_time token_ring) + process-migration process-suspend properties sendrecv synchro process-startkilltime token_ring) ADD_TESH_FACTORIES(msg-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/${x} ${x}.tesh) endforeach() diff --git a/examples/msg/start_kill_time/baseline_d.xml b/examples/msg/process-startkilltime/baseline_d.xml similarity index 100% rename from examples/msg/start_kill_time/baseline_d.xml rename to examples/msg/process-startkilltime/baseline_d.xml diff --git a/examples/msg/start_kill_time/kill_d.xml b/examples/msg/process-startkilltime/kill_d.xml similarity index 100% rename from examples/msg/start_kill_time/kill_d.xml rename to examples/msg/process-startkilltime/kill_d.xml diff --git a/examples/msg/start_kill_time/start_kill_time.c b/examples/msg/process-startkilltime/process-startkilltime.c similarity index 100% rename from examples/msg/start_kill_time/start_kill_time.c rename to examples/msg/process-startkilltime/process-startkilltime.c diff --git a/examples/msg/start_kill_time/start_kill_time.tesh b/examples/msg/process-startkilltime/process-startkilltime.tesh similarity index 82% rename from examples/msg/start_kill_time/start_kill_time.tesh rename to examples/msg/process-startkilltime/process-startkilltime.tesh index a3b2ed1945..b7c58aed60 100644 --- a/examples/msg/start_kill_time/start_kill_time.tesh +++ b/examples/msg/process-startkilltime/process-startkilltime.tesh @@ -2,7 +2,7 @@ p Test0 Process without time -$ $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" +$ $SG_TEST_EXENV ${bindir:=.}/process-startkilltime ${srcdir:=.}/cluster.xml ${srcdir:=.}/../msg/process-startkilltime/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 ${srcdir:=.}/cluster.xml ${srcdir: p Test1 Process with start time -$ $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" +$ $SG_TEST_EXENV ${bindir:=.}/process-startkilltime ${srcdir:=.}/cluster.xml ${srcdir:=.}/../msg/process-startkilltime/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 ${srcdir:=.}/cluster.xml ${srcdir: p Test1 Process with kill time -$ $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" +$ $SG_TEST_EXENV ${bindir:=.}/process-startkilltime ${srcdir:=.}/cluster.xml ${srcdir:=.}/../msg/process-startkilltime/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 ${srcdir:=.}/cluster.xml ${srcdir: p Test2 Process with start and kill times -$ $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" +$ $SG_TEST_EXENV ${bindir:=.}/process-startkilltime ${srcdir:=.}/cluster.xml ${srcdir:=.}/../msg/process-startkilltime/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. diff --git a/examples/msg/start_kill_time/start_d.xml b/examples/msg/process-startkilltime/start_d.xml similarity index 100% rename from examples/msg/start_kill_time/start_d.xml rename to examples/msg/process-startkilltime/start_d.xml diff --git a/examples/msg/start_kill_time/start_kill_d.xml b/examples/msg/process-startkilltime/start_kill_d.xml similarity index 100% rename from examples/msg/start_kill_time/start_kill_d.xml rename to examples/msg/process-startkilltime/start_kill_d.xml