From d378f9eefdee1ac3c94d87a57b228c3898e82ca7 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Fri, 27 Mar 2020 10:32:39 +0100 Subject: [PATCH] rename C examples binaries (prefix and not suffix) --- .gitignore | 82 ++++++++++--------- examples/c/CMakeLists.txt | 32 ++++---- examples/c/actor-create/actor-create.tesh | 2 +- examples/c/actor-daemon/actor-daemon.tesh | 2 +- examples/c/actor-exiting/actor-exiting.tesh | 2 +- examples/c/actor-join/actor-join.tesh | 2 +- examples/c/actor-kill/actor-kill.tesh | 2 +- examples/c/actor-lifetime/actor-lifetime.tesh | 2 +- examples/c/actor-migrate/actor-migrate.tesh | 2 +- .../c/actor-stacksize/actor-stacksize.tesh | 2 +- examples/c/actor-suspend/actor-suspend.tesh | 2 +- examples/c/actor-yield/actor-yield.tesh | 2 +- examples/c/app-bittorrent/app-bittorrent.tesh | 2 +- examples/c/app-chainsend/app-chainsend.tesh | 2 +- .../app-masterworker-multicore.tesh | 2 +- .../app-masterworker-vivaldi.tesh | 2 +- .../c/app-masterworker/app-masterworker.tesh | 4 +- examples/c/app-pingpong/app-pingpong.tesh | 8 +- examples/c/app-token-ring/app-token-ring.tesh | 6 +- examples/c/async-wait/async-wait.tesh | 8 +- examples/c/async-waitall/async-waitall.tesh | 2 +- examples/c/async-waitany/async-waitany.tesh | 2 +- examples/c/cloud-capping/cloud-capping.tesh | 2 +- .../cloud-masterworker.tesh | 2 +- .../c/cloud-migration/cloud-migration.tesh | 2 +- examples/c/cloud-simple/cloud-simple.tesh | 2 +- examples/c/dht-kademlia/dht-kademlia.tesh | 2 +- examples/c/dht-pastry/dht-pastry.tesh | 2 +- .../energy-exec-ptask/energy-exec-ptask.tesh | 2 +- examples/c/energy-exec/energy-exec.tesh | 4 +- examples/c/energy-vm/energy-vm.tesh | 2 +- examples/c/exec-async/exec-async.tesh | 2 +- examples/c/exec-basic/exec-basic.tesh | 2 +- examples/c/exec-dvfs/exec-dvfs.tesh | 4 +- examples/c/exec-remote/exec-remote.tesh | 2 +- examples/c/exec-waitany/exec-waitany.tesh | 2 +- examples/c/io-disk-raw/io-disk-raw.tesh | 2 +- examples/c/io-file-remote/io-file-remote.tesh | 2 +- examples/c/io-file-system/io-file-system.tesh | 2 +- .../platform-failures/platform-failures.tesh | 6 +- .../platform-properties.tesh | 2 +- .../c/plugin-hostload/plugin-hostload.tesh | 2 +- .../synchro-semaphore/synchro-semaphore.tesh | 2 +- 43 files changed, 113 insertions(+), 109 deletions(-) diff --git a/.gitignore b/.gitignore index 1e6a259d7f..e835918df4 100644 --- a/.gitignore +++ b/.gitignore @@ -118,48 +118,49 @@ tags callgrind.out.* ### Examples and traces *.exe -examples/c/actor-daemon/actor-daemon-c -examples/c/actor-exiting/actor-exiting-c -examples/c/actor-join/actor-join-c -examples/c/actor-kill/actor-kill-c -examples/c/actor-lifetime/actor-lifetime-c -examples/c/actor-migrate/actor-migrate-c -examples/c/actor-stacksize/actor-stacksize-c -examples/c/actor-suspend/actor-suspend-c -examples/c/actor-yield/actor-yield-c -examples/c/app-bittorrent/app-bittorrent-c -examples/c/app-chainsend/app-chainsend-c -examples/c/app-masterworker/app-masterworker-c -examples/c/app-pingpong/app-pingpong-c -examples/c/app-token-ring/app-token-ring-c -examples/c/async-wait/async-wait-c -examples/c/async-waitall/async-waitall-c -examples/c/async-waitany/async-waitany-c -examples/c/cloud-capping/cloud-capping-c -examples/c/cloud-masterworker/cloud-masterworker-c -examples/c/cloud-migration/cloud-migration-c -examples/c/cloud-simple/cloud-simple-c -examples/c/dht-kademlia/dht-kademlia-c -examples/c/energy-exec/energy-exec-c -examples/c/energy-exec-ptask/energy-exec-ptask-c -examples/c/energy-vm/energy-vm-c -examples/c/exec-basic/exec-basic-c -examples/c/exec-dvfs/exec-dvfs-c -examples/c/exec-remote/exec-remote-c -examples/c/exec-async/exec-async-c -examples/c/exec-waitany/exec-waitany-c -examples/c/io-disk-raw/io-disk-raw-c -examples/c/io-file-remote/io-file-remote-c -examples/c/platform-failures/platform-failures-c -examples/c/platform-properties/platform-properties-c -examples/c/plugin-hostload/plugin-hostload-c +examples/c/actor-create/c-actor-create +examples/c/actor-daemon/c-actor-daemon +examples/c/actor-exiting/c-actor-exiting +examples/c/actor-join/c-actor-join +examples/c/actor-kill/c-actor-kill +examples/c/actor-lifetime/c-actor-lifetime +examples/c/actor-migrate/c-actor-migrate +examples/c/actor-stacksize/c-actor-stacksize +examples/c/actor-suspend/c-actor-suspend +examples/c/actor-yield/c-actor-yield +examples/c/app-bittorrent/c-app-bittorrent +examples/c/app-chainsend/c-app-chainsend +examples/c/app-masterworker/c-app-masterworker +examples/c/app-pingpong/c-app-pingpong +examples/c/app-token-ring/c-app-token-ring +examples/c/async-wait/c-async-wait +examples/c/async-waitall/c-async-waitall +examples/c/async-waitany/c-async-waitany +examples/c/cloud-capping/c-cloud-capping +examples/c/cloud-masterworker/c-cloud-masterworker +examples/c/cloud-migration/c-cloud-migration +examples/c/cloud-simple/c-cloud-simple +examples/c/dht-kademlia/c-dht-kademlia +examples/c/dht-pastry/c-dht-pastry +examples/c/energy-exec/c-energy-exec +examples/c/energy-exec-ptask/c-energy-exec-ptask +examples/c/energy-vm/c-energy-vm +examples/c/exec-basic/c-exec-basic +examples/c/exec-dvfs/c-exec-dvfs +examples/c/exec-remote/c-exec-remote +examples/c/exec-async/c-exec-async +examples/c/exec-waitany/c-exec-waitany +examples/c/io-disk-raw/c-io-disk-raw +examples/c/io-file-remote/c-io-file-remote +examples/c/io-file-system/c-io-file-system +examples/c/platform-failures/c-platform-failures +examples/c/platform-properties/c-platform-properties +examples/c/plugin-hostload/c-plugin-hostload +examples/c/synchro-semaphore/c-synchro-semaphore examples/deprecated/msg/app-masterworker/app-masterworker examples/deprecated/msg/cloud-masterworker/cloud-masterworker examples/deprecated/msg/dht-kademlia/dht-kademlia examples/deprecated/msg/dht-pastry/dht-pastry -examples/deprecated/msg/mc/bugged1 -examples/deprecated/msg/mc/bugged1_liveness -examples/deprecated/msg/mc/bugged2 examples/deprecated/msg/mc/bugged2_liveness examples/deprecated/msg/mc/bugged3 examples/deprecated/msg/mc/centralized_mutex @@ -222,6 +223,9 @@ examples/s4u/io-file-remote/s4u-io-file-remote examples/s4u/io-file-system/s4u-io-file-system examples/s4u/io-storage-raw/s4u-io-storage-raw examples/s4u/maestro-set/s4u-maestro-set +examples/s4u/mc-bugged1/s4u-mc-bugged1 +examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness +examples/s4u/mc-bugged2/s4u-mc-bugged2 examples/s4u/mc-electric-fence/s4u-mc-electric-fence examples/s4u/mc-failing-assert/s4u-mc-failing-assert examples/s4u/network-ns3/s4u-network-ns3 @@ -282,7 +286,6 @@ teshsuite/mc/dwarf-expression/dwarf-expression teshsuite/mc/mutex-handling/mutex-handling teshsuite/mc/mutex-handling/without-mutex-handling teshsuite/mc/random-bug/random-bug -teshsuite/msg/cloud-two-tasks/cloud-two-tasks teshsuite/msg/get_sender/get_sender teshsuite/msg/io-file/io-file teshsuite/msg/task_destroy_cancel/task_destroy_cancel @@ -294,6 +297,7 @@ teshsuite/s4u/actor-migration/actor-migration teshsuite/s4u/basic-link-test/basic-link-test teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration teshsuite/s4u/cloud-sharing/cloud-sharing +teshsuite/s4u/cloud-two-execs/cloud-two-execs teshsuite/s4u/comm-pt2pt/comm-pt2pt teshsuite/s4u/concurrent_rw/concurrent_rw teshsuite/s4u/evaluate-get-route-time/evaluate-get-route-time diff --git a/examples/c/CMakeLists.txt b/examples/c/CMakeLists.txt index 89de75230a..34168e5ef2 100644 --- a/examples/c/CMakeLists.txt +++ b/examples/c/CMakeLists.txt @@ -14,10 +14,10 @@ foreach(x platform-failures platform-properties plugin-hostload synchro-semaphore) - add_executable (${x}-c EXCLUDE_FROM_ALL ${x}/${x}.c) - target_link_libraries(${x}-c simgrid) - set_target_properties(${x}-c PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x}) - add_dependencies(tests ${x}-c) + add_executable (c-${x} EXCLUDE_FROM_ALL ${x}/${x}.c) + target_link_libraries(c-${x} simgrid) + set_target_properties(c-${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x}) + add_dependencies(tests c-${x}) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh) set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.c) @@ -26,10 +26,10 @@ endforeach() # Multi-files examples ###################### # bittorrent example -add_executable (app-bittorrent-c EXCLUDE_FROM_ALL app-bittorrent/app-bittorrent.c app-bittorrent/bittorrent-peer.c app-bittorrent/tracker.c) -target_link_libraries(app-bittorrent-c simgrid) -set_target_properties(app-bittorrent-c PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/app-bittorrent) -add_dependencies(tests app-bittorrent-c) +add_executable (c-app-bittorrent EXCLUDE_FROM_ALL app-bittorrent/app-bittorrent.c app-bittorrent/bittorrent-peer.c app-bittorrent/tracker.c) +target_link_libraries(c-app-bittorrent simgrid) +set_target_properties(c-app-bittorrent PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/app-bittorrent) +add_dependencies(tests c-app-bittorrent) foreach (file app-bittorrent bittorrent-peer tracker) set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/${file}.c ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/${file}.h) @@ -37,11 +37,11 @@ endforeach() # Chainsend example -add_executable (app-chainsend-c EXCLUDE_FROM_ALL app-chainsend/chainsend.c app-chainsend/broadcaster.c +add_executable (c-app-chainsend EXCLUDE_FROM_ALL app-chainsend/chainsend.c app-chainsend/broadcaster.c app-chainsend/peer.c) -target_link_libraries(app-chainsend-c simgrid) -set_target_properties(app-chainsend-c PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/app-chainsend) -add_dependencies(tests app-chainsend-c) +target_link_libraries(c-app-chainsend simgrid) +set_target_properties(c-app-chainsend PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/app-chainsend) +add_dependencies(tests c-app-chainsend) foreach (file chainsend broadcaster peer) set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/app-chainsend/${file}.c) @@ -49,10 +49,10 @@ endforeach() set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/app-chainsend/chainsend.h) #DHT-Kademlia -add_executable (dht-kademlia-c EXCLUDE_FROM_ALL dht-kademlia/dht-kademlia.c dht-kademlia/node.c dht-kademlia/routing_table.c dht-kademlia/message.c dht-kademlia/answer.c) -target_link_libraries(dht-kademlia-c simgrid) -set_target_properties(dht-kademlia-c PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dht-kademlia) -add_dependencies(tests dht-kademlia-c) +add_executable (c-dht-kademlia EXCLUDE_FROM_ALL dht-kademlia/dht-kademlia.c dht-kademlia/node.c dht-kademlia/routing_table.c dht-kademlia/message.c dht-kademlia/answer.c) +target_link_libraries(c-dht-kademlia simgrid) +set_target_properties(c-dht-kademlia PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dht-kademlia) +add_dependencies(tests c-dht-kademlia) foreach (file answer node routing_table message) set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/${file}.c ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/${file}.h) diff --git a/examples/c/actor-create/actor-create.tesh b/examples/c/actor-create/actor-create.tesh index 085536ce61..5c3d3af4d0 100644 --- a/examples/c/actor-create/actor-create.tesh +++ b/examples/c/actor-create/actor-create.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/actor-create-c +$ ${bindir:=.}/c-actor-create > [Tremblay:sender1:(2) 0.000000] [actor_create/INFO] Hello, I have something to send > [Jupiter:sender2:(3) 0.000000] [actor_create/INFO] Hello, I have something to send > [Fafard:sender:(4) 0.000000] [actor_create/INFO] Hello, I have something to send diff --git a/examples/c/actor-daemon/actor-daemon.tesh b/examples/c/actor-daemon/actor-daemon.tesh index dd3cfea0ce..f2253fa728 100644 --- a/examples/c/actor-daemon/actor-daemon.tesh +++ b/examples/c/actor-daemon/actor-daemon.tesh @@ -2,7 +2,7 @@ p Testing the actor daemonization feature -$ ${bindir:=.}/actor-daemon-c ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-actor-daemon ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:worker@Boivin) Let's do some work (for 10 sec on Boivin). > [ 0.000000] (2:daemon@Tremblay) Hello from the infinite loop > [ 3.000000] (2:daemon@Tremblay) Hello from the infinite loop diff --git a/examples/c/actor-exiting/actor-exiting.tesh b/examples/c/actor-exiting/actor-exiting.tesh index 0ed5c85a7a..adf57a8271 100644 --- a/examples/c/actor-exiting/actor-exiting.tesh +++ b/examples/c/actor-exiting/actor-exiting.tesh @@ -1,4 +1,4 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/actor-exiting-c ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/c-actor-exiting ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 10.194200] (A@Tremblay) I stop now diff --git a/examples/c/actor-join/actor-join.tesh b/examples/c/actor-join/actor-join.tesh index 85f82279ad..6d27e5b5c8 100644 --- a/examples/c/actor-join/actor-join.tesh +++ b/examples/c/actor-join/actor-join.tesh @@ -1,4 +1,4 @@ -$ ${bindir:=.}/actor-join-c ${platfdir}/small_platform.xml +$ ${bindir:=.}/c-actor-join ${platfdir}/small_platform.xml > [Tremblay:master:(1) 0.000000] [actor_join/INFO] Start sleeper > [Tremblay:sleeper from master:(2) 0.000000] [actor_join/INFO] Sleeper started > [Tremblay:master:(1) 0.000000] [actor_join/INFO] Join the sleeper (timeout 2) diff --git a/examples/c/actor-kill/actor-kill.tesh b/examples/c/actor-kill/actor-kill.tesh index 78e8f5e011..7f8ef0369c 100644 --- a/examples/c/actor-kill/actor-kill.tesh +++ b/examples/c/actor-kill/actor-kill.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/actor-kill-c ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/c-actor-kill ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (killer@Tremblay) Hello! > [ 0.000000] (victim A@Fafard) Hello! > [ 0.000000] (victim A@Fafard) Suspending myself diff --git a/examples/c/actor-lifetime/actor-lifetime.tesh b/examples/c/actor-lifetime/actor-lifetime.tesh index ba0616e44c..93215fd94b 100644 --- a/examples/c/actor-lifetime/actor-lifetime.tesh +++ b/examples/c/actor-lifetime/actor-lifetime.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/actor-lifetime-c ${platfdir}/cluster_backbone.xml actor-lifetime_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-actor-lifetime ${platfdir}/cluster_backbone.xml actor-lifetime_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sleeper@node-0.simgrid.org) Hello! I go to sleep. > [ 0.000000] (2:sleeper@node-1.simgrid.org) Hello! I go to sleep. > [ 2.000000] (3:sleeper@node-0.simgrid.org) Hello! I go to sleep. diff --git a/examples/c/actor-migrate/actor-migrate.tesh b/examples/c/actor-migrate/actor-migrate.tesh index 03dfd380a8..7cb1ee4161 100644 --- a/examples/c/actor-migrate/actor-migrate.tesh +++ b/examples/c/actor-migrate/actor-migrate.tesh @@ -2,7 +2,7 @@ p Testing the actor migration feature -$ ${bindir:=.}/actor-migrate-c ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/c-actor-migrate ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (worker@Fafard) Let's move to Boivin to execute 1177.14 Mflops (5sec on Boivin and 5sec on Jacquelin) > [ 5.000000] (monitor@Boivin) After 5 seconds, move the actor to Jacquelin > [ 10.000000] (worker@Jacquelin) I wake up on Jacquelin. Let's suspend a bit diff --git a/examples/c/actor-stacksize/actor-stacksize.tesh b/examples/c/actor-stacksize/actor-stacksize.tesh index c56a0dcc06..7cedbaaf69 100644 --- a/examples/c/actor-stacksize/actor-stacksize.tesh +++ b/examples/c/actor-stacksize/actor-stacksize.tesh @@ -3,7 +3,7 @@ ! ignore .*Activating SYSV context factory ! ignore .*Using raw contexts. Because the glibc is just not good enough for us. -$ ${bindir:=.}/actor-stacksize-c --log=simix_context.thresh:verbose --log=no_loc ${platfdir}/small_platform.xml +$ ${bindir:=.}/c-actor-stacksize --log=simix_context.thresh:verbose --log=no_loc ${platfdir}/small_platform.xml > [::(0) 0.000000] [simix_context/VERBOSE] Creating a context of stack 8Mb > [0.000000] [simix_context/VERBOSE] Creating a context of stack 8Mb > [0.000000] [simix_context/VERBOSE] Creating a context of stack 16Mb diff --git a/examples/c/actor-suspend/actor-suspend.tesh b/examples/c/actor-suspend/actor-suspend.tesh index fd4150295b..09275eb0af 100644 --- a/examples/c/actor-suspend/actor-suspend.tesh +++ b/examples/c/actor-suspend/actor-suspend.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! output sort 19 -$ ${bindir:=.}/actor-suspend-c ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/c-actor-suspend ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (dream_master@Boivin) Let's create a lazy guy. > [ 0.000000] (Lazy@Boivin) Nobody's watching me ? Let's go to sleep. > [ 0.000000] (dream_master@Boivin) Let's wait a little bit... diff --git a/examples/c/actor-yield/actor-yield.tesh b/examples/c/actor-yield/actor-yield.tesh index 398d9125fe..34d1d82890 100644 --- a/examples/c/actor-yield/actor-yield.tesh +++ b/examples/c/actor-yield/actor-yield.tesh @@ -1,5 +1,5 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/actor-yield-c ${platfdir}/small_platform_fatpipe.xml ${srcdir:=.}/actor-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-actor-yield ${platfdir}/small_platform_fatpipe.xml ${srcdir:=.}/actor-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:yielder@Tremblay) I yielded 10 times. Goodbye now! > [ 0.000000] (2:yielder@Ruby) I yielded 15 times. Goodbye now! diff --git a/examples/c/app-bittorrent/app-bittorrent.tesh b/examples/c/app-bittorrent/app-bittorrent.tesh index cd97abc277..1e27526060 100644 --- a/examples/c/app-bittorrent/app-bittorrent.tesh +++ b/examples/c/app-bittorrent/app-bittorrent.tesh @@ -4,7 +4,7 @@ p Bittorrent implementation ! timeout 10 ! output sort 19 -$ ${bindir:=.}/app-bittorrent-c ${platfdir}/cluster_backbone.xml app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-bittorrent ${platfdir}/cluster_backbone.xml app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:tracker@node-0.simgrid.org) Tracker launched. > [ 0.000000] (2:peer@node-1.simgrid.org) Hi, I'm joining the network with id 2 > [ 0.000000] (3:peer@node-2.simgrid.org) Hi, I'm joining the network with id 3 diff --git a/examples/c/app-chainsend/app-chainsend.tesh b/examples/c/app-chainsend/app-chainsend.tesh index a277d92769..4a878fa9e6 100644 --- a/examples/c/app-chainsend/app-chainsend.tesh +++ b/examples/c/app-chainsend/app-chainsend.tesh @@ -2,7 +2,7 @@ ! timeout 60 ! output sort 19 -$ ${bindir:=.}/app-chainsend-c ${platfdir}/cluster_backbone.xml app-chainsend_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-chainsend ${platfdir}/cluster_backbone.xml app-chainsend_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" > [ 2.214423] (2:peer@node-1.simgrid.org) ### 2.214423 16777216 bytes (Avg 7.225360 MB/s); copy finished (simulated). > [ 2.222796] (3:peer@node-2.simgrid.org) ### 2.222796 16777216 bytes (Avg 7.198141 MB/s); copy finished (simulated). > [ 2.231170] (4:peer@node-3.simgrid.org) ### 2.231170 16777216 bytes (Avg 7.171127 MB/s); copy finished (simulated). diff --git a/examples/c/app-masterworker/app-masterworker-multicore.tesh b/examples/c/app-masterworker/app-masterworker-multicore.tesh index ec7b42a32e..9e818880b9 100644 --- a/examples/c/app-masterworker/app-masterworker-multicore.tesh +++ b/examples/c/app-masterworker/app-masterworker-multicore.tesh @@ -2,7 +2,7 @@ p Testing a simple master/worker example application -$ ./app-masterworker/app-masterworker-c ${platfdir}/multicore_machine.xml ${srcdir:=.}/app-masterworker-multicore_d.xml --cfg=cpu/model:Cas01 --cfg=cpu/optim:Full "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ./app-masterworker/c-app-masterworker ${platfdir}/multicore_machine.xml ${srcdir:=.}/app-masterworker-multicore_d.xml --cfg=cpu/model:Cas01 --cfg=cpu/optim:Full "--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 'cpu/optim' to 'Full' > [ 0.000000] (1:master@Tremblay) Got 6 workers and 20 tasks to process diff --git a/examples/c/app-masterworker/app-masterworker-vivaldi.tesh b/examples/c/app-masterworker/app-masterworker-vivaldi.tesh index b9bbd25a31..7ae97d40c2 100644 --- a/examples/c/app-masterworker/app-masterworker-vivaldi.tesh +++ b/examples/c/app-masterworker/app-masterworker-vivaldi.tesh @@ -2,7 +2,7 @@ p Testing a simple master/worker example application -$ ${bindir}/app-masterworker-c ${platfdir}/vivaldi.xml ${srcdir:=.}/app-masterworker-vivaldi_d.xml --cfg=network/latency-factor:1.0 --cfg=network/bandwidth-factor:1.0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir}/c-app-masterworker ${platfdir}/vivaldi.xml ${srcdir:=.}/app-masterworker-vivaldi_d.xml --cfg=network/latency-factor:1.0 --cfg=network/bandwidth-factor:1.0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/latency-factor' to '1.0' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/bandwidth-factor' to '1.0' > [ 0.000000] (1:master@100030591) Got 15 workers and 10 tasks to process diff --git a/examples/c/app-masterworker/app-masterworker.tesh b/examples/c/app-masterworker/app-masterworker.tesh index 276c4ed768..30047d8124 100644 --- a/examples/c/app-masterworker/app-masterworker.tesh +++ b/examples/c/app-masterworker/app-masterworker.tesh @@ -3,7 +3,7 @@ p Testing a simple master/worker example application (mailbox version) ! output sort 19 -$ ${bindir:=.}/app-masterworker-c ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/app-masterworker_d.xml --cfg=network/crosstraffic:0 --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-masterworker ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/app-masterworker_d.xml --cfg=network/crosstraffic:0 --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0' > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process > [ 0.000000] (1:master@Tremblay) Sending "Task_0" (of 20) to mailbox "worker-0" @@ -34,7 +34,7 @@ $ ${bindir:=.}/app-masterworker-c ${platfdir}/small_platform_with_routers.xml ${ > [ 5.094868] (0:maestro@) Simulation time 5.09487 > [ 5.094868] (6:worker@Bourassa) I'm done. See you! -$ ${bindir:=.}/app-masterworker-c ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/app-masterworker_d.xml --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-masterworker ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/app-masterworker_d.xml --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process > [ 0.000000] (1:master@Tremblay) Sending "Task_0" (of 20) to mailbox "worker-0" > [ 0.002265] (1:master@Tremblay) Sending "Task_1" (of 20) to mailbox "worker-1" diff --git a/examples/c/app-pingpong/app-pingpong.tesh b/examples/c/app-pingpong/app-pingpong.tesh index cc58aafaad..51facf0a76 100644 --- a/examples/c/app-pingpong/app-pingpong.tesh +++ b/examples/c/app-pingpong/app-pingpong.tesh @@ -2,7 +2,7 @@ p Testing with default compound -$ ${bindir:=.}/app-pingpong-c ${platfdir}/small_platform.xml app-pingpong_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-pingpong ${platfdir}/small_platform.xml app-pingpong_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2 > [ 0.000000] (2:ponger@Jupiter) Pong from mailbox Mailbox 2 to mailbox Mailbox 1 > [ 0.019014] (2:ponger@Jupiter) Task received : small communication (latency bound) @@ -14,7 +14,7 @@ $ ${bindir:=.}/app-pingpong-c ${platfdir}/small_platform.xml app-pingpong_d.xml p Testing with default compound and Full network optimization -$ ${bindir:=.}/app-pingpong-c ${platfdir}/small_platform.xml app-pingpong_d.xml "--cfg=network/optim:Full" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-pingpong ${platfdir}/small_platform.xml app-pingpong_d.xml "--cfg=network/optim:Full" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/optim' to 'Full' > [ 0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2 > [ 0.000000] (2:ponger@Jupiter) Pong from mailbox Mailbox 2 to mailbox Mailbox 1 @@ -27,7 +27,7 @@ $ ${bindir:=.}/app-pingpong-c ${platfdir}/small_platform.xml app-pingpong_d.xml p Testing the deprecated CM02 network model -$ ${bindir:=.}/app-pingpong-c ${platfdir}/small_platform.xml app-pingpong_d.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-pingpong ${platfdir}/small_platform.xml app-pingpong_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:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2 @@ -41,7 +41,7 @@ $ ${bindir:=.}/app-pingpong-c ${platfdir}/small_platform.xml app-pingpong_d.xml p Testing the surf network constant model -$ ${bindir:=.}/app-pingpong-c ${platfdir}/small_platform_constant.xml app-pingpong_d.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-pingpong ${platfdir}/small_platform_constant.xml app-pingpong_d.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Constant" "--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 'Constant' diff --git a/examples/c/app-token-ring/app-token-ring.tesh b/examples/c/app-token-ring/app-token-ring.tesh index c89212506d..5650fb2688 100644 --- a/examples/c/app-token-ring/app-token-ring.tesh +++ b/examples/c/app-token-ring/app-token-ring.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/app-token-ring-c ${platfdir}/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-token-ring ${platfdir}/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (maestro@) Number of hosts '6' > [ 0.000000] (0@host1) Host "0" send 'Token' to Host "1" > [ 0.017354] (1@host2) Host "1" received "Token" @@ -16,7 +16,7 @@ $ ${bindir:=.}/app-token-ring-c ${platfdir}/routing_cluster.xml "--log=root.fmt: > [ 0.131796] (0@host1) Host "0" received "Token" > [ 0.131796] (maestro@) Simulation time 0.131796 -$ ${bindir:=.}/app-token-ring-c ${platfdir}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-token-ring ${platfdir}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (maestro@) Number of hosts '2' > [ 0.000000] (0@100030591) Host "0" send 'Token' to Host "1" > [ 0.624423] (1@100036570) Host "1" received "Token" @@ -24,7 +24,7 @@ $ ${bindir:=.}/app-token-ring-c ${platfdir}/two_peers.xml "--log=root.fmt:[%12.6 > [ 1.248846] (0@100030591) Host "0" received "Token" > [ 1.248846] (maestro@) Simulation time 1.24885 -$ ${bindir:=.}/app-token-ring-c ${platfdir}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-token-ring ${platfdir}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (maestro@) Number of hosts '60' > [ 0.000000] (0@host-1.cluster1) Host "0" send 'Token' to Host "1" > [ 0.030364] (1@host-1.cluster2) Host "1" received "Token" diff --git a/examples/c/async-wait/async-wait.tesh b/examples/c/async-wait/async-wait.tesh index 1761f88fd0..72cc48a377 100644 --- a/examples/c/async-wait/async-wait.tesh +++ b/examples/c/async-wait/async-wait.tesh @@ -2,7 +2,7 @@ p Test1 sg_comm_test() with Sleep_sender > Sleep_receiver -$ ${bindir:=.}/async-wait-c ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-wait_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-async-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-wait_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 5.000000 , sleep_test_time : 0.100000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 1.000000 , sleep_test_time : 0.100000 > [ 1.000000] (2:receiver@Ruby) Wait for my first message @@ -17,7 +17,7 @@ $ ${bindir:=.}/async-wait-c ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:= p Test2 sg_comm_test() with Sleep_sender < Sleep_receiver -$ ${bindir:=.}/async-wait-c ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-wait2_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-async-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-wait2_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 1.000000 , sleep_test_time : 0.100000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 5.000000 , sleep_test_time : 0.100000 > [ 1.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver' @@ -32,7 +32,7 @@ $ ${bindir:=.}/async-wait-c ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:= p Test1 sg_comm_wait() with Sleep_sender > Sleep_receiver -$ ${bindir:=.}/async-wait-c ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-wait3_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-async-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-wait3_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 5.000000 , sleep_test_time : 0.000000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 1.000000 , sleep_test_time : 0.000000 > [ 1.000000] (2:receiver@Ruby) Wait for my first message @@ -47,7 +47,7 @@ $ ${bindir:=.}/async-wait-c ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:= p Test2 sg_comm_wait() with Sleep_sender < Sleep_receiver -$ ${bindir:=.}/async-wait-c ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-wait4_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-async-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-wait4_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 1.000000 , sleep_test_time : 0.000000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 5.000000 , sleep_test_time : 0.000000 > [ 1.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver' diff --git a/examples/c/async-waitall/async-waitall.tesh b/examples/c/async-waitall/async-waitall.tesh index 74a300b99b..ce51d6d049 100644 --- a/examples/c/async-waitall/async-waitall.tesh +++ b/examples/c/async-waitall/async-waitall.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! output sort 19 -$ ${bindir:=.}/async-waitall-c ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-waitall_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-async-waitall ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/async-waitall_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0' > [ 0.000000] (2:receiver@Ruby) Wait for my first message > [ 0.000000] (3:receiver@Perl) Wait for my first message diff --git a/examples/c/async-waitany/async-waitany.tesh b/examples/c/async-waitany/async-waitany.tesh index 663e08cd7b..9ecd94715d 100644 --- a/examples/c/async-waitany/async-waitany.tesh +++ b/examples/c/async-waitany/async-waitany.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! output sort 19 -$ ${bindir:=.}/async-waitany-c ${platfdir:=.}/small_platform.xml ${srcdir:=.}/async-waitany_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-async-waitany ${platfdir:=.}/small_platform.xml ${srcdir:=.}/async-waitany_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0' > [ 0.000000] (1:sender@Tremblay) Send 'Message 1' to 'receiver-1' > [ 0.000000] (1:sender@Tremblay) Send 'Message 2' to 'receiver-0' diff --git a/examples/c/cloud-capping/cloud-capping.tesh b/examples/c/cloud-capping/cloud-capping.tesh index 4e4d526893..d4eff54351 100644 --- a/examples/c/cloud-capping/cloud-capping.tesh +++ b/examples/c/cloud-capping/cloud-capping.tesh @@ -1,5 +1,5 @@ ! output sort -$ ${bindir:=.}/cloud-capping-c ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:master_@Fafard) # 1. Put a single task on a PM. > [ 0.000000] (1:master_@Fafard) ### Test: with/without sg_exec_set_bound > [ 0.000000] (1:master_@Fafard) ### Test: no bound for Task1@Fafard diff --git a/examples/c/cloud-masterworker/cloud-masterworker.tesh b/examples/c/cloud-masterworker/cloud-masterworker.tesh index 0738081b47..594a6e7d19 100644 --- a/examples/c/cloud-masterworker/cloud-masterworker.tesh +++ b/examples/c/cloud-masterworker/cloud-masterworker.tesh @@ -2,7 +2,7 @@ p Testing the Cloud API with a simple master/workers -$ ${bindir:=.}/cloud-masterworker-c --log=no_loc ${platfdir}/cluster_backbone.xml +$ ${bindir:=.}/c-cloud-masterworker --log=no_loc ${platfdir}/cluster_backbone.xml > [node-0.simgrid.org:master:(1) 0.000000] [cloud_masterworker/INFO] # Launch 2 VMs > [node-0.simgrid.org:master:(1) 0.000000] [cloud_masterworker/INFO] create VM00 on PM(node-1.simgrid.org) > [node-0.simgrid.org:master:(1) 0.000000] [cloud_masterworker/INFO] put an actor (WRK00) on VM00 diff --git a/examples/c/cloud-migration/cloud-migration.tesh b/examples/c/cloud-migration/cloud-migration.tesh index 9bfa969a89..b69b90e323 100644 --- a/examples/c/cloud-migration/cloud-migration.tesh +++ b/examples/c/cloud-migration/cloud-migration.tesh @@ -1,4 +1,4 @@ -$ ${bindir:=.}/cloud-migration-c ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-cloud-migration ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:master_@Fafard) Test: Migrate a VM with 1000 Mbytes RAM > [132.765801] (1:master_@Fafard) VM0 migrated: Fafard->Tremblay in 132.766 s > [132.765801] (1:master_@Fafard) Test: Migrate a VM with 100 Mbytes RAM diff --git a/examples/c/cloud-simple/cloud-simple.tesh b/examples/c/cloud-simple/cloud-simple.tesh index ea5d2cb94b..e53bf85396 100644 --- a/examples/c/cloud-simple/cloud-simple.tesh +++ b/examples/c/cloud-simple/cloud-simple.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/cloud-simple-c --log=no_loc ${platfdir}/small_platform.xml +$ ${bindir:=.}/c-cloud-simple --log=no_loc ${platfdir}/small_platform.xml > [Fafard:master_:(1) 0.000000] [cloud_simple/INFO] ## Test 1 (started): check computation on normal PMs > [Fafard:master_:(1) 0.000000] [cloud_simple/INFO] ### Put a task on a PM > [Fafard:compute:(2) 0.013107] [cloud_simple/INFO] Fafard:compute task executed 0.0131068 diff --git a/examples/c/dht-kademlia/dht-kademlia.tesh b/examples/c/dht-kademlia/dht-kademlia.tesh index b118289784..3ca6ceb5ff 100644 --- a/examples/c/dht-kademlia/dht-kademlia.tesh +++ b/examples/c/dht-kademlia/dht-kademlia.tesh @@ -3,7 +3,7 @@ p Testing the Kademlia implementation ! output sort 19 -$ ${bindir:=.}/dht-kademlia-c ${platfdir}/cluster_backbone.xml ${srcdir:=.}/dht-kademlia_d.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-dht-kademlia ${platfdir}/cluster_backbone.xml ${srcdir:=.}/dht-kademlia_d.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" > [ 0.000000] ( 1:node@node-0.simgrid.org) Hi, I'm going to create the network with id 0 > [ 0.000000] ( 2:node@node-1.simgrid.org) Hi, I'm going to join the network with id 1 > [ 0.000000] ( 3:node@node-2.simgrid.org) Hi, I'm going to join the network with id 3 diff --git a/examples/c/dht-pastry/dht-pastry.tesh b/examples/c/dht-pastry/dht-pastry.tesh index 154f7f4f09..118fa21627 100644 --- a/examples/c/dht-pastry/dht-pastry.tesh +++ b/examples/c/dht-pastry/dht-pastry.tesh @@ -2,7 +2,7 @@ p Testing the Pastry implementation -$ ${bindir:=.}/dht-pastry-c -nb_bits=6 ${platfdir}/cluster_backbone.xml ${srcdir:=.}/dht-pastry_d.xml --log=pastry.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-dht-pastry -nb_bits=6 ${platfdir}/cluster_backbone.xml ${srcdir:=.}/dht-pastry_d.xml --log=pastry.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 20.007806] (1:node@node-0.simgrid.org) Task update from 366680 !!! > [ 20.007806] (1:node@node-0.simgrid.org) Node: > [ 20.007806] (1:node@node-0.simgrid.org) Id: 42 '0000002a' diff --git a/examples/c/energy-exec-ptask/energy-exec-ptask.tesh b/examples/c/energy-exec-ptask/energy-exec-ptask.tesh index 8f02000c45..8947d721f1 100644 --- a/examples/c/energy-exec-ptask/energy-exec-ptask.tesh +++ b/examples/c/energy-exec-ptask/energy-exec-ptask.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/energy-exec-ptask-c ${platfdir:=.}/energy_platform.xml --energy "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-energy-exec-ptask ${platfdir:=.}/energy_platform.xml --energy "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 0.000000] (1:test@MyHost1) First, build a classical parallel task, with 1 Gflop to execute on each node, and 10MB to exchange between each pair > [300.000000] (1:test@MyHost1) We can do the same with a timeout of one second enabled. diff --git a/examples/c/energy-exec/energy-exec.tesh b/examples/c/energy-exec/energy-exec.tesh index f38dd07afc..0e12842637 100644 --- a/examples/c/energy-exec/energy-exec.tesh +++ b/examples/c/energy-exec/energy-exec.tesh @@ -2,7 +2,7 @@ p Testing the mechanism for computing host energy consumption -$ ${bindir:=.}/energy-exec-c ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-energy-exec ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:93.33333333333333:200.0, 93.0:90.0:170.0, 90.0:90.0:150.0 > [ 0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J > [ 0.000000] (1:dvfs_test@MyHost1) Sleep for 10 seconds @@ -22,7 +22,7 @@ $ ${bindir:=.}/energy-exec-c ${platfdir}/energy_platform.xml "--log=root.fmt:[%1 > [ 30.000000] (0:maestro@) Energy consumption of host MyHost2: 2100.000000 Joules > [ 30.000000] (0:maestro@) Energy consumption of host MyHost3: 3000.000000 Joules -$ ${bindir:=.}/energy-exec-c ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 +$ ${bindir:=.}/c-energy-exec ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:93.33333333333333:200.0, 93.0:90.0:170.0, 90.0:90.0:150.0 diff --git a/examples/c/energy-vm/energy-vm.tesh b/examples/c/energy-vm/energy-vm.tesh index 204edbe464..82a1dcf202 100644 --- a/examples/c/energy-vm/energy-vm.tesh +++ b/examples/c/energy-vm/energy-vm.tesh @@ -2,7 +2,7 @@ p Testing the mechanism for computing host energy consumption in case of VMs -$ ${bindir:=.}/energy-vm-c ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-energy-vm ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:dvfs@MyHost1) Creating and starting two VMs > [ 0.000000] (1:dvfs@MyHost1) Create two tasks on Host1: both inside a VM > [ 0.000000] (1:dvfs@MyHost1) Create two tasks on Host2: one inside a VM, the other directly on the host diff --git a/examples/c/exec-async/exec-async.tesh b/examples/c/exec-async/exec-async.tesh index d15abe3cc6..ca6efffb02 100644 --- a/examples/c/exec-async/exec-async.tesh +++ b/examples/c/exec-async/exec-async.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/exec-async-c ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-exec-async ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:wait@Fafard) Execute 7.6296e+07 flops, should take 1 second. > [ 0.000000] (2:monitor@Ginette) Execute 4.8492e+07 flops, should take 1 second. > [ 0.000000] (3:cancel@Boivin) Execute 9.8095e+07 flops, should take 1 second. diff --git a/examples/c/exec-basic/exec-basic.tesh b/examples/c/exec-basic/exec-basic.tesh index 0c308dd4e0..20dfe3416a 100644 --- a/examples/c/exec-basic/exec-basic.tesh +++ b/examples/c/exec-basic/exec-basic.tesh @@ -1,5 +1,5 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/exec-basic-c ${platfdir}/small_platform.xml +$ ${bindir:=.}/c-exec-basic ${platfdir}/small_platform.xml > [Tremblay:privileged:(2) 0.001500] [exec_basic/INFO] Done. > [Tremblay:executor:(1) 0.002000] [exec_basic/INFO] Done. diff --git a/examples/c/exec-dvfs/exec-dvfs.tesh b/examples/c/exec-dvfs/exec-dvfs.tesh index e778e14507..9ac0ed4558 100644 --- a/examples/c/exec-dvfs/exec-dvfs.tesh +++ b/examples/c/exec-dvfs/exec-dvfs.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/exec-dvfs-c ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-exec-dvfs ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 > [ 0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000 > [ 0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 @@ -19,7 +19,7 @@ $ ${bindir:=.}/exec-dvfs-c ${platfdir}/energy_platform.xml "--log=root.fmt:[%10. > [ 6.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000 > [ 6.000000] (0:maestro@) Total simulation time: 6.000000e+00 -$ ${bindir:=.}/exec-dvfs-c ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 +$ ${bindir:=.}/c-exec-dvfs ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 diff --git a/examples/c/exec-remote/exec-remote.tesh b/examples/c/exec-remote/exec-remote.tesh index 784c6c1ff9..f970184aba 100644 --- a/examples/c/exec-remote/exec-remote.tesh +++ b/examples/c/exec-remote/exec-remote.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! output sort 19 -$ ${bindir:=.}/exec-remote-c ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-exec-remote ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:test@Fafard) I'm a wizard! I can run a task on the Ginette host from the Fafard one! Look! > [ 0.000000] (1:test@Fafard) It started. Running 48.492Mf takes exactly one second on Ginette (but not on Fafard). > [ 0.100000] (1:test@Fafard) Loads in flops/s: Boivin=0; Fafard=0; Ginette=48492000 diff --git a/examples/c/exec-waitany/exec-waitany.tesh b/examples/c/exec-waitany/exec-waitany.tesh index 716c0ba046..2ea0293135 100644 --- a/examples/c/exec-waitany/exec-waitany.tesh +++ b/examples/c/exec-waitany/exec-waitany.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! output sort 19 -$ ${bindir:=.}/exec-waitany-c ${platfdir}/multicore_machine.xml "--log=root.fmt:[%10.6r]%e[%14P]%e%m%n" +$ ${bindir:=.}/c-exec-waitany ${platfdir}/multicore_machine.xml "--log=root.fmt:[%10.6r]%e[%14P]%e%m%n" > [ 0.000000] [ worker] Activity Exec-0 has started for 1 seconds > [ 0.000000] [worker_timeout] Activity Exec-0 has started for 1 seconds > [ 0.000000] [ worker] Activity Exec-1 has started for 8 seconds diff --git a/examples/c/io-disk-raw/io-disk-raw.tesh b/examples/c/io-disk-raw/io-disk-raw.tesh index cc32b5a072..927cd4f98c 100644 --- a/examples/c/io-disk-raw/io-disk-raw.tesh +++ b/examples/c/io-disk-raw/io-disk-raw.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir}/io-disk-raw-c ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir}/c-io-disk-raw ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) *** alice properties **** > [ 0.000000] (0:maestro@) ram -> 100B > [ 0.000000] (0:maestro@) *** bob properties **** diff --git a/examples/c/io-file-remote/io-file-remote.tesh b/examples/c/io-file-remote/io-file-remote.tesh index dc136c53ed..c6dbc0274a 100644 --- a/examples/c/io-file-remote/io-file-remote.tesh +++ b/examples/c/io-file-remote/io-file-remote.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/io-file-remote-c ${platfdir}/hosts_with_disks.xml io-file-remote_d.xml "--log=root.fmt:[%10.6r]%e(%i@%5h)%e%m%n" +$ ${bindir:=.}/c-io-file-remote ${platfdir}/hosts_with_disks.xml io-file-remote_d.xml "--log=root.fmt:[%10.6r]%e(%i@%5h)%e%m%n" > [ 0.000000] (0@ ) Init: alice: 12/511987 MiB used/free on 'Disk1@alice' > [ 0.000000] (0@ ) Init: bob: 35/511964 MiB used/free on 'Disk1@bob' > [ 0.000000] (0@ ) Init: bob: 0/512000 MiB used/free on 'Disk2@bob' diff --git a/examples/c/io-file-system/io-file-system.tesh b/examples/c/io-file-system/io-file-system.tesh index 409b82b9a1..3953211c6e 100644 --- a/examples/c/io-file-system/io-file-system.tesh +++ b/examples/c/io-file-system/io-file-system.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/io-file-system-c ${platfdir}/hosts_with_disks.xml +$ ${bindir:=.}/c-io-file-system ${platfdir}/hosts_with_disks.xml > [bob:host:(1) 0.000000] [io_file_system/INFO] Storage info on bob: > [bob:host:(1) 0.000000] [io_file_system/INFO] Disk1 (/scratch) Used: 36933331; Free: 536833978669; Total: 536870912000. > [bob:host:(1) 0.000000] [io_file_system/INFO] Disk2 (/) Used: 0; Free: 536870912000; Total: 536870912000. diff --git a/examples/c/platform-failures/platform-failures.tesh b/examples/c/platform-failures/platform-failures.tesh index 3ab9c12919..d70b2de9c0 100644 --- a/examples/c/platform-failures/platform-failures.tesh +++ b/examples/c/platform-failures/platform-failures.tesh @@ -3,7 +3,7 @@ p Testing a simple master/worker example application handling failures TCP crosstraffic DISABLED ! output sort 19 -$ ${bindir:=.}/platform-failures-c --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose +$ ${bindir:=.}/c-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose > [ 0.000000] (0:maestro@) Cannot launch actor 'worker' on failed host 'Fafard' > [ 0.000000] (0:maestro@) Deployment includes some initially turned off Hosts ... nevermind. > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process @@ -108,7 +108,7 @@ $ ${bindir:=.}/platform-failures-c --log=xbt_cfg.thres:critical --log=no_loc ${p p Testing a simple master/worker example application handling failures. TCP crosstraffic ENABLED ! output sort 19 -$ ${bindir:=.}/platform-failures-c --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose +$ ${bindir:=.}/c-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose > [ 0.000000] (0:maestro@) Cannot launch actor 'worker' on failed host 'Fafard' > [ 0.000000] (0:maestro@) Deployment includes some initially turned off Hosts ... nevermind. > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process @@ -217,4 +217,4 @@ p complex with such an integration test. One day, we will setup a set of p unit tests for the surf solver, and such issues will be addressable again. p For the time being, I just give up, sorry. -p $ ${bindir:=.}/platform-failures-c --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose +p $ ${bindir:=.}/c-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose diff --git a/examples/c/platform-properties/platform-properties.tesh b/examples/c/platform-properties/platform-properties.tesh index 7c4c31c4a2..80e910de41 100644 --- a/examples/c/platform-properties/platform-properties.tesh +++ b/examples/c/platform-properties/platform-properties.tesh @@ -3,7 +3,7 @@ p Testing an application with properties in the XML for Hosts, Links and Processes ! output sort 19 -$ ${bindir:=.}/platform-properties-c ${platfdir}/prop.xml platform-properties_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-platform-properties ${platfdir}/prop.xml platform-properties_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) There are 7 hosts in the environment > [ 0.000000] (0:maestro@) Host 'host1' runs at 1000000000 flops/s > [ 0.000000] (0:maestro@) Host 'host2' runs at 1000000000 flops/s diff --git a/examples/c/plugin-hostload/plugin-hostload.tesh b/examples/c/plugin-hostload/plugin-hostload.tesh index f3afba4681..7da0f5ed56 100644 --- a/examples/c/plugin-hostload/plugin-hostload.tesh +++ b/examples/c/plugin-hostload/plugin-hostload.tesh @@ -2,7 +2,7 @@ p This tests the HostLoad plugin (this allows the user to get the current load of a host and the computed flops) -$ ${bindir:=.}/plugin-hostload-c ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-plugin-hostload ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:load_test@MyHost1) Initial peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (should be 0) and current average load: 0.00000 (should be 0) > [ 0.000000] (1:load_test@MyHost1) Sleep for 10 seconds > [ 10.000000] (1:load_test@MyHost1) Done sleeping 10.00s; peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (nothing should have changed) diff --git a/examples/c/synchro-semaphore/synchro-semaphore.tesh b/examples/c/synchro-semaphore/synchro-semaphore.tesh index 3c9f3899ac..e800832b3c 100644 --- a/examples/c/synchro-semaphore/synchro-semaphore.tesh +++ b/examples/c/synchro-semaphore/synchro-semaphore.tesh @@ -3,7 +3,7 @@ p Testing synchronization with semaphores ! output sort 19 -$ ${bindir:=.}/synchro-semaphore-c ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-synchro-semaphore ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:Alice@Fafard) Trying to acquire 1 > [ 0.000000] (1:Alice@Fafard) Acquired 1 > [ 0.900000] (2:Bob@Fafard) Trying to acquire 1 -- 2.20.1