From: Martin Quinson Date: Wed, 10 Feb 2021 21:15:57 +0000 (+0100) Subject: mv examples/s4u examples/cpp X-Git-Tag: v3.27~409^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0bfafcab47ae9cd7856bd8d129404c33079d6afe mv examples/s4u examples/cpp S4U is now the dominant API in SimGrid. When working on SimGrid5, we'll create a new subdirectory for the next one :) --- diff --git a/.gitignore b/.gitignore index d8737ad23f..9143609184 100644 --- a/.gitignore +++ b/.gitignore @@ -151,71 +151,71 @@ examples/c/plugin-hostload/c-plugin-hostload examples/c/synchro-semaphore/c-synchro-semaphore examples/deprecated/msg/mc/bugged2_liveness examples/deprecated/msg/mc/centralized_mutex -examples/s4u/actor-create/s4u-actor-create -examples/s4u/actor-daemon/s4u-actor-daemon -examples/s4u/actor-exiting/s4u-actor-exiting -examples/s4u/actor-join/s4u-actor-join -examples/s4u/actor-kill/s4u-actor-kill -examples/s4u/actor-lifetime/s4u-actor-lifetime -examples/s4u/actor-migrate/s4u-actor-migrate -examples/s4u/actor-stacksize/s4u-actor-stacksize -examples/s4u/actor-suspend/s4u-actor-suspend -examples/s4u/actor-yield/s4u-actor-yield -examples/s4u/app-bittorrent/s4u-app-bittorrent -examples/s4u/app-chainsend/s4u-app-chainsend -examples/s4u/app-masterworkers/s4u-app-masterworkers-class -examples/s4u/app-masterworkers/s4u-app-masterworkers-fun -examples/s4u/app-pingpong/s4u-app-pingpong -examples/s4u/app-token-ring/s4u-app-token-ring -examples/s4u/cloud-capping/s4u-cloud-capping -examples/s4u/cloud-migration/s4u-cloud-migration -examples/s4u/cloud-simple/s4u-cloud-simple -examples/s4u/comm-dependent/s4u-comm-dependent -examples/s4u/dht-chord/s4u-dht-chord -examples/s4u/dht-kademlia/s4u-dht-kademlia -examples/s4u/energy-boot/s4u-energy-boot -examples/s4u/energy-exec/s4u-energy-exec -examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask -examples/s4u/energy-link/s4u-energy-link -examples/s4u/energy-vm/s4u-energy-vm -examples/s4u/engine-filtering/s4u-engine-filtering -examples/s4u/exec-async/s4u-exec-async -examples/s4u/exec-basic/s4u-exec-basic -examples/s4u/exec-dependent/s4u-exec-dependent -examples/s4u/exec-dvfs/s4u-exec-dvfs -examples/s4u/exec-ptask/s4u-exec-ptask -examples/s4u/exec-remote/s4u-exec-remote -examples/s4u/exec-waitany/s4u-exec-waitany -examples/s4u/exec-waitfor/s4u-exec-waitfor -examples/s4u/io-async/s4u-io-async -examples/s4u/io-dependent/s4u-io-dependent -examples/s4u/io-disk-raw/s4u-io-disk-raw -examples/s4u/io-file-remote/s4u-io-file-remote -examples/s4u/io-file-system/s4u-io-file-system -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 -examples/s4u/platform-failures/s4u-platform-failures -examples/s4u/platform-profile/s4u-platform-profile -examples/s4u/platform-properties/s4u-platform-properties -examples/s4u/replay-comm/s4u-replay-comm -examples/s4u/replay-io/s4u-replay-io -examples/s4u/routing-get-clusters/s4u-routing-get-clusters -examples/s4u/synchro-barrier/s4u-synchro-barrier -examples/s4u/synchro-condition-variable/s4u-synchro-condition-variable -examples/s4u/synchro-mutex/s4u-synchro-mutex -examples/s4u/synchro-semaphore/s4u-synchro-semaphore -examples/s4u/trace-categories/s4u-trace-categories -examples/s4u/trace-host-user-variables/s4u-trace-host-user-variables -examples/s4u/trace-link-user-variables/s4u-trace-link-user-variables -examples/s4u/trace-masterworkers/s4u-trace-masterworkers -examples/s4u/trace-platform/s4u-trace-platform -examples/s4u/trace-process-migration/s4u-trace-process-migration -examples/s4u/trace-route-user-variables/s4u-trace-route-user-variables +examples/cpp/actor-create/s4u-actor-create +examples/cpp/actor-daemon/s4u-actor-daemon +examples/cpp/actor-exiting/s4u-actor-exiting +examples/cpp/actor-join/s4u-actor-join +examples/cpp/actor-kill/s4u-actor-kill +examples/cpp/actor-lifetime/s4u-actor-lifetime +examples/cpp/actor-migrate/s4u-actor-migrate +examples/cpp/actor-stacksize/s4u-actor-stacksize +examples/cpp/actor-suspend/s4u-actor-suspend +examples/cpp/actor-yield/s4u-actor-yield +examples/cpp/app-bittorrent/s4u-app-bittorrent +examples/cpp/app-chainsend/s4u-app-chainsend +examples/cpp/app-masterworkers/s4u-app-masterworkers-class +examples/cpp/app-masterworkers/s4u-app-masterworkers-fun +examples/cpp/app-pingpong/s4u-app-pingpong +examples/cpp/app-token-ring/s4u-app-token-ring +examples/cpp/cloud-capping/s4u-cloud-capping +examples/cpp/cloud-migration/s4u-cloud-migration +examples/cpp/cloud-simple/s4u-cloud-simple +examples/cpp/comm-dependent/s4u-comm-dependent +examples/cpp/dht-chord/s4u-dht-chord +examples/cpp/dht-kademlia/s4u-dht-kademlia +examples/cpp/energy-boot/s4u-energy-boot +examples/cpp/energy-exec/s4u-energy-exec +examples/cpp/energy-exec-ptask/s4u-energy-exec-ptask +examples/cpp/energy-link/s4u-energy-link +examples/cpp/energy-vm/s4u-energy-vm +examples/cpp/engine-filtering/s4u-engine-filtering +examples/cpp/exec-async/s4u-exec-async +examples/cpp/exec-basic/s4u-exec-basic +examples/cpp/exec-dependent/s4u-exec-dependent +examples/cpp/exec-dvfs/s4u-exec-dvfs +examples/cpp/exec-ptask/s4u-exec-ptask +examples/cpp/exec-remote/s4u-exec-remote +examples/cpp/exec-waitany/s4u-exec-waitany +examples/cpp/exec-waitfor/s4u-exec-waitfor +examples/cpp/io-async/s4u-io-async +examples/cpp/io-dependent/s4u-io-dependent +examples/cpp/io-disk-raw/s4u-io-disk-raw +examples/cpp/io-file-remote/s4u-io-file-remote +examples/cpp/io-file-system/s4u-io-file-system +examples/cpp/maestro-set/s4u-maestro-set +examples/cpp/mc-bugged1/s4u-mc-bugged1 +examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness +examples/cpp/mc-bugged2/s4u-mc-bugged2 +examples/cpp/mc-electric-fence/s4u-mc-electric-fence +examples/cpp/mc-failing-assert/s4u-mc-failing-assert +examples/cpp/network-ns3/s4u-network-ns3 +examples/cpp/platform-failures/s4u-platform-failures +examples/cpp/platform-profile/s4u-platform-profile +examples/cpp/platform-properties/s4u-platform-properties +examples/cpp/replay-comm/s4u-replay-comm +examples/cpp/replay-io/s4u-replay-io +examples/cpp/routing-get-clusters/s4u-routing-get-clusters +examples/cpp/synchro-barrier/s4u-synchro-barrier +examples/cpp/synchro-condition-variable/s4u-synchro-condition-variable +examples/cpp/synchro-mutex/s4u-synchro-mutex +examples/cpp/synchro-semaphore/s4u-synchro-semaphore +examples/cpp/trace-categories/s4u-trace-categories +examples/cpp/trace-host-user-variables/s4u-trace-host-user-variables +examples/cpp/trace-link-user-variables/s4u-trace-link-user-variables +examples/cpp/trace-masterworkers/s4u-trace-masterworkers +examples/cpp/trace-platform/s4u-trace-platform +examples/cpp/trace-process-migration/s4u-trace-process-migration +examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables examples/deprecated/simdag/dag-dotload/sd_dag-dotload examples/deprecated/simdag/daxload/sd_daxload examples/deprecated/simdag/fail/sd_fail diff --git a/MANIFEST.in b/MANIFEST.in index 763624d229..7944f43700 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -133,6 +133,214 @@ include examples/c/plugin-host-load/plugin-host-load.c include examples/c/plugin-host-load/plugin-host-load.tesh include examples/c/synchro-semaphore/synchro-semaphore.c include examples/c/synchro-semaphore/synchro-semaphore.tesh +include examples/cpp/actor-create/s4u-actor-create.cpp +include examples/cpp/actor-create/s4u-actor-create.tesh +include examples/cpp/actor-create/s4u-actor-create_d.xml +include examples/cpp/actor-daemon/s4u-actor-daemon.cpp +include examples/cpp/actor-daemon/s4u-actor-daemon.tesh +include examples/cpp/actor-exiting/s4u-actor-exiting.cpp +include examples/cpp/actor-exiting/s4u-actor-exiting.tesh +include examples/cpp/actor-join/s4u-actor-join.cpp +include examples/cpp/actor-join/s4u-actor-join.tesh +include examples/cpp/actor-kill/s4u-actor-kill.cpp +include examples/cpp/actor-kill/s4u-actor-kill.tesh +include examples/cpp/actor-lifetime/s4u-actor-lifetime.cpp +include examples/cpp/actor-lifetime/s4u-actor-lifetime.tesh +include examples/cpp/actor-lifetime/s4u-actor-lifetime_d.xml +include examples/cpp/actor-migrate/s4u-actor-migrate.cpp +include examples/cpp/actor-migrate/s4u-actor-migrate.tesh +include examples/cpp/actor-stacksize/s4u-actor-stacksize.cpp +include examples/cpp/actor-stacksize/s4u-actor-stacksize.tesh +include examples/cpp/actor-suspend/s4u-actor-suspend.cpp +include examples/cpp/actor-suspend/s4u-actor-suspend.tesh +include examples/cpp/actor-yield/s4u-actor-yield.cpp +include examples/cpp/actor-yield/s4u-actor-yield.tesh +include examples/cpp/actor-yield/s4u-actor-yield_d.xml +include examples/cpp/app-bittorrent/s4u-app-bittorrent.tesh +include examples/cpp/app-bittorrent/s4u-app-bittorrent_d.xml +include examples/cpp/app-bittorrent/s4u-bittorrent.cpp +include examples/cpp/app-bittorrent/s4u-bittorrent.hpp +include examples/cpp/app-bittorrent/s4u-peer.cpp +include examples/cpp/app-bittorrent/s4u-peer.hpp +include examples/cpp/app-bittorrent/s4u-tracker.cpp +include examples/cpp/app-bittorrent/s4u-tracker.hpp +include examples/cpp/app-chainsend/s4u-app-chainsend.cpp +include examples/cpp/app-chainsend/s4u-app-chainsend.tesh +include examples/cpp/app-masterworkers/s4u-app-masterworkers-class.cpp +include examples/cpp/app-masterworkers/s4u-app-masterworkers-fun.cpp +include examples/cpp/app-masterworkers/s4u-app-masterworkers.tesh +include examples/cpp/app-masterworkers/s4u-app-masterworkers_d.xml +include examples/cpp/app-token-ring/s4u-app-token-ring.cpp +include examples/cpp/app-token-ring/s4u-app-token-ring.tesh +include examples/cpp/cloud-capping/s4u-cloud-capping.cpp +include examples/cpp/cloud-capping/s4u-cloud-capping.tesh +include examples/cpp/cloud-migration/s4u-cloud-migration.cpp +include examples/cpp/cloud-migration/s4u-cloud-migration.tesh +include examples/cpp/cloud-simple/s4u-cloud-simple.cpp +include examples/cpp/cloud-simple/s4u-cloud-simple.tesh +include examples/cpp/comm-dependent/s4u-comm-dependent.cpp +include examples/cpp/comm-dependent/s4u-comm-dependent.tesh +include examples/cpp/comm-host2host/s4u-comm-host2host.cpp +include examples/cpp/comm-host2host/s4u-comm-host2host.tesh +include examples/cpp/comm-pingpong/s4u-comm-pingpong.cpp +include examples/cpp/comm-pingpong/s4u-comm-pingpong.tesh +include examples/cpp/comm-pingpong/simix-breakpoint.tesh +include examples/cpp/comm-ready/s4u-comm-ready.cpp +include examples/cpp/comm-ready/s4u-comm-ready.tesh +include examples/cpp/comm-ready/s4u-comm-ready_d.xml +include examples/cpp/comm-suspend/s4u-comm-suspend.cpp +include examples/cpp/comm-suspend/s4u-comm-suspend.tesh +include examples/cpp/comm-suspend/s4u-comm-suspend_d.xml +include examples/cpp/comm-wait/s4u-comm-wait.cpp +include examples/cpp/comm-wait/s4u-comm-wait.tesh +include examples/cpp/comm-wait/s4u-comm-wait_d.xml +include examples/cpp/comm-waitall/s4u-comm-waitall.cpp +include examples/cpp/comm-waitall/s4u-comm-waitall.tesh +include examples/cpp/comm-waitall/s4u-comm-waitall_d.xml +include examples/cpp/comm-waitany/s4u-comm-waitany.cpp +include examples/cpp/comm-waitany/s4u-comm-waitany.tesh +include examples/cpp/comm-waitany/s4u-comm-waitany_d.xml +include examples/cpp/comm-waituntil/s4u-comm-waituntil.cpp +include examples/cpp/comm-waituntil/s4u-comm-waituntil.tesh +include examples/cpp/comm-waituntil/s4u-comm-waituntil_d.xml +include examples/cpp/dht-chord/s4u-dht-chord-node.cpp +include examples/cpp/dht-chord/s4u-dht-chord.cpp +include examples/cpp/dht-chord/s4u-dht-chord.hpp +include examples/cpp/dht-chord/s4u-dht-chord.tesh +include examples/cpp/dht-chord/s4u-dht-chord_d.xml +include examples/cpp/dht-kademlia/answer.cpp +include examples/cpp/dht-kademlia/answer.hpp +include examples/cpp/dht-kademlia/generate.py +include examples/cpp/dht-kademlia/message.hpp +include examples/cpp/dht-kademlia/node.cpp +include examples/cpp/dht-kademlia/node.hpp +include examples/cpp/dht-kademlia/routing_table.cpp +include examples/cpp/dht-kademlia/routing_table.hpp +include examples/cpp/dht-kademlia/s4u-dht-kademlia.cpp +include examples/cpp/dht-kademlia/s4u-dht-kademlia.hpp +include examples/cpp/dht-kademlia/s4u-dht-kademlia.tesh +include examples/cpp/dht-kademlia/s4u-dht-kademlia_d.xml +include examples/cpp/energy-boot/platform_boot.xml +include examples/cpp/energy-boot/s4u-energy-boot.cpp +include examples/cpp/energy-boot/s4u-energy-boot.tesh +include examples/cpp/energy-exec-ptask/s4u-energy-exec-ptask.cpp +include examples/cpp/energy-exec-ptask/s4u-energy-exec-ptask.tesh +include examples/cpp/energy-exec/s4u-energy-exec.cpp +include examples/cpp/energy-exec/s4u-energy-exec.tesh +include examples/cpp/energy-link/s4u-energy-link.cpp +include examples/cpp/energy-link/s4u-energy-link.tesh +include examples/cpp/energy-vm/s4u-energy-vm.cpp +include examples/cpp/energy-vm/s4u-energy-vm.tesh +include examples/cpp/energy-wifi/s4u-energy-wifi.cpp +include examples/cpp/energy-wifi/s4u-energy-wifi.tesh +include examples/cpp/engine-filtering/s4u-engine-filtering.cpp +include examples/cpp/engine-filtering/s4u-engine-filtering.tesh +include examples/cpp/exec-async/s4u-exec-async.cpp +include examples/cpp/exec-async/s4u-exec-async.tesh +include examples/cpp/exec-basic/s4u-exec-basic.cpp +include examples/cpp/exec-basic/s4u-exec-basic.tesh +include examples/cpp/exec-dependent/s4u-exec-dependent.cpp +include examples/cpp/exec-dependent/s4u-exec-dependent.tesh +include examples/cpp/exec-dvfs/s4u-exec-dvfs.cpp +include examples/cpp/exec-dvfs/s4u-exec-dvfs.tesh +include examples/cpp/exec-ptask/s4u-exec-ptask.cpp +include examples/cpp/exec-ptask/s4u-exec-ptask.tesh +include examples/cpp/exec-remote/s4u-exec-remote.cpp +include examples/cpp/exec-remote/s4u-exec-remote.tesh +include examples/cpp/exec-unassigned/s4u-exec-unassigned.cpp +include examples/cpp/exec-unassigned/s4u-exec-unassigned.tesh +include examples/cpp/exec-waitany/s4u-exec-waitany.cpp +include examples/cpp/exec-waitany/s4u-exec-waitany.tesh +include examples/cpp/exec-waitfor/s4u-exec-waitfor.cpp +include examples/cpp/exec-waitfor/s4u-exec-waitfor.tesh +include examples/cpp/io-async/s4u-io-async.cpp +include examples/cpp/io-async/s4u-io-async.tesh +include examples/cpp/io-dependent/s4u-io-dependent.cpp +include examples/cpp/io-dependent/s4u-io-dependent.tesh +include examples/cpp/io-disk-raw/s4u-io-disk-raw.cpp +include examples/cpp/io-disk-raw/s4u-io-disk-raw.tesh +include examples/cpp/io-file-remote/s4u-io-file-remote.cpp +include examples/cpp/io-file-remote/s4u-io-file-remote.tesh +include examples/cpp/io-file-remote/s4u-io-file-remote_d.xml +include examples/cpp/io-file-system/s4u-io-file-system.cpp +include examples/cpp/io-file-system/s4u-io-file-system.tesh +include examples/cpp/maestro-set/s4u-maestro-set.cpp +include examples/cpp/maestro-set/s4u-maestro-set.tesh +include examples/cpp/mc-bugged1-liveness/promela_bugged1_liveness +include examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner +include examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh +include examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp +include examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness.tesh +include examples/cpp/mc-bugged1/s4u-mc-bugged1.cpp +include examples/cpp/mc-bugged1/s4u-mc-bugged1.tesh +include examples/cpp/mc-bugged2/s4u-mc-bugged2.cpp +include examples/cpp/mc-bugged2/s4u-mc-bugged2.tesh +include examples/cpp/mc-electric-fence/s4u-mc-electric-fence.cpp +include examples/cpp/mc-electric-fence/s4u-mc-electric-fence.tesh +include examples/cpp/mc-failing-assert/s4u-mc-failing-assert.cpp +include examples/cpp/mc-failing-assert/s4u-mc-failing-assert.tesh +include examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi.cpp +include examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi.tesh +include examples/cpp/network-ns3/3hosts_2links_d.xml +include examples/cpp/network-ns3/3links-timer_d.xml +include examples/cpp/network-ns3/3links_d.xml +include examples/cpp/network-ns3/crosstraffic_d.xml +include examples/cpp/network-ns3/dogbone_d.xml +include examples/cpp/network-ns3/one_cluster_d.xml +include examples/cpp/network-ns3/onelink_d.xml +include examples/cpp/network-ns3/s4u-network-ns3.cpp +include examples/cpp/network-ns3/s4u-network-ns3.tesh +include examples/cpp/network-wifi/s4u-network-wifi.cpp +include examples/cpp/network-wifi/s4u-network-wifi.tesh +include examples/cpp/platform-failures/s4u-platform-failures.cpp +include examples/cpp/platform-failures/s4u-platform-failures.tesh +include examples/cpp/platform-failures/s4u-platform-failures_d.xml +include examples/cpp/platform-profile/s4u-platform-profile.cpp +include examples/cpp/platform-profile/s4u-platform-profile.tesh +include examples/cpp/platform-properties/s4u-platform-properties.cpp +include examples/cpp/platform-properties/s4u-platform-properties.tesh +include examples/cpp/platform-properties/s4u-platform-properties_d.xml +include examples/cpp/plugin-host-load/s4u-plugin-host-load.cpp +include examples/cpp/plugin-host-load/s4u-plugin-host-load.tesh +include examples/cpp/plugin-link-load/s4u-plugin-link-load.cpp +include examples/cpp/plugin-link-load/s4u-plugin-link-load.tesh +include examples/cpp/replay-comm/s4u-replay-comm-split-p0.txt +include examples/cpp/replay-comm/s4u-replay-comm-split-p1.txt +include examples/cpp/replay-comm/s4u-replay-comm-split_d.xml +include examples/cpp/replay-comm/s4u-replay-comm.cpp +include examples/cpp/replay-comm/s4u-replay-comm.tesh +include examples/cpp/replay-comm/s4u-replay-comm.txt +include examples/cpp/replay-comm/s4u-replay-comm_d.xml +include examples/cpp/replay-io/s4u-replay-io.cpp +include examples/cpp/replay-io/s4u-replay-io.tesh +include examples/cpp/replay-io/s4u-replay-io.txt +include examples/cpp/replay-io/s4u-replay-io_d.xml +include examples/cpp/routing-get-clusters/s4u-routing-get-clusters.cpp +include examples/cpp/routing-get-clusters/s4u-routing-get-clusters.tesh +include examples/cpp/synchro-barrier/s4u-synchro-barrier.cpp +include examples/cpp/synchro-barrier/s4u-synchro-barrier.tesh +include examples/cpp/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.cpp +include examples/cpp/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.tesh +include examples/cpp/synchro-condition-variable/s4u-synchro-condition-variable.cpp +include examples/cpp/synchro-condition-variable/s4u-synchro-condition-variable.tesh +include examples/cpp/synchro-mutex/s4u-synchro-mutex.cpp +include examples/cpp/synchro-mutex/s4u-synchro-mutex.tesh +include examples/cpp/synchro-semaphore/s4u-synchro-semaphore.cpp +include examples/cpp/synchro-semaphore/s4u-synchro-semaphore.tesh +include examples/cpp/trace-categories/s4u-trace-categories.cpp +include examples/cpp/trace-categories/s4u-trace-categories.tesh +include examples/cpp/trace-host-user-variables/s4u-trace-host-user-variables.cpp +include examples/cpp/trace-host-user-variables/s4u-trace-host-user-variables.tesh +include examples/cpp/trace-link-user-variables/s4u-trace-link-user-variables.cpp +include examples/cpp/trace-link-user-variables/s4u-trace-link-user-variables.tesh +include examples/cpp/trace-masterworkers/s4u-trace-masterworkers.cpp +include examples/cpp/trace-masterworkers/s4u-trace-masterworkers.tesh +include examples/cpp/trace-platform/s4u-trace-platform.cpp +include examples/cpp/trace-platform/s4u-trace-platform.tesh +include examples/cpp/trace-process-migration/s4u-trace-process-migration.cpp +include examples/cpp/trace-process-migration/s4u-trace-process-migration.tesh +include examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables.cpp +include examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables.tesh include examples/deprecated/java/app/bittorrent/Common.java include examples/deprecated/java/app/bittorrent/Connection.java include examples/deprecated/java/app/bittorrent/Main.java @@ -310,214 +518,6 @@ include examples/python/exec-dvfs/exec-dvfs.py include examples/python/exec-dvfs/exec-dvfs.tesh include examples/python/exec-remote/exec-remote.py include examples/python/exec-remote/exec-remote.tesh -include examples/s4u/actor-create/s4u-actor-create.cpp -include examples/s4u/actor-create/s4u-actor-create.tesh -include examples/s4u/actor-create/s4u-actor-create_d.xml -include examples/s4u/actor-daemon/s4u-actor-daemon.cpp -include examples/s4u/actor-daemon/s4u-actor-daemon.tesh -include examples/s4u/actor-exiting/s4u-actor-exiting.cpp -include examples/s4u/actor-exiting/s4u-actor-exiting.tesh -include examples/s4u/actor-join/s4u-actor-join.cpp -include examples/s4u/actor-join/s4u-actor-join.tesh -include examples/s4u/actor-kill/s4u-actor-kill.cpp -include examples/s4u/actor-kill/s4u-actor-kill.tesh -include examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp -include examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh -include examples/s4u/actor-lifetime/s4u-actor-lifetime_d.xml -include examples/s4u/actor-migrate/s4u-actor-migrate.cpp -include examples/s4u/actor-migrate/s4u-actor-migrate.tesh -include examples/s4u/actor-stacksize/s4u-actor-stacksize.cpp -include examples/s4u/actor-stacksize/s4u-actor-stacksize.tesh -include examples/s4u/actor-suspend/s4u-actor-suspend.cpp -include examples/s4u/actor-suspend/s4u-actor-suspend.tesh -include examples/s4u/actor-yield/s4u-actor-yield.cpp -include examples/s4u/actor-yield/s4u-actor-yield.tesh -include examples/s4u/actor-yield/s4u-actor-yield_d.xml -include examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh -include examples/s4u/app-bittorrent/s4u-app-bittorrent_d.xml -include examples/s4u/app-bittorrent/s4u-bittorrent.cpp -include examples/s4u/app-bittorrent/s4u-bittorrent.hpp -include examples/s4u/app-bittorrent/s4u-peer.cpp -include examples/s4u/app-bittorrent/s4u-peer.hpp -include examples/s4u/app-bittorrent/s4u-tracker.cpp -include examples/s4u/app-bittorrent/s4u-tracker.hpp -include examples/s4u/app-chainsend/s4u-app-chainsend.cpp -include examples/s4u/app-chainsend/s4u-app-chainsend.tesh -include examples/s4u/app-masterworkers/s4u-app-masterworkers-class.cpp -include examples/s4u/app-masterworkers/s4u-app-masterworkers-fun.cpp -include examples/s4u/app-masterworkers/s4u-app-masterworkers.tesh -include examples/s4u/app-masterworkers/s4u-app-masterworkers_d.xml -include examples/s4u/app-token-ring/s4u-app-token-ring.cpp -include examples/s4u/app-token-ring/s4u-app-token-ring.tesh -include examples/s4u/cloud-capping/s4u-cloud-capping.cpp -include examples/s4u/cloud-capping/s4u-cloud-capping.tesh -include examples/s4u/cloud-migration/s4u-cloud-migration.cpp -include examples/s4u/cloud-migration/s4u-cloud-migration.tesh -include examples/s4u/cloud-simple/s4u-cloud-simple.cpp -include examples/s4u/cloud-simple/s4u-cloud-simple.tesh -include examples/s4u/comm-dependent/s4u-comm-dependent.cpp -include examples/s4u/comm-dependent/s4u-comm-dependent.tesh -include examples/s4u/comm-host2host/s4u-comm-host2host.cpp -include examples/s4u/comm-host2host/s4u-comm-host2host.tesh -include examples/s4u/comm-pingpong/s4u-comm-pingpong.cpp -include examples/s4u/comm-pingpong/s4u-comm-pingpong.tesh -include examples/s4u/comm-pingpong/simix-breakpoint.tesh -include examples/s4u/comm-ready/s4u-comm-ready.cpp -include examples/s4u/comm-ready/s4u-comm-ready.tesh -include examples/s4u/comm-ready/s4u-comm-ready_d.xml -include examples/s4u/comm-suspend/s4u-comm-suspend.cpp -include examples/s4u/comm-suspend/s4u-comm-suspend.tesh -include examples/s4u/comm-suspend/s4u-comm-suspend_d.xml -include examples/s4u/comm-wait/s4u-comm-wait.cpp -include examples/s4u/comm-wait/s4u-comm-wait.tesh -include examples/s4u/comm-wait/s4u-comm-wait_d.xml -include examples/s4u/comm-waitall/s4u-comm-waitall.cpp -include examples/s4u/comm-waitall/s4u-comm-waitall.tesh -include examples/s4u/comm-waitall/s4u-comm-waitall_d.xml -include examples/s4u/comm-waitany/s4u-comm-waitany.cpp -include examples/s4u/comm-waitany/s4u-comm-waitany.tesh -include examples/s4u/comm-waitany/s4u-comm-waitany_d.xml -include examples/s4u/comm-waituntil/s4u-comm-waituntil.cpp -include examples/s4u/comm-waituntil/s4u-comm-waituntil.tesh -include examples/s4u/comm-waituntil/s4u-comm-waituntil_d.xml -include examples/s4u/dht-chord/s4u-dht-chord-node.cpp -include examples/s4u/dht-chord/s4u-dht-chord.cpp -include examples/s4u/dht-chord/s4u-dht-chord.hpp -include examples/s4u/dht-chord/s4u-dht-chord.tesh -include examples/s4u/dht-chord/s4u-dht-chord_d.xml -include examples/s4u/dht-kademlia/answer.cpp -include examples/s4u/dht-kademlia/answer.hpp -include examples/s4u/dht-kademlia/generate.py -include examples/s4u/dht-kademlia/message.hpp -include examples/s4u/dht-kademlia/node.cpp -include examples/s4u/dht-kademlia/node.hpp -include examples/s4u/dht-kademlia/routing_table.cpp -include examples/s4u/dht-kademlia/routing_table.hpp -include examples/s4u/dht-kademlia/s4u-dht-kademlia.cpp -include examples/s4u/dht-kademlia/s4u-dht-kademlia.hpp -include examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh -include examples/s4u/dht-kademlia/s4u-dht-kademlia_d.xml -include examples/s4u/energy-boot/platform_boot.xml -include examples/s4u/energy-boot/s4u-energy-boot.cpp -include examples/s4u/energy-boot/s4u-energy-boot.tesh -include examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.cpp -include examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.tesh -include examples/s4u/energy-exec/s4u-energy-exec.cpp -include examples/s4u/energy-exec/s4u-energy-exec.tesh -include examples/s4u/energy-link/s4u-energy-link.cpp -include examples/s4u/energy-link/s4u-energy-link.tesh -include examples/s4u/energy-vm/s4u-energy-vm.cpp -include examples/s4u/energy-vm/s4u-energy-vm.tesh -include examples/s4u/energy-wifi/s4u-energy-wifi.cpp -include examples/s4u/energy-wifi/s4u-energy-wifi.tesh -include examples/s4u/engine-filtering/s4u-engine-filtering.cpp -include examples/s4u/engine-filtering/s4u-engine-filtering.tesh -include examples/s4u/exec-async/s4u-exec-async.cpp -include examples/s4u/exec-async/s4u-exec-async.tesh -include examples/s4u/exec-basic/s4u-exec-basic.cpp -include examples/s4u/exec-basic/s4u-exec-basic.tesh -include examples/s4u/exec-dependent/s4u-exec-dependent.cpp -include examples/s4u/exec-dependent/s4u-exec-dependent.tesh -include examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp -include examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh -include examples/s4u/exec-ptask/s4u-exec-ptask.cpp -include examples/s4u/exec-ptask/s4u-exec-ptask.tesh -include examples/s4u/exec-remote/s4u-exec-remote.cpp -include examples/s4u/exec-remote/s4u-exec-remote.tesh -include examples/s4u/exec-unassigned/s4u-exec-unassigned.cpp -include examples/s4u/exec-unassigned/s4u-exec-unassigned.tesh -include examples/s4u/exec-waitany/s4u-exec-waitany.cpp -include examples/s4u/exec-waitany/s4u-exec-waitany.tesh -include examples/s4u/exec-waitfor/s4u-exec-waitfor.cpp -include examples/s4u/exec-waitfor/s4u-exec-waitfor.tesh -include examples/s4u/io-async/s4u-io-async.cpp -include examples/s4u/io-async/s4u-io-async.tesh -include examples/s4u/io-dependent/s4u-io-dependent.cpp -include examples/s4u/io-dependent/s4u-io-dependent.tesh -include examples/s4u/io-disk-raw/s4u-io-disk-raw.cpp -include examples/s4u/io-disk-raw/s4u-io-disk-raw.tesh -include examples/s4u/io-file-remote/s4u-io-file-remote.cpp -include examples/s4u/io-file-remote/s4u-io-file-remote.tesh -include examples/s4u/io-file-remote/s4u-io-file-remote_d.xml -include examples/s4u/io-file-system/s4u-io-file-system.cpp -include examples/s4u/io-file-system/s4u-io-file-system.tesh -include examples/s4u/maestro-set/s4u-maestro-set.cpp -include examples/s4u/maestro-set/s4u-maestro-set.tesh -include examples/s4u/mc-bugged1-liveness/promela_bugged1_liveness -include examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner -include examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh -include examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp -include examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.tesh -include examples/s4u/mc-bugged1/s4u-mc-bugged1.cpp -include examples/s4u/mc-bugged1/s4u-mc-bugged1.tesh -include examples/s4u/mc-bugged2/s4u-mc-bugged2.cpp -include examples/s4u/mc-bugged2/s4u-mc-bugged2.tesh -include examples/s4u/mc-electric-fence/s4u-mc-electric-fence.cpp -include examples/s4u/mc-electric-fence/s4u-mc-electric-fence.tesh -include examples/s4u/mc-failing-assert/s4u-mc-failing-assert.cpp -include examples/s4u/mc-failing-assert/s4u-mc-failing-assert.tesh -include examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.cpp -include examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.tesh -include examples/s4u/network-ns3/3hosts_2links_d.xml -include examples/s4u/network-ns3/3links-timer_d.xml -include examples/s4u/network-ns3/3links_d.xml -include examples/s4u/network-ns3/crosstraffic_d.xml -include examples/s4u/network-ns3/dogbone_d.xml -include examples/s4u/network-ns3/one_cluster_d.xml -include examples/s4u/network-ns3/onelink_d.xml -include examples/s4u/network-ns3/s4u-network-ns3.cpp -include examples/s4u/network-ns3/s4u-network-ns3.tesh -include examples/s4u/network-wifi/s4u-network-wifi.cpp -include examples/s4u/network-wifi/s4u-network-wifi.tesh -include examples/s4u/platform-failures/s4u-platform-failures.cpp -include examples/s4u/platform-failures/s4u-platform-failures.tesh -include examples/s4u/platform-failures/s4u-platform-failures_d.xml -include examples/s4u/platform-profile/s4u-platform-profile.cpp -include examples/s4u/platform-profile/s4u-platform-profile.tesh -include examples/s4u/platform-properties/s4u-platform-properties.cpp -include examples/s4u/platform-properties/s4u-platform-properties.tesh -include examples/s4u/platform-properties/s4u-platform-properties_d.xml -include examples/s4u/plugin-host-load/s4u-plugin-host-load.cpp -include examples/s4u/plugin-host-load/s4u-plugin-host-load.tesh -include examples/s4u/plugin-link-load/s4u-plugin-link-load.cpp -include examples/s4u/plugin-link-load/s4u-plugin-link-load.tesh -include examples/s4u/replay-comm/s4u-replay-comm-split-p0.txt -include examples/s4u/replay-comm/s4u-replay-comm-split-p1.txt -include examples/s4u/replay-comm/s4u-replay-comm-split_d.xml -include examples/s4u/replay-comm/s4u-replay-comm.cpp -include examples/s4u/replay-comm/s4u-replay-comm.tesh -include examples/s4u/replay-comm/s4u-replay-comm.txt -include examples/s4u/replay-comm/s4u-replay-comm_d.xml -include examples/s4u/replay-io/s4u-replay-io.cpp -include examples/s4u/replay-io/s4u-replay-io.tesh -include examples/s4u/replay-io/s4u-replay-io.txt -include examples/s4u/replay-io/s4u-replay-io_d.xml -include examples/s4u/routing-get-clusters/s4u-routing-get-clusters.cpp -include examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh -include examples/s4u/synchro-barrier/s4u-synchro-barrier.cpp -include examples/s4u/synchro-barrier/s4u-synchro-barrier.tesh -include examples/s4u/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.cpp -include examples/s4u/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.tesh -include examples/s4u/synchro-condition-variable/s4u-synchro-condition-variable.cpp -include examples/s4u/synchro-condition-variable/s4u-synchro-condition-variable.tesh -include examples/s4u/synchro-mutex/s4u-synchro-mutex.cpp -include examples/s4u/synchro-mutex/s4u-synchro-mutex.tesh -include examples/s4u/synchro-semaphore/s4u-synchro-semaphore.cpp -include examples/s4u/synchro-semaphore/s4u-synchro-semaphore.tesh -include examples/s4u/trace-categories/s4u-trace-categories.cpp -include examples/s4u/trace-categories/s4u-trace-categories.tesh -include examples/s4u/trace-host-user-variables/s4u-trace-host-user-variables.cpp -include examples/s4u/trace-host-user-variables/s4u-trace-host-user-variables.tesh -include examples/s4u/trace-link-user-variables/s4u-trace-link-user-variables.cpp -include examples/s4u/trace-link-user-variables/s4u-trace-link-user-variables.tesh -include examples/s4u/trace-masterworkers/s4u-trace-masterworkers.cpp -include examples/s4u/trace-masterworkers/s4u-trace-masterworkers.tesh -include examples/s4u/trace-platform/s4u-trace-platform.cpp -include examples/s4u/trace-platform/s4u-trace-platform.tesh -include examples/s4u/trace-process-migration/s4u-trace-process-migration.cpp -include examples/s4u/trace-process-migration/s4u-trace-process-migration.tesh -include examples/s4u/trace-route-user-variables/s4u-trace-route-user-variables.cpp -include examples/s4u/trace-route-user-variables/s4u-trace-route-user-variables.tesh include examples/smpi/NAS/DGraph.c include examples/smpi/NAS/DGraph.h include examples/smpi/NAS/README.install @@ -1885,6 +1885,7 @@ include docs/source/tuto_smpi/img/lu.S.4.png include docs/source/tuto_smpi/roundtrip.c include examples/README.rst include examples/c/CMakeLists.txt +include examples/cpp/CMakeLists.txt include examples/deprecated/java/CMakeLists.txt include examples/deprecated/msg/mc/CMakeLists.txt include examples/deprecated/simdag/CMakeLists.txt @@ -1969,7 +1970,6 @@ include examples/python/actor-lifetime/actor-lifetime_d.xml include examples/python/comm-wait/comm-wait_d.xml include examples/python/comm-waitall/comm-waitall_d.xml include examples/python/comm-waitany/comm-waitany_d.xml -include examples/s4u/CMakeLists.txt include examples/smpi/CMakeLists.txt include examples/smpi/NAS/CMakeLists.txt include examples/smpi/mc/non_deterministic.tesh diff --git a/doc/doxygen/inside_cmake.doc b/doc/doxygen/inside_cmake.doc index 61e85f7acc..393fa8a0b7 100644 --- a/doc/doxygen/inside_cmake.doc +++ b/doc/doxygen/inside_cmake.doc @@ -25,7 +25,7 @@ users. In particular, torture test cases should be placed in teshsuite/, not exa upon them by error. The examples/ directory is organized as follows: - - examples/s4u/ for examples using the emerging S4U API + - examples/cpp/ for examples using the S4U API - examples/smpi/ or examples using the SMPI API - examples/platforms/ only contains platforms descriptions in the XML format (see @ref platform for details) - examples/deprecated/msg/ for examples using the MSG API. Here the naming convention is package-example (e.g., app-masterworker). diff --git a/docs/Build.sh b/docs/Build.sh index 4ea9d3e082..632ecd9622 100755 --- a/docs/Build.sh +++ b/docs/Build.sh @@ -65,8 +65,8 @@ perl -pe 's/(xlink:href="(?:http|.*\.html))/target="_top" $1/' \ echo echo "Undocumented examples:" for ex in $( (cd .. ; \ - find examples/s4u/ -name '*.cpp'; \ - find examples/c/ -name '*.c'; \ + find examples/cpp/ -name '*.cpp'; \ + find examples/c/ -name '*.c'; \ find examples/python -name '*.py'; \ ) | sort ) do diff --git a/docs/source/Tutorial_Algorithms.rst b/docs/source/Tutorial_Algorithms.rst index 8233f3c53a..d7b44c45f5 100644 --- a/docs/source/Tutorial_Algorithms.rst +++ b/docs/source/Tutorial_Algorithms.rst @@ -111,7 +111,7 @@ as a replacement to printf() or to cout to ensure that the messages are nicely logged along with the simulated time and actor name. -.. literalinclude:: ../../examples/s4u/app-masterworkers/s4u-app-masterworkers-fun.cpp +.. literalinclude:: ../../examples/cpp/app-masterworkers/s4u-app-masterworkers-fun.cpp :language: c++ :start-after: master-begin :end-before: master-end @@ -127,7 +127,7 @@ The worker retrieves its own host with :ref:`simgrid::s4u::this_actor ` namespace contains many such helping functions. -.. literalinclude:: ../../examples/s4u/app-masterworkers/s4u-app-masterworkers-fun.cpp +.. literalinclude:: ../../examples/cpp/app-masterworkers/s4u-app-masterworkers-fun.cpp :language: c++ :start-after: worker-begin :end-before: worker-end @@ -146,7 +146,7 @@ functions to the engine (on lines 7 and 8), load the simulated platform from its description file (on line 11), map actors onto that platform (on line 12) and run the simulation until its completion on line 15. -.. literalinclude:: ../../examples/s4u/app-masterworkers/s4u-app-masterworkers-fun.cpp +.. literalinclude:: ../../examples/cpp/app-masterworkers/s4u-app-masterworkers-fun.cpp :language: c++ :start-after: main-begin :end-before: main-end @@ -192,7 +192,7 @@ Deployment files specify the execution scenario: it lists the actors that should be started, along with their parameter. In the following example, we start 6 actors: one master and 5 workers. -.. literalinclude:: ../../examples/s4u/app-masterworkers/s4u-app-masterworkers_d.xml +.. literalinclude:: ../../examples/cpp/app-masterworkers/s4u-app-masterworkers_d.xml :language: xml Execution Example @@ -204,7 +204,7 @@ informative messages. .. "WARNING: Over dedent has detected" is expected here as we remove the $ marker this way -.. literalinclude:: ../../examples/s4u/app-masterworkers/s4u-app-masterworkers.tesh +.. literalinclude:: ../../examples/cpp/app-masterworkers/s4u-app-masterworkers.tesh :language: shell :start-after: s4u-app-masterworkers-fun :prepend: $$$ ./masterworkers platform.xml deploy.xml @@ -216,7 +216,7 @@ file that presents how to start the example once compiled, along with the expected output. These files are used for the automatic testing of the framework, but can be used to see the examples' output without compiling them. See e.g. the file -`examples/s4u/app-masterworkers/s4u-app-masterworkers.tesh `_. +`examples/cpp/app-masterworkers/s4u-app-masterworkers.tesh `_. Lines starting with `$` are the commands to execute; lines starting with `>` are the expected output of each command while lines starting with `!` are configuration items for the test runner. diff --git a/docs/source/app_s4u.rst b/docs/source/app_s4u.rst index 72ce3ef682..c6c5efe972 100644 --- a/docs/source/app_s4u.rst +++ b/docs/source/app_s4u.rst @@ -187,7 +187,7 @@ communications ongoing. First, you have to declare a vector in which we will store the ongoing communications. It is also useful to have a vector of mailboxes. -.. literalinclude:: ../../examples/s4u/comm-waitall/s4u-comm-waitall.cpp +.. literalinclude:: ../../examples/cpp/comm-waitall/s4u-comm-waitall.cpp :language: c++ :start-after: init-begin :end-before: init-end @@ -199,7 +199,7 @@ Finally, the actor waits for the completion of all of them at once with :cpp:func:`s4u::Comm::wait_all() `. -.. literalinclude:: ../../examples/s4u/comm-waitall/s4u-comm-waitall.cpp +.. literalinclude:: ../../examples/cpp/comm-waitall/s4u-comm-waitall.cpp :language: c++ :start-after: put-begin :end-before: put-end diff --git a/docs/source/ns3.rst b/docs/source/ns3.rst index a4b39fb5d0..9cef3d4da5 100644 --- a/docs/source/ns3.rst +++ b/docs/source/ns3.rst @@ -133,7 +133,7 @@ options can be used as usual. Many other files from the ``examples/platform`` directory are usable with the ns-3 model, such as `examples/platforms/dogbone.xml `_. -Check the file `examples/s4u/network-ns3/network-ns3.tesh `_ +Check the file `examples/cpp/network-ns3/network-ns3.tesh `_ to see which ones are used in our regression tests. WiFi platforms diff --git a/examples/README.rst b/examples/README.rst index bb40b474ea..3937917972 100644 --- a/examples/README.rst +++ b/examples/README.rst @@ -11,7 +11,7 @@ SimGrid comes with an extensive set of examples, documented on this page. Most of them only demonstrate one single feature, with some larger examplars listed below. -The C++ examples can be found under examples/s4u while python examples +The C++ examples can be found under examples/cpp while python examples are in examples/python. Each such directory contains the source code (also listed from this page), and the so-called tesh file containing how to call the binary obtained by compiling this example and also the expected @@ -38,7 +38,7 @@ Starting and Stopping Actors .. tabs:: - .. example-tab:: examples/s4u/actor-create/s4u-actor-create.cpp + .. example-tab:: examples/cpp/actor-create/s4u-actor-create.cpp You create actors either: @@ -74,7 +74,7 @@ Starting and Stopping Actors .. tabs:: - .. example-tab:: examples/s4u/actor-exiting/s4u-actor-exiting.cpp + .. example-tab:: examples/cpp/actor-exiting/s4u-actor-exiting.cpp This example shows how to attach a callback to: @@ -92,7 +92,7 @@ Starting and Stopping Actors .. tabs:: - .. example-tab:: examples/s4u/actor-kill/s4u-actor-kill.cpp + .. example-tab:: examples/cpp/actor-kill/s4u-actor-kill.cpp See also :cpp:func:`void simgrid::s4u::Actor::kill(void)`, :cpp:func:`void simgrid::s4u::Actor::kill_all()`, :cpp:func:`simgrid::s4u::this_actor::exit`, :cpp:func:`simgrid::s4u::Actor::on_exit`. @@ -111,11 +111,11 @@ Starting and Stopping Actors .. tabs:: - .. example-tab:: examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp + .. example-tab:: examples/cpp/actor-lifetime/s4u-actor-lifetime.cpp This file is not really interesting: the important matter is in the XML file. - .. example-tab:: examples/s4u/actor-lifetime/s4u-actor-lifetime_d.xml + .. example-tab:: examples/cpp/actor-lifetime/s4u-actor-lifetime_d.xml This demonstrates the ``start_time`` and ``kill_time`` attribute of the :ref:`pf_tag_actor` tag. @@ -133,7 +133,7 @@ Starting and Stopping Actors .. tabs:: - .. example-tab:: examples/s4u/actor-daemon/s4u-actor-daemon.cpp + .. example-tab:: examples/cpp/actor-daemon/s4u-actor-daemon.cpp See also :cpp:func:`simgrid::s4u::Actor::daemonize()` and :cpp:func:`simgrid::s4u::Actor::is_daemon()`. @@ -152,7 +152,7 @@ Starting and Stopping Actors .. tabs:: - .. example-tab:: examples/s4u/actor-stacksize/s4u-actor-stacksize.cpp + .. example-tab:: examples/cpp/actor-stacksize/s4u-actor-stacksize.cpp .. example-tab:: examples/c/actor-stacksize/actor-stacksize.c @@ -168,7 +168,7 @@ synchronization objects `. .. tabs:: - .. example-tab:: examples/s4u/actor-suspend/s4u-actor-suspend.cpp + .. example-tab:: examples/cpp/actor-suspend/s4u-actor-suspend.cpp See also :cpp:func:`simgrid::s4u::this_actor::suspend()`, :cpp:func:`simgrid::s4u::Actor::suspend()`, :cpp:func:`simgrid::s4u::Actor::resume()`, and @@ -190,7 +190,7 @@ synchronization objects `. .. tabs:: - .. example-tab:: examples/s4u/actor-migrate/s4u-actor-migrate.cpp + .. example-tab:: examples/cpp/actor-migrate/s4u-actor-migrate.cpp See also :cpp:func:`simgrid::s4u::this_actor::set_host()` and :cpp:func:`simgrid::s4u::Actor::set_host()`. @@ -207,7 +207,7 @@ synchronization objects `. .. tabs:: - .. example-tab:: examples/s4u/actor-join/s4u-actor-join.cpp + .. example-tab:: examples/cpp/actor-join/s4u-actor-join.cpp See also :cpp:func:`simgrid::s4u::Actor::join()`. @@ -226,7 +226,7 @@ synchronization objects `. .. tabs:: - .. example-tab:: examples/s4u/actor-yield/s4u-actor-yield.cpp + .. example-tab:: examples/cpp/actor-yield/s4u-actor-yield.cpp See also :cpp:func:`simgrid::s4u::this_actor::yield()`. @@ -263,7 +263,7 @@ also the tesh files in the example directories for details. .. tabs:: - .. example-tab:: examples/s4u/replay-comm/s4u-replay-comm.cpp + .. example-tab:: examples/cpp/replay-comm/s4u-replay-comm.cpp - **I/O replay:** Presents a set of event handlers reproducing classical I/O @@ -271,7 +271,7 @@ also the tesh files in the example directories for details. .. tabs:: - .. example-tab:: examples/s4u/replay-io/s4u-replay-io.cpp + .. example-tab:: examples/cpp/replay-io/s4u-replay-io.cpp ========================== Activities: what Actors do @@ -289,7 +289,7 @@ Communications on the Network .. tabs:: - .. example-tab:: examples/s4u/comm-pingpong/s4u-comm-pingpong.cpp + .. example-tab:: examples/cpp/comm-pingpong/s4u-comm-pingpong.cpp .. example-tab:: examples/c/comm-pingpong/comm-pingpong.c @@ -301,7 +301,7 @@ Communications on the Network .. tabs:: - .. example-tab:: examples/s4u/comm-wait/s4u-comm-wait.cpp + .. example-tab:: examples/cpp/comm-wait/s4u-comm-wait.cpp See also :cpp:func:`simgrid::s4u::Mailbox::put_async()` and :cpp:func:`simgrid::s4u::Comm::wait()`. @@ -318,7 +318,7 @@ Communications on the Network .. tabs:: - .. example-tab:: examples/s4u/comm-waituntil/s4u-comm-waituntil.cpp + .. example-tab:: examples/cpp/comm-waituntil/s4u-comm-waituntil.cpp See also :cpp:func:`simgrid::s4u::Mailbox::wait_until()` and :cpp:func:`simgrid::s4u::Comm::wait_for()`. @@ -330,7 +330,7 @@ Communications on the Network .. tabs:: - .. example-tab:: examples/s4u/comm-suspend/s4u-comm-suspend.cpp + .. example-tab:: examples/cpp/comm-suspend/s4u-comm-suspend.cpp See also :cpp:func:`simgrid::s4u::Activity::suspend()` :cpp:func:`simgrid::s4u::Activity::resume()` and @@ -343,7 +343,7 @@ Communications on the Network .. tabs:: - .. example-tab:: examples/s4u/comm-waitall/s4u-comm-waitall.cpp + .. example-tab:: examples/cpp/comm-waitall/s4u-comm-waitall.cpp See also :cpp:func:`simgrid::s4u::Comm::wait_all()`. @@ -362,7 +362,7 @@ Communications on the Network .. tabs:: - .. example-tab:: examples/s4u/comm-waitany/s4u-comm-waitany.cpp + .. example-tab:: examples/cpp/comm-waitany/s4u-comm-waitany.cpp See also :cpp:func:`simgrid::s4u::Comm::wait_any()`. @@ -388,7 +388,7 @@ Executions on the CPU .. tabs:: - .. example-tab:: examples/s4u/exec-basic/s4u-exec-basic.cpp + .. example-tab:: examples/cpp/exec-basic/s4u-exec-basic.cpp See also :cpp:func:`void simgrid::s4u::this_actor::execute(double)` and :cpp:func:`void simgrid::s4u::this_actor::execute(double, double)`. @@ -408,7 +408,7 @@ Executions on the CPU .. tabs:: - .. example-tab:: examples/s4u/exec-async/s4u-exec-async.cpp + .. example-tab:: examples/cpp/exec-async/s4u-exec-async.cpp See also :cpp:func:`simgrid::s4u::this_actor::exec_init()`, :cpp:func:`simgrid::s4u::Activity::start()`, @@ -444,7 +444,7 @@ Executions on the CPU .. tabs:: - .. example-tab:: examples/s4u/exec-remote/s4u-exec-remote.cpp + .. example-tab:: examples/cpp/exec-remote/s4u-exec-remote.cpp See also :cpp:func:`simgrid::s4u::Exec::set_host()`. @@ -471,7 +471,7 @@ Executions on the CPU .. tabs:: - .. example-tab:: examples/s4u/exec-ptask/s4u-exec-ptask.cpp + .. example-tab:: examples/cpp/exec-ptask/s4u-exec-ptask.cpp See also :cpp:func:`simgrid::s4u::this_actor::parallel_execute()`. @@ -481,7 +481,7 @@ Executions on the CPU .. tabs:: - .. example-tab:: examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp + .. example-tab:: examples/cpp/exec-dvfs/s4u-exec-dvfs.cpp See also :cpp:func:`simgrid::s4u::Host::get_pstate_speed` and :cpp:func:`simgrid::s4u::Host::set_pstate`. @@ -510,7 +510,7 @@ write actions on the disk resources. .. tabs:: - .. example-tab:: examples/s4u/io-disk-raw/s4u-io-disk-raw.cpp + .. example-tab:: examples/cpp/io-disk-raw/s4u-io-disk-raw.cpp .. example-tab:: examples/c/io-disk-raw/io-disk-raw.c @@ -529,7 +529,7 @@ result in short reads and short write, as in reality. .. tabs:: - .. example-tab:: examples/s4u/io-file-system/s4u-io-file-system.cpp + .. example-tab:: examples/cpp/io-file-system/s4u-io-file-system.cpp - **Remote I/O:** I/O operations on files can also be done in a remote fashion, @@ -537,7 +537,7 @@ result in short reads and short write, as in reality. .. tabs:: - .. example-tab:: examples/s4u/io-file-remote/s4u-io-file-remote.cpp + .. example-tab:: examples/cpp/io-file-remote/s4u-io-file-remote.cpp .. example-tab:: examples/c/io-file-remote/io-file-remote.c @@ -551,35 +551,35 @@ Classical synchronization objects .. tabs:: - .. example-tab:: examples/s4u/synchro-barrier/s4u-synchro-barrier.cpp + .. example-tab:: examples/cpp/synchro-barrier/s4u-synchro-barrier.cpp - **Condition variable: basic usage** Shows how to use :cpp:type:`simgrid::s4u::ConditionVariable` synchronization objects. .. tabs:: - .. example-tab:: examples/s4u/synchro-condition-variable/s4u-synchro-condition-variable.cpp + .. example-tab:: examples/cpp/synchro-condition-variable/s4u-synchro-condition-variable.cpp - **Condition variable: timeouts** Shows how to specify timeouts when blocking on condition variables. .. tabs:: - .. example-tab:: examples/s4u/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.cpp + .. example-tab:: examples/cpp/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.cpp - **Mutex:** Shows how to use :cpp:type:`simgrid::s4u::Mutex` synchronization objects. .. tabs:: - .. example-tab:: examples/s4u/synchro-mutex/s4u-synchro-mutex.cpp + .. example-tab:: examples/cpp/synchro-mutex/s4u-synchro-mutex.cpp - **Semaphore:** Shows how to use :cpp:type:`simgrid::s4u::Semaphore` synchronization objects. .. tabs:: - .. example-tab:: examples/s4u/synchro-semaphore/s4u-synchro-semaphore.cpp + .. example-tab:: examples/cpp/synchro-semaphore/s4u-synchro-semaphore.cpp .. example-tab:: examples/c/synchro-semaphore/synchro-semaphore.c @@ -596,7 +596,7 @@ Interacting with the Platform .. tabs:: - .. example-tab:: examples/s4u/platform-properties/s4u-platform-properties.cpp + .. example-tab:: examples/cpp/platform-properties/s4u-platform-properties.cpp - :cpp:func:`simgrid::s4u::Actor::get_property()` and :cpp:func:`simgrid::s4u::Actor::set_property()` - :cpp:func:`simgrid::s4u::Host::get_property()` and :cpp:func:`simgrid::s4u::Host::set_property()` @@ -614,7 +614,7 @@ Interacting with the Platform **Deployment file:** - .. showfile:: examples/s4u/platform-properties/s4u-platform-properties_d.xml + .. showfile:: examples/cpp/platform-properties/s4u-platform-properties_d.xml :language: xml |br| @@ -628,14 +628,14 @@ Interacting with the Platform .. tabs:: - .. example-tab:: examples/s4u/routing-get-clusters/s4u-routing-get-clusters.cpp + .. example-tab:: examples/cpp/routing-get-clusters/s4u-routing-get-clusters.cpp - **Retrieving the list of hosts matching a given criteria:** Shows how to filter the actors that match a given criteria. .. tabs:: - .. example-tab:: examples/s4u/engine-filtering/s4u-engine-filtering.cpp + .. example-tab:: examples/cpp/engine-filtering/s4u-engine-filtering.cpp - **Specifying state profiles:** shows how to specify when the resources must be turned off and on again, and how to react to such @@ -643,7 +643,7 @@ Interacting with the Platform .. tabs:: - .. example-tab:: examples/s4u/platform-failures/s4u-platform-failures.cpp + .. example-tab:: examples/cpp/platform-failures/s4u-platform-failures.cpp .. example-tab:: examples/c/platform-failures/platform-failures.c @@ -663,7 +663,7 @@ Interacting with the Platform .. tabs:: - .. example-tab:: examples/s4u/platform-profile/s4u-platform-profile.cpp + .. example-tab:: examples/cpp/platform-profile/s4u-platform-profile.cpp .. group-tab:: XML @@ -704,7 +704,7 @@ Energy Simulation .. tabs:: - .. example-tab:: examples/s4u/energy-exec/s4u-energy-exec.cpp + .. example-tab:: examples/cpp/energy-exec/s4u-energy-exec.cpp .. example-tab:: examples/c/energy-exec/energy-exec.c @@ -714,7 +714,7 @@ Energy Simulation .. tabs:: - .. example-tab:: examples/s4u/energy-link/s4u-energy-link.cpp + .. example-tab:: examples/cpp/energy-link/s4u-energy-link.cpp - **Consumption due to the wireless network:** This example shows how to retrieve and display the energy consumed @@ -722,7 +722,7 @@ Energy Simulation .. tabs:: - .. example-tab:: examples/s4u/energy-wifi/s4u-energy-wifi.cpp + .. example-tab:: examples/cpp/energy-wifi/s4u-energy-wifi.cpp - **Modeling the shutdown and boot of hosts:** Simple example of model of model for the energy consumption during @@ -730,9 +730,9 @@ Energy Simulation .. tabs:: - .. example-tab:: examples/s4u/energy-boot/platform_boot.xml + .. example-tab:: examples/cpp/energy-boot/platform_boot.xml - .. example-tab:: examples/s4u/energy-boot/s4u-energy-boot.cpp + .. example-tab:: examples/cpp/energy-boot/s4u-energy-boot.cpp ======================= Tracing and Visualizing @@ -752,7 +752,7 @@ options to see the task executions: .. tabs:: - .. example-tab:: examples/s4u/trace-platform/s4u-trace-platform.cpp + .. example-tab:: examples/cpp/trace-platform/s4u-trace-platform.cpp - **Setting Categories** This example declares several tracing categories to that are used to @@ -763,7 +763,7 @@ options to see the task executions: .. tabs:: - .. example-tab:: examples/s4u/trace-categories/s4u-trace-categories.cpp + .. example-tab:: examples/cpp/trace-categories/s4u-trace-categories.cpp - **Master Workers tracing** This is an augmented version of our basic master/worker example using @@ -773,7 +773,7 @@ options to see the task executions: .. tabs:: - .. example-tab:: examples/s4u/trace-masterworkers/s4u-trace-masterworkers.cpp + .. example-tab:: examples/cpp/trace-masterworkers/s4u-trace-masterworkers.cpp - **Process migration tracing** This version is enhanced so that the process migrations can be displayed @@ -782,7 +782,7 @@ options to see the task executions: .. tabs:: - .. example-tab:: examples/s4u/trace-process-migration/s4u-trace-process-migration.cpp + .. example-tab:: examples/cpp/trace-process-migration/s4u-trace-process-migration.cpp .. TODO: These tracing examples should be integrated in the examples to not @@ -800,7 +800,7 @@ the following options: ``--cfg=tracing:yes --cfg=tracing/platform:yes`` .. tabs:: - .. example-tab:: examples/s4u/trace-host-user-variables/s4u-trace-host-user-variables.cpp + .. example-tab:: examples/cpp/trace-host-user-variables/s4u-trace-host-user-variables.cpp - **Attaching variables to Links** The tricky part is that you have to know the name of the link you want to @@ -808,7 +808,7 @@ the following options: ``--cfg=tracing:yes --cfg=tracing/platform:yes`` .. tabs:: - .. example-tab:: examples/s4u/trace-link-user-variables/s4u-trace-link-user-variables.cpp + .. example-tab:: examples/cpp/trace-link-user-variables/s4u-trace-link-user-variables.cpp - **Attaching variables to network Routes** It is often easier to update a given variable for all links of a given @@ -817,7 +817,7 @@ the following options: ``--cfg=tracing:yes --cfg=tracing/platform:yes`` .. tabs:: - .. example-tab:: examples/s4u/trace-route-user-variables/s4u-trace-route-user-variables.cpp + .. example-tab:: examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables.cpp ======================== Larger SimGrid Examplars @@ -832,7 +832,7 @@ than the previous examples. .. tabs:: - .. example-tab:: examples/s4u/app-token-ring/s4u-app-token-ring.cpp + .. example-tab:: examples/cpp/app-token-ring/s4u-app-token-ring.cpp .. example-tab:: examples/c/app-token-ring/app-token-ring.c @@ -850,10 +850,10 @@ than the previous examples. more powerful for the users wanting to build their own projects upon the example). - .. showfile:: examples/s4u/app-masterworkers/s4u-app-masterworkers-class.cpp + .. showfile:: examples/cpp/app-masterworkers/s4u-app-masterworkers-class.cpp :language: cpp - .. showfile:: examples/s4u/app-masterworkers/s4u-app-masterworkers-fun.cpp + .. showfile:: examples/cpp/app-masterworkers/s4u-app-masterworkers-fun.cpp :language: cpp .. group-tab:: C @@ -871,13 +871,13 @@ Data diffusion .. group-tab:: C++ - .. showfile:: examples/s4u/app-bittorrent/s4u-bittorrent.cpp + .. showfile:: examples/cpp/app-bittorrent/s4u-bittorrent.cpp :language: cpp - .. showfile:: examples/s4u/app-bittorrent/s4u-peer.cpp + .. showfile:: examples/cpp/app-bittorrent/s4u-peer.cpp :language: cpp - .. showfile:: examples/s4u/app-bittorrent/s4u-tracker.cpp + .. showfile:: examples/cpp/app-bittorrent/s4u-tracker.cpp :language: cpp .. group-tab:: C @@ -896,7 +896,7 @@ Data diffusion .. tabs:: - .. example-tab:: examples/s4u/app-chainsend/s4u-app-chainsend.cpp + .. example-tab:: examples/cpp/app-chainsend/s4u-app-chainsend.cpp .. group-tab:: C @@ -919,10 +919,10 @@ Distributed Hash Tables (DHT) .. group-tab:: C++ - .. showfile:: examples/s4u/dht-chord/s4u-dht-chord.cpp + .. showfile:: examples/cpp/dht-chord/s4u-dht-chord.cpp :language: cpp - .. showfile:: examples/s4u/dht-chord/s4u-dht-chord-node.cpp + .. showfile:: examples/cpp/dht-chord/s4u-dht-chord-node.cpp :language: cpp - **Kademlia** @@ -932,16 +932,16 @@ Distributed Hash Tables (DHT) .. group-tab:: C++ - .. showfile:: examples/s4u/dht-kademlia/s4u-dht-kademlia.cpp + .. showfile:: examples/cpp/dht-kademlia/s4u-dht-kademlia.cpp :language: cpp - .. showfile:: examples/s4u/dht-kademlia/routing_table.cpp + .. showfile:: examples/cpp/dht-kademlia/routing_table.cpp :language: cpp - .. showfile:: examples/s4u/dht-kademlia/answer.cpp + .. showfile:: examples/cpp/dht-kademlia/answer.cpp :language: cpp - .. showfile:: examples/s4u/dht-kademlia/node.cpp + .. showfile:: examples/cpp/dht-kademlia/node.cpp :language: cpp .. group-tab:: C @@ -972,7 +972,7 @@ Simulating Clouds .. tabs:: - .. example-tab:: examples/s4u/cloud-simple/s4u-cloud-simple.cpp + .. example-tab:: examples/cpp/cloud-simple/s4u-cloud-simple.cpp .. example-tab:: examples/c/cloud-simple/cloud-simple.c @@ -981,7 +981,7 @@ Simulating Clouds .. tabs:: - .. example-tab:: examples/s4u/cloud-migration/s4u-cloud-migration.cpp + .. example-tab:: examples/cpp/cloud-migration/s4u-cloud-migration.cpp .. example-tab:: examples/c/cloud-migration/cloud-migration.c @@ -999,7 +999,7 @@ Model-Related Examples .. tabs:: - .. example-tab:: examples/s4u/network-ns3/s4u-network-ns3.cpp + .. example-tab:: examples/cpp/network-ns3/s4u-network-ns3.cpp .. group-tab:: XML @@ -1028,7 +1028,7 @@ Model-Related Examples .. tabs:: - .. example-tab:: examples/s4u/network-wifi/s4u-network-wifi.cpp + .. example-tab:: examples/cpp/network-wifi/s4u-network-wifi.cpp .. group-tab:: XML @@ -1055,7 +1055,7 @@ should be much easier than modifying the SimGrid kernel. .. tabs:: - .. example-tab:: examples/s4u/plugin-host-load/s4u-plugin-host-load.cpp + .. example-tab:: examples/cpp/plugin-host-load/s4u-plugin-host-load.cpp .. example-tab:: examples/c/plugin-host-load/plugin-host-load.c @@ -1063,7 +1063,7 @@ should be much easier than modifying the SimGrid kernel. .. tabs:: - .. example-tab:: examples/s4u/plugin-link-load/s4u-plugin-link-load.cpp + .. example-tab:: examples/cpp/plugin-link-load/s4u-plugin-link-load.cpp ======================= Model-Checking Examples @@ -1083,7 +1083,7 @@ SimGrid is slower and maybe less robust when MC is enabled. .. tabs:: - .. example-tab:: examples/s4u/mc-failing-assert/s4u-mc-failing-assert.cpp + .. example-tab:: examples/cpp/mc-failing-assert/s4u-mc-failing-assert.cpp .. |br| raw:: html diff --git a/examples/c/platform-failures/platform-failures.tesh b/examples/c/platform-failures/platform-failures.tesh index ba91e26100..c784405a3a 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:=.}/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:%a@%h)%e%m%n" --log=res_cpu.t:verbose +$ ${bindir:=.}/c-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../cpp/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=res_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:=.}/c-platform-failures --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:=.}/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:%a@%h)%e%m%n" --log=res_cpu.t:verbose +$ ${bindir:=.}/c-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../cpp/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=res_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:=.}/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:%a@%h)%e%m%n" --log=res_cpu.t:verbose +p $ ${bindir:=.}/c-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../cpp/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=res_cpu.t:verbose diff --git a/examples/s4u/CMakeLists.txt b/examples/cpp/CMakeLists.txt similarity index 96% rename from examples/s4u/CMakeLists.txt rename to examples/cpp/CMakeLists.txt index 801dba6b5b..fc3d688f8a 100644 --- a/examples/s4u/CMakeLists.txt +++ b/examples/cpp/CMakeLists.txt @@ -100,7 +100,7 @@ foreach (example actor-create actor-daemon actor-exiting actor-join actor-kill --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/${example} --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_CURRENT_SOURCE_DIR}/${example} - ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example}/s4u-${example}.tesh) + ${CMAKE_HOME_DIRECTORY}/examples/cpp/${example}/s4u-${example}.tesh) else() message(STATUS "Example ${example} disabled, thus not compiled.") unset(_${example}_disable) @@ -136,17 +136,17 @@ if(SIMGRID_HAVE_MC) ADD_TESH(s4u-mc-bugged1-liveness-ucontext --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/mc-bugged1-liveness --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged1-liveness - ${CMAKE_HOME_DIRECTORY}/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.tesh) + ${CMAKE_HOME_DIRECTORY}/examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness.tesh) # This example hit the 5' timeout on CI, disable it for now # ADD_TESH(s4u-mc-bugged1-liveness-visited-ucontext --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/mc-bugged1-liveness # --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms # --cd ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged1-liveness -# ${CMAKE_HOME_DIRECTORY}/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh) +# ${CMAKE_HOME_DIRECTORY}/examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh) IF(HAVE_C_STACK_CLEANER) # This test checks if the stack cleaner is making a difference: - ADD_TEST(s4u-mc-bugged1-liveness-stack-cleaner ${CMAKE_HOME_DIRECTORY}/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner - ${CMAKE_HOME_DIRECTORY}/examples/s4u/mc-bugged1-liveness/ + ADD_TEST(s4u-mc-bugged1-liveness-stack-cleaner ${CMAKE_HOME_DIRECTORY}/examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner + ${CMAKE_HOME_DIRECTORY}/examples/cpp/mc-bugged1-liveness/ ${CMAKE_CURRENT_BINARY_DIR}/mc-bugged1-liveness/) ENDIF() ENDIF() @@ -173,21 +173,21 @@ foreach(example app-bittorrent app-masterworkers --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/${example} --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_CURRENT_SOURCE_DIR}/${example} - ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example}/s4u-${example}.tesh) + ${CMAKE_HOME_DIRECTORY}/examples/cpp/${example}/s4u-${example}.tesh) endforeach() # ns3-tests if(SIMGRID_HAVE_NS3) ADD_TESH_FACTORIES(s4u-network-ns3 "thread;ucontext;raw;boost" - --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/s4u - --setenv bindir=${CMAKE_BINARY_DIR}/examples/s4u + --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/cpp + --setenv bindir=${CMAKE_BINARY_DIR}/examples/cpp --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms - ${CMAKE_HOME_DIRECTORY}/examples/s4u/network-ns3/s4u-network-ns3.tesh) + ${CMAKE_HOME_DIRECTORY}/examples/cpp/network-ns3/s4u-network-ns3.tesh) ADD_TESH_FACTORIES(s4u-network-ns3-wifi "thread;ucontext;raw;boost" - --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/s4u - --setenv bindir=${CMAKE_BINARY_DIR}/examples/s4u + --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/cpp + --setenv bindir=${CMAKE_BINARY_DIR}/examples/cpp --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms - ${CMAKE_HOME_DIRECTORY}/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.tesh) + ${CMAKE_HOME_DIRECTORY}/examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi.tesh) endif() # Examples not accepting factories ################################## @@ -206,7 +206,7 @@ foreach (example trace-categories trace-masterworkers trace-platform trace-proce --setenv srcdir=${CMAKE_CURRENT_SOURCE_DIR}/${example} --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_CURRENT_BINARY_DIR}/${example} - ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example}/s4u-${example}.tesh) + ${CMAKE_HOME_DIRECTORY}/examples/cpp/${example}/s4u-${example}.tesh) endforeach() if (NOT enable_memcheck AND NOT WIN32) diff --git a/examples/s4u/actor-create/.gitignore b/examples/cpp/actor-create/.gitignore similarity index 100% rename from examples/s4u/actor-create/.gitignore rename to examples/cpp/actor-create/.gitignore diff --git a/examples/s4u/actor-create/s4u-actor-create.cpp b/examples/cpp/actor-create/s4u-actor-create.cpp similarity index 100% rename from examples/s4u/actor-create/s4u-actor-create.cpp rename to examples/cpp/actor-create/s4u-actor-create.cpp diff --git a/examples/s4u/actor-create/s4u-actor-create.tesh b/examples/cpp/actor-create/s4u-actor-create.tesh similarity index 100% rename from examples/s4u/actor-create/s4u-actor-create.tesh rename to examples/cpp/actor-create/s4u-actor-create.tesh diff --git a/examples/s4u/actor-create/s4u-actor-create_d.xml b/examples/cpp/actor-create/s4u-actor-create_d.xml similarity index 100% rename from examples/s4u/actor-create/s4u-actor-create_d.xml rename to examples/cpp/actor-create/s4u-actor-create_d.xml diff --git a/examples/s4u/actor-daemon/s4u-actor-daemon.cpp b/examples/cpp/actor-daemon/s4u-actor-daemon.cpp similarity index 100% rename from examples/s4u/actor-daemon/s4u-actor-daemon.cpp rename to examples/cpp/actor-daemon/s4u-actor-daemon.cpp diff --git a/examples/s4u/actor-daemon/s4u-actor-daemon.tesh b/examples/cpp/actor-daemon/s4u-actor-daemon.tesh similarity index 100% rename from examples/s4u/actor-daemon/s4u-actor-daemon.tesh rename to examples/cpp/actor-daemon/s4u-actor-daemon.tesh diff --git a/examples/s4u/actor-exiting/s4u-actor-exiting.cpp b/examples/cpp/actor-exiting/s4u-actor-exiting.cpp similarity index 100% rename from examples/s4u/actor-exiting/s4u-actor-exiting.cpp rename to examples/cpp/actor-exiting/s4u-actor-exiting.cpp diff --git a/examples/s4u/actor-exiting/s4u-actor-exiting.tesh b/examples/cpp/actor-exiting/s4u-actor-exiting.tesh similarity index 100% rename from examples/s4u/actor-exiting/s4u-actor-exiting.tesh rename to examples/cpp/actor-exiting/s4u-actor-exiting.tesh diff --git a/examples/s4u/actor-join/s4u-actor-join.cpp b/examples/cpp/actor-join/s4u-actor-join.cpp similarity index 100% rename from examples/s4u/actor-join/s4u-actor-join.cpp rename to examples/cpp/actor-join/s4u-actor-join.cpp diff --git a/examples/s4u/actor-join/s4u-actor-join.tesh b/examples/cpp/actor-join/s4u-actor-join.tesh similarity index 100% rename from examples/s4u/actor-join/s4u-actor-join.tesh rename to examples/cpp/actor-join/s4u-actor-join.tesh diff --git a/examples/s4u/actor-kill/s4u-actor-kill.cpp b/examples/cpp/actor-kill/s4u-actor-kill.cpp similarity index 100% rename from examples/s4u/actor-kill/s4u-actor-kill.cpp rename to examples/cpp/actor-kill/s4u-actor-kill.cpp diff --git a/examples/s4u/actor-kill/s4u-actor-kill.tesh b/examples/cpp/actor-kill/s4u-actor-kill.tesh similarity index 100% rename from examples/s4u/actor-kill/s4u-actor-kill.tesh rename to examples/cpp/actor-kill/s4u-actor-kill.tesh diff --git a/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp b/examples/cpp/actor-lifetime/s4u-actor-lifetime.cpp similarity index 100% rename from examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp rename to examples/cpp/actor-lifetime/s4u-actor-lifetime.cpp diff --git a/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh b/examples/cpp/actor-lifetime/s4u-actor-lifetime.tesh similarity index 100% rename from examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh rename to examples/cpp/actor-lifetime/s4u-actor-lifetime.tesh diff --git a/examples/s4u/actor-lifetime/s4u-actor-lifetime_d.xml b/examples/cpp/actor-lifetime/s4u-actor-lifetime_d.xml similarity index 100% rename from examples/s4u/actor-lifetime/s4u-actor-lifetime_d.xml rename to examples/cpp/actor-lifetime/s4u-actor-lifetime_d.xml diff --git a/examples/s4u/actor-migrate/s4u-actor-migrate.cpp b/examples/cpp/actor-migrate/s4u-actor-migrate.cpp similarity index 100% rename from examples/s4u/actor-migrate/s4u-actor-migrate.cpp rename to examples/cpp/actor-migrate/s4u-actor-migrate.cpp diff --git a/examples/s4u/actor-migrate/s4u-actor-migrate.tesh b/examples/cpp/actor-migrate/s4u-actor-migrate.tesh similarity index 100% rename from examples/s4u/actor-migrate/s4u-actor-migrate.tesh rename to examples/cpp/actor-migrate/s4u-actor-migrate.tesh diff --git a/examples/s4u/actor-stacksize/s4u-actor-stacksize.cpp b/examples/cpp/actor-stacksize/s4u-actor-stacksize.cpp similarity index 100% rename from examples/s4u/actor-stacksize/s4u-actor-stacksize.cpp rename to examples/cpp/actor-stacksize/s4u-actor-stacksize.cpp diff --git a/examples/s4u/actor-stacksize/s4u-actor-stacksize.tesh b/examples/cpp/actor-stacksize/s4u-actor-stacksize.tesh similarity index 100% rename from examples/s4u/actor-stacksize/s4u-actor-stacksize.tesh rename to examples/cpp/actor-stacksize/s4u-actor-stacksize.tesh diff --git a/examples/s4u/actor-suspend/s4u-actor-suspend.cpp b/examples/cpp/actor-suspend/s4u-actor-suspend.cpp similarity index 100% rename from examples/s4u/actor-suspend/s4u-actor-suspend.cpp rename to examples/cpp/actor-suspend/s4u-actor-suspend.cpp diff --git a/examples/s4u/actor-suspend/s4u-actor-suspend.tesh b/examples/cpp/actor-suspend/s4u-actor-suspend.tesh similarity index 100% rename from examples/s4u/actor-suspend/s4u-actor-suspend.tesh rename to examples/cpp/actor-suspend/s4u-actor-suspend.tesh diff --git a/examples/s4u/actor-yield/s4u-actor-yield.cpp b/examples/cpp/actor-yield/s4u-actor-yield.cpp similarity index 100% rename from examples/s4u/actor-yield/s4u-actor-yield.cpp rename to examples/cpp/actor-yield/s4u-actor-yield.cpp diff --git a/examples/s4u/actor-yield/s4u-actor-yield.tesh b/examples/cpp/actor-yield/s4u-actor-yield.tesh similarity index 100% rename from examples/s4u/actor-yield/s4u-actor-yield.tesh rename to examples/cpp/actor-yield/s4u-actor-yield.tesh diff --git a/examples/s4u/actor-yield/s4u-actor-yield_d.xml b/examples/cpp/actor-yield/s4u-actor-yield_d.xml similarity index 100% rename from examples/s4u/actor-yield/s4u-actor-yield_d.xml rename to examples/cpp/actor-yield/s4u-actor-yield_d.xml diff --git a/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh b/examples/cpp/app-bittorrent/s4u-app-bittorrent.tesh similarity index 100% rename from examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh rename to examples/cpp/app-bittorrent/s4u-app-bittorrent.tesh diff --git a/examples/s4u/app-bittorrent/s4u-app-bittorrent_d.xml b/examples/cpp/app-bittorrent/s4u-app-bittorrent_d.xml similarity index 100% rename from examples/s4u/app-bittorrent/s4u-app-bittorrent_d.xml rename to examples/cpp/app-bittorrent/s4u-app-bittorrent_d.xml diff --git a/examples/s4u/app-bittorrent/s4u-bittorrent.cpp b/examples/cpp/app-bittorrent/s4u-bittorrent.cpp similarity index 100% rename from examples/s4u/app-bittorrent/s4u-bittorrent.cpp rename to examples/cpp/app-bittorrent/s4u-bittorrent.cpp diff --git a/examples/s4u/app-bittorrent/s4u-bittorrent.hpp b/examples/cpp/app-bittorrent/s4u-bittorrent.hpp similarity index 100% rename from examples/s4u/app-bittorrent/s4u-bittorrent.hpp rename to examples/cpp/app-bittorrent/s4u-bittorrent.hpp diff --git a/examples/s4u/app-bittorrent/s4u-peer.cpp b/examples/cpp/app-bittorrent/s4u-peer.cpp similarity index 100% rename from examples/s4u/app-bittorrent/s4u-peer.cpp rename to examples/cpp/app-bittorrent/s4u-peer.cpp diff --git a/examples/s4u/app-bittorrent/s4u-peer.hpp b/examples/cpp/app-bittorrent/s4u-peer.hpp similarity index 100% rename from examples/s4u/app-bittorrent/s4u-peer.hpp rename to examples/cpp/app-bittorrent/s4u-peer.hpp diff --git a/examples/s4u/app-bittorrent/s4u-tracker.cpp b/examples/cpp/app-bittorrent/s4u-tracker.cpp similarity index 100% rename from examples/s4u/app-bittorrent/s4u-tracker.cpp rename to examples/cpp/app-bittorrent/s4u-tracker.cpp diff --git a/examples/s4u/app-bittorrent/s4u-tracker.hpp b/examples/cpp/app-bittorrent/s4u-tracker.hpp similarity index 100% rename from examples/s4u/app-bittorrent/s4u-tracker.hpp rename to examples/cpp/app-bittorrent/s4u-tracker.hpp diff --git a/examples/s4u/app-chainsend/s4u-app-chainsend.cpp b/examples/cpp/app-chainsend/s4u-app-chainsend.cpp similarity index 100% rename from examples/s4u/app-chainsend/s4u-app-chainsend.cpp rename to examples/cpp/app-chainsend/s4u-app-chainsend.cpp diff --git a/examples/s4u/app-chainsend/s4u-app-chainsend.tesh b/examples/cpp/app-chainsend/s4u-app-chainsend.tesh similarity index 100% rename from examples/s4u/app-chainsend/s4u-app-chainsend.tesh rename to examples/cpp/app-chainsend/s4u-app-chainsend.tesh diff --git a/examples/s4u/app-masterworkers/s4u-app-masterworkers-class.cpp b/examples/cpp/app-masterworkers/s4u-app-masterworkers-class.cpp similarity index 100% rename from examples/s4u/app-masterworkers/s4u-app-masterworkers-class.cpp rename to examples/cpp/app-masterworkers/s4u-app-masterworkers-class.cpp diff --git a/examples/s4u/app-masterworkers/s4u-app-masterworkers-fun.cpp b/examples/cpp/app-masterworkers/s4u-app-masterworkers-fun.cpp similarity index 100% rename from examples/s4u/app-masterworkers/s4u-app-masterworkers-fun.cpp rename to examples/cpp/app-masterworkers/s4u-app-masterworkers-fun.cpp diff --git a/examples/s4u/app-masterworkers/s4u-app-masterworkers.tesh b/examples/cpp/app-masterworkers/s4u-app-masterworkers.tesh similarity index 100% rename from examples/s4u/app-masterworkers/s4u-app-masterworkers.tesh rename to examples/cpp/app-masterworkers/s4u-app-masterworkers.tesh diff --git a/examples/s4u/app-masterworkers/s4u-app-masterworkers_d.xml b/examples/cpp/app-masterworkers/s4u-app-masterworkers_d.xml similarity index 100% rename from examples/s4u/app-masterworkers/s4u-app-masterworkers_d.xml rename to examples/cpp/app-masterworkers/s4u-app-masterworkers_d.xml diff --git a/examples/s4u/app-token-ring/s4u-app-token-ring.cpp b/examples/cpp/app-token-ring/s4u-app-token-ring.cpp similarity index 100% rename from examples/s4u/app-token-ring/s4u-app-token-ring.cpp rename to examples/cpp/app-token-ring/s4u-app-token-ring.cpp diff --git a/examples/s4u/app-token-ring/s4u-app-token-ring.tesh b/examples/cpp/app-token-ring/s4u-app-token-ring.tesh similarity index 100% rename from examples/s4u/app-token-ring/s4u-app-token-ring.tesh rename to examples/cpp/app-token-ring/s4u-app-token-ring.tesh diff --git a/examples/s4u/cloud-capping/s4u-cloud-capping.cpp b/examples/cpp/cloud-capping/s4u-cloud-capping.cpp similarity index 100% rename from examples/s4u/cloud-capping/s4u-cloud-capping.cpp rename to examples/cpp/cloud-capping/s4u-cloud-capping.cpp diff --git a/examples/s4u/cloud-capping/s4u-cloud-capping.tesh b/examples/cpp/cloud-capping/s4u-cloud-capping.tesh similarity index 100% rename from examples/s4u/cloud-capping/s4u-cloud-capping.tesh rename to examples/cpp/cloud-capping/s4u-cloud-capping.tesh diff --git a/examples/s4u/cloud-migration/s4u-cloud-migration.cpp b/examples/cpp/cloud-migration/s4u-cloud-migration.cpp similarity index 100% rename from examples/s4u/cloud-migration/s4u-cloud-migration.cpp rename to examples/cpp/cloud-migration/s4u-cloud-migration.cpp diff --git a/examples/s4u/cloud-migration/s4u-cloud-migration.tesh b/examples/cpp/cloud-migration/s4u-cloud-migration.tesh similarity index 100% rename from examples/s4u/cloud-migration/s4u-cloud-migration.tesh rename to examples/cpp/cloud-migration/s4u-cloud-migration.tesh diff --git a/examples/s4u/cloud-simple/s4u-cloud-simple.cpp b/examples/cpp/cloud-simple/s4u-cloud-simple.cpp similarity index 100% rename from examples/s4u/cloud-simple/s4u-cloud-simple.cpp rename to examples/cpp/cloud-simple/s4u-cloud-simple.cpp diff --git a/examples/s4u/cloud-simple/s4u-cloud-simple.tesh b/examples/cpp/cloud-simple/s4u-cloud-simple.tesh similarity index 100% rename from examples/s4u/cloud-simple/s4u-cloud-simple.tesh rename to examples/cpp/cloud-simple/s4u-cloud-simple.tesh diff --git a/examples/s4u/comm-dependent/s4u-comm-dependent.cpp b/examples/cpp/comm-dependent/s4u-comm-dependent.cpp similarity index 100% rename from examples/s4u/comm-dependent/s4u-comm-dependent.cpp rename to examples/cpp/comm-dependent/s4u-comm-dependent.cpp diff --git a/examples/s4u/comm-dependent/s4u-comm-dependent.tesh b/examples/cpp/comm-dependent/s4u-comm-dependent.tesh similarity index 100% rename from examples/s4u/comm-dependent/s4u-comm-dependent.tesh rename to examples/cpp/comm-dependent/s4u-comm-dependent.tesh diff --git a/examples/s4u/comm-host2host/s4u-comm-host2host.cpp b/examples/cpp/comm-host2host/s4u-comm-host2host.cpp similarity index 100% rename from examples/s4u/comm-host2host/s4u-comm-host2host.cpp rename to examples/cpp/comm-host2host/s4u-comm-host2host.cpp diff --git a/examples/s4u/comm-host2host/s4u-comm-host2host.tesh b/examples/cpp/comm-host2host/s4u-comm-host2host.tesh similarity index 100% rename from examples/s4u/comm-host2host/s4u-comm-host2host.tesh rename to examples/cpp/comm-host2host/s4u-comm-host2host.tesh diff --git a/examples/s4u/comm-pingpong/s4u-comm-pingpong.cpp b/examples/cpp/comm-pingpong/s4u-comm-pingpong.cpp similarity index 100% rename from examples/s4u/comm-pingpong/s4u-comm-pingpong.cpp rename to examples/cpp/comm-pingpong/s4u-comm-pingpong.cpp diff --git a/examples/s4u/comm-pingpong/s4u-comm-pingpong.tesh b/examples/cpp/comm-pingpong/s4u-comm-pingpong.tesh similarity index 100% rename from examples/s4u/comm-pingpong/s4u-comm-pingpong.tesh rename to examples/cpp/comm-pingpong/s4u-comm-pingpong.tesh diff --git a/examples/s4u/comm-pingpong/simix-breakpoint.tesh b/examples/cpp/comm-pingpong/simix-breakpoint.tesh similarity index 100% rename from examples/s4u/comm-pingpong/simix-breakpoint.tesh rename to examples/cpp/comm-pingpong/simix-breakpoint.tesh diff --git a/examples/s4u/comm-ready/s4u-comm-ready.cpp b/examples/cpp/comm-ready/s4u-comm-ready.cpp similarity index 100% rename from examples/s4u/comm-ready/s4u-comm-ready.cpp rename to examples/cpp/comm-ready/s4u-comm-ready.cpp diff --git a/examples/s4u/comm-ready/s4u-comm-ready.tesh b/examples/cpp/comm-ready/s4u-comm-ready.tesh similarity index 100% rename from examples/s4u/comm-ready/s4u-comm-ready.tesh rename to examples/cpp/comm-ready/s4u-comm-ready.tesh diff --git a/examples/s4u/comm-ready/s4u-comm-ready_d.xml b/examples/cpp/comm-ready/s4u-comm-ready_d.xml similarity index 100% rename from examples/s4u/comm-ready/s4u-comm-ready_d.xml rename to examples/cpp/comm-ready/s4u-comm-ready_d.xml diff --git a/examples/s4u/comm-suspend/s4u-comm-suspend.cpp b/examples/cpp/comm-suspend/s4u-comm-suspend.cpp similarity index 100% rename from examples/s4u/comm-suspend/s4u-comm-suspend.cpp rename to examples/cpp/comm-suspend/s4u-comm-suspend.cpp diff --git a/examples/s4u/comm-suspend/s4u-comm-suspend.tesh b/examples/cpp/comm-suspend/s4u-comm-suspend.tesh similarity index 100% rename from examples/s4u/comm-suspend/s4u-comm-suspend.tesh rename to examples/cpp/comm-suspend/s4u-comm-suspend.tesh diff --git a/examples/s4u/comm-suspend/s4u-comm-suspend_d.xml b/examples/cpp/comm-suspend/s4u-comm-suspend_d.xml similarity index 100% rename from examples/s4u/comm-suspend/s4u-comm-suspend_d.xml rename to examples/cpp/comm-suspend/s4u-comm-suspend_d.xml diff --git a/examples/s4u/comm-wait/s4u-comm-wait.cpp b/examples/cpp/comm-wait/s4u-comm-wait.cpp similarity index 100% rename from examples/s4u/comm-wait/s4u-comm-wait.cpp rename to examples/cpp/comm-wait/s4u-comm-wait.cpp diff --git a/examples/s4u/comm-wait/s4u-comm-wait.tesh b/examples/cpp/comm-wait/s4u-comm-wait.tesh similarity index 100% rename from examples/s4u/comm-wait/s4u-comm-wait.tesh rename to examples/cpp/comm-wait/s4u-comm-wait.tesh diff --git a/examples/s4u/comm-wait/s4u-comm-wait_d.xml b/examples/cpp/comm-wait/s4u-comm-wait_d.xml similarity index 100% rename from examples/s4u/comm-wait/s4u-comm-wait_d.xml rename to examples/cpp/comm-wait/s4u-comm-wait_d.xml diff --git a/examples/s4u/comm-waitall/s4u-comm-waitall.cpp b/examples/cpp/comm-waitall/s4u-comm-waitall.cpp similarity index 100% rename from examples/s4u/comm-waitall/s4u-comm-waitall.cpp rename to examples/cpp/comm-waitall/s4u-comm-waitall.cpp diff --git a/examples/s4u/comm-waitall/s4u-comm-waitall.tesh b/examples/cpp/comm-waitall/s4u-comm-waitall.tesh similarity index 100% rename from examples/s4u/comm-waitall/s4u-comm-waitall.tesh rename to examples/cpp/comm-waitall/s4u-comm-waitall.tesh diff --git a/examples/s4u/comm-waitall/s4u-comm-waitall_d.xml b/examples/cpp/comm-waitall/s4u-comm-waitall_d.xml similarity index 100% rename from examples/s4u/comm-waitall/s4u-comm-waitall_d.xml rename to examples/cpp/comm-waitall/s4u-comm-waitall_d.xml diff --git a/examples/s4u/comm-waitany/s4u-comm-waitany.cpp b/examples/cpp/comm-waitany/s4u-comm-waitany.cpp similarity index 100% rename from examples/s4u/comm-waitany/s4u-comm-waitany.cpp rename to examples/cpp/comm-waitany/s4u-comm-waitany.cpp diff --git a/examples/s4u/comm-waitany/s4u-comm-waitany.tesh b/examples/cpp/comm-waitany/s4u-comm-waitany.tesh similarity index 100% rename from examples/s4u/comm-waitany/s4u-comm-waitany.tesh rename to examples/cpp/comm-waitany/s4u-comm-waitany.tesh diff --git a/examples/s4u/comm-waitany/s4u-comm-waitany_d.xml b/examples/cpp/comm-waitany/s4u-comm-waitany_d.xml similarity index 100% rename from examples/s4u/comm-waitany/s4u-comm-waitany_d.xml rename to examples/cpp/comm-waitany/s4u-comm-waitany_d.xml diff --git a/examples/s4u/comm-waituntil/s4u-comm-waituntil.cpp b/examples/cpp/comm-waituntil/s4u-comm-waituntil.cpp similarity index 100% rename from examples/s4u/comm-waituntil/s4u-comm-waituntil.cpp rename to examples/cpp/comm-waituntil/s4u-comm-waituntil.cpp diff --git a/examples/s4u/comm-waituntil/s4u-comm-waituntil.tesh b/examples/cpp/comm-waituntil/s4u-comm-waituntil.tesh similarity index 100% rename from examples/s4u/comm-waituntil/s4u-comm-waituntil.tesh rename to examples/cpp/comm-waituntil/s4u-comm-waituntil.tesh diff --git a/examples/s4u/comm-waituntil/s4u-comm-waituntil_d.xml b/examples/cpp/comm-waituntil/s4u-comm-waituntil_d.xml similarity index 100% rename from examples/s4u/comm-waituntil/s4u-comm-waituntil_d.xml rename to examples/cpp/comm-waituntil/s4u-comm-waituntil_d.xml diff --git a/examples/s4u/dht-chord/s4u-dht-chord-node.cpp b/examples/cpp/dht-chord/s4u-dht-chord-node.cpp similarity index 100% rename from examples/s4u/dht-chord/s4u-dht-chord-node.cpp rename to examples/cpp/dht-chord/s4u-dht-chord-node.cpp diff --git a/examples/s4u/dht-chord/s4u-dht-chord.cpp b/examples/cpp/dht-chord/s4u-dht-chord.cpp similarity index 100% rename from examples/s4u/dht-chord/s4u-dht-chord.cpp rename to examples/cpp/dht-chord/s4u-dht-chord.cpp diff --git a/examples/s4u/dht-chord/s4u-dht-chord.hpp b/examples/cpp/dht-chord/s4u-dht-chord.hpp similarity index 100% rename from examples/s4u/dht-chord/s4u-dht-chord.hpp rename to examples/cpp/dht-chord/s4u-dht-chord.hpp diff --git a/examples/s4u/dht-chord/s4u-dht-chord.tesh b/examples/cpp/dht-chord/s4u-dht-chord.tesh similarity index 100% rename from examples/s4u/dht-chord/s4u-dht-chord.tesh rename to examples/cpp/dht-chord/s4u-dht-chord.tesh diff --git a/examples/s4u/dht-chord/s4u-dht-chord_d.xml b/examples/cpp/dht-chord/s4u-dht-chord_d.xml similarity index 100% rename from examples/s4u/dht-chord/s4u-dht-chord_d.xml rename to examples/cpp/dht-chord/s4u-dht-chord_d.xml diff --git a/examples/s4u/dht-kademlia/answer.cpp b/examples/cpp/dht-kademlia/answer.cpp similarity index 100% rename from examples/s4u/dht-kademlia/answer.cpp rename to examples/cpp/dht-kademlia/answer.cpp diff --git a/examples/s4u/dht-kademlia/answer.hpp b/examples/cpp/dht-kademlia/answer.hpp similarity index 100% rename from examples/s4u/dht-kademlia/answer.hpp rename to examples/cpp/dht-kademlia/answer.hpp diff --git a/examples/s4u/dht-kademlia/generate.py b/examples/cpp/dht-kademlia/generate.py similarity index 100% rename from examples/s4u/dht-kademlia/generate.py rename to examples/cpp/dht-kademlia/generate.py diff --git a/examples/s4u/dht-kademlia/message.hpp b/examples/cpp/dht-kademlia/message.hpp similarity index 100% rename from examples/s4u/dht-kademlia/message.hpp rename to examples/cpp/dht-kademlia/message.hpp diff --git a/examples/s4u/dht-kademlia/node.cpp b/examples/cpp/dht-kademlia/node.cpp similarity index 100% rename from examples/s4u/dht-kademlia/node.cpp rename to examples/cpp/dht-kademlia/node.cpp diff --git a/examples/s4u/dht-kademlia/node.hpp b/examples/cpp/dht-kademlia/node.hpp similarity index 100% rename from examples/s4u/dht-kademlia/node.hpp rename to examples/cpp/dht-kademlia/node.hpp diff --git a/examples/s4u/dht-kademlia/routing_table.cpp b/examples/cpp/dht-kademlia/routing_table.cpp similarity index 100% rename from examples/s4u/dht-kademlia/routing_table.cpp rename to examples/cpp/dht-kademlia/routing_table.cpp diff --git a/examples/s4u/dht-kademlia/routing_table.hpp b/examples/cpp/dht-kademlia/routing_table.hpp similarity index 100% rename from examples/s4u/dht-kademlia/routing_table.hpp rename to examples/cpp/dht-kademlia/routing_table.hpp diff --git a/examples/s4u/dht-kademlia/s4u-dht-kademlia.cpp b/examples/cpp/dht-kademlia/s4u-dht-kademlia.cpp similarity index 100% rename from examples/s4u/dht-kademlia/s4u-dht-kademlia.cpp rename to examples/cpp/dht-kademlia/s4u-dht-kademlia.cpp diff --git a/examples/s4u/dht-kademlia/s4u-dht-kademlia.hpp b/examples/cpp/dht-kademlia/s4u-dht-kademlia.hpp similarity index 100% rename from examples/s4u/dht-kademlia/s4u-dht-kademlia.hpp rename to examples/cpp/dht-kademlia/s4u-dht-kademlia.hpp diff --git a/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh b/examples/cpp/dht-kademlia/s4u-dht-kademlia.tesh similarity index 100% rename from examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh rename to examples/cpp/dht-kademlia/s4u-dht-kademlia.tesh diff --git a/examples/s4u/dht-kademlia/s4u-dht-kademlia_d.xml b/examples/cpp/dht-kademlia/s4u-dht-kademlia_d.xml similarity index 100% rename from examples/s4u/dht-kademlia/s4u-dht-kademlia_d.xml rename to examples/cpp/dht-kademlia/s4u-dht-kademlia_d.xml diff --git a/examples/s4u/energy-boot/platform_boot.xml b/examples/cpp/energy-boot/platform_boot.xml similarity index 100% rename from examples/s4u/energy-boot/platform_boot.xml rename to examples/cpp/energy-boot/platform_boot.xml diff --git a/examples/s4u/energy-boot/s4u-energy-boot.cpp b/examples/cpp/energy-boot/s4u-energy-boot.cpp similarity index 100% rename from examples/s4u/energy-boot/s4u-energy-boot.cpp rename to examples/cpp/energy-boot/s4u-energy-boot.cpp diff --git a/examples/s4u/energy-boot/s4u-energy-boot.tesh b/examples/cpp/energy-boot/s4u-energy-boot.tesh similarity index 100% rename from examples/s4u/energy-boot/s4u-energy-boot.tesh rename to examples/cpp/energy-boot/s4u-energy-boot.tesh diff --git a/examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.cpp b/examples/cpp/energy-exec-ptask/s4u-energy-exec-ptask.cpp similarity index 100% rename from examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.cpp rename to examples/cpp/energy-exec-ptask/s4u-energy-exec-ptask.cpp diff --git a/examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.tesh b/examples/cpp/energy-exec-ptask/s4u-energy-exec-ptask.tesh similarity index 100% rename from examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.tesh rename to examples/cpp/energy-exec-ptask/s4u-energy-exec-ptask.tesh diff --git a/examples/s4u/energy-exec/s4u-energy-exec.cpp b/examples/cpp/energy-exec/s4u-energy-exec.cpp similarity index 100% rename from examples/s4u/energy-exec/s4u-energy-exec.cpp rename to examples/cpp/energy-exec/s4u-energy-exec.cpp diff --git a/examples/s4u/energy-exec/s4u-energy-exec.tesh b/examples/cpp/energy-exec/s4u-energy-exec.tesh similarity index 100% rename from examples/s4u/energy-exec/s4u-energy-exec.tesh rename to examples/cpp/energy-exec/s4u-energy-exec.tesh diff --git a/examples/s4u/energy-link/s4u-energy-link.cpp b/examples/cpp/energy-link/s4u-energy-link.cpp similarity index 100% rename from examples/s4u/energy-link/s4u-energy-link.cpp rename to examples/cpp/energy-link/s4u-energy-link.cpp diff --git a/examples/s4u/energy-link/s4u-energy-link.tesh b/examples/cpp/energy-link/s4u-energy-link.tesh similarity index 100% rename from examples/s4u/energy-link/s4u-energy-link.tesh rename to examples/cpp/energy-link/s4u-energy-link.tesh diff --git a/examples/s4u/energy-vm/s4u-energy-vm.cpp b/examples/cpp/energy-vm/s4u-energy-vm.cpp similarity index 100% rename from examples/s4u/energy-vm/s4u-energy-vm.cpp rename to examples/cpp/energy-vm/s4u-energy-vm.cpp diff --git a/examples/s4u/energy-vm/s4u-energy-vm.tesh b/examples/cpp/energy-vm/s4u-energy-vm.tesh similarity index 100% rename from examples/s4u/energy-vm/s4u-energy-vm.tesh rename to examples/cpp/energy-vm/s4u-energy-vm.tesh diff --git a/examples/s4u/energy-wifi/s4u-energy-wifi.cpp b/examples/cpp/energy-wifi/s4u-energy-wifi.cpp similarity index 100% rename from examples/s4u/energy-wifi/s4u-energy-wifi.cpp rename to examples/cpp/energy-wifi/s4u-energy-wifi.cpp diff --git a/examples/s4u/energy-wifi/s4u-energy-wifi.tesh b/examples/cpp/energy-wifi/s4u-energy-wifi.tesh similarity index 100% rename from examples/s4u/energy-wifi/s4u-energy-wifi.tesh rename to examples/cpp/energy-wifi/s4u-energy-wifi.tesh diff --git a/examples/s4u/engine-filtering/s4u-engine-filtering.cpp b/examples/cpp/engine-filtering/s4u-engine-filtering.cpp similarity index 100% rename from examples/s4u/engine-filtering/s4u-engine-filtering.cpp rename to examples/cpp/engine-filtering/s4u-engine-filtering.cpp diff --git a/examples/s4u/engine-filtering/s4u-engine-filtering.tesh b/examples/cpp/engine-filtering/s4u-engine-filtering.tesh similarity index 100% rename from examples/s4u/engine-filtering/s4u-engine-filtering.tesh rename to examples/cpp/engine-filtering/s4u-engine-filtering.tesh diff --git a/examples/s4u/exec-async/s4u-exec-async.cpp b/examples/cpp/exec-async/s4u-exec-async.cpp similarity index 100% rename from examples/s4u/exec-async/s4u-exec-async.cpp rename to examples/cpp/exec-async/s4u-exec-async.cpp diff --git a/examples/s4u/exec-async/s4u-exec-async.tesh b/examples/cpp/exec-async/s4u-exec-async.tesh similarity index 100% rename from examples/s4u/exec-async/s4u-exec-async.tesh rename to examples/cpp/exec-async/s4u-exec-async.tesh diff --git a/examples/s4u/exec-basic/s4u-exec-basic.cpp b/examples/cpp/exec-basic/s4u-exec-basic.cpp similarity index 100% rename from examples/s4u/exec-basic/s4u-exec-basic.cpp rename to examples/cpp/exec-basic/s4u-exec-basic.cpp diff --git a/examples/s4u/exec-basic/s4u-exec-basic.tesh b/examples/cpp/exec-basic/s4u-exec-basic.tesh similarity index 100% rename from examples/s4u/exec-basic/s4u-exec-basic.tesh rename to examples/cpp/exec-basic/s4u-exec-basic.tesh diff --git a/examples/s4u/exec-dependent/s4u-exec-dependent.cpp b/examples/cpp/exec-dependent/s4u-exec-dependent.cpp similarity index 100% rename from examples/s4u/exec-dependent/s4u-exec-dependent.cpp rename to examples/cpp/exec-dependent/s4u-exec-dependent.cpp diff --git a/examples/s4u/exec-dependent/s4u-exec-dependent.tesh b/examples/cpp/exec-dependent/s4u-exec-dependent.tesh similarity index 100% rename from examples/s4u/exec-dependent/s4u-exec-dependent.tesh rename to examples/cpp/exec-dependent/s4u-exec-dependent.tesh diff --git a/examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp b/examples/cpp/exec-dvfs/s4u-exec-dvfs.cpp similarity index 100% rename from examples/s4u/exec-dvfs/s4u-exec-dvfs.cpp rename to examples/cpp/exec-dvfs/s4u-exec-dvfs.cpp diff --git a/examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh b/examples/cpp/exec-dvfs/s4u-exec-dvfs.tesh similarity index 100% rename from examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh rename to examples/cpp/exec-dvfs/s4u-exec-dvfs.tesh diff --git a/examples/s4u/exec-ptask/s4u-exec-ptask.cpp b/examples/cpp/exec-ptask/s4u-exec-ptask.cpp similarity index 100% rename from examples/s4u/exec-ptask/s4u-exec-ptask.cpp rename to examples/cpp/exec-ptask/s4u-exec-ptask.cpp diff --git a/examples/s4u/exec-ptask/s4u-exec-ptask.tesh b/examples/cpp/exec-ptask/s4u-exec-ptask.tesh similarity index 100% rename from examples/s4u/exec-ptask/s4u-exec-ptask.tesh rename to examples/cpp/exec-ptask/s4u-exec-ptask.tesh diff --git a/examples/s4u/exec-remote/s4u-exec-remote.cpp b/examples/cpp/exec-remote/s4u-exec-remote.cpp similarity index 100% rename from examples/s4u/exec-remote/s4u-exec-remote.cpp rename to examples/cpp/exec-remote/s4u-exec-remote.cpp diff --git a/examples/s4u/exec-remote/s4u-exec-remote.tesh b/examples/cpp/exec-remote/s4u-exec-remote.tesh similarity index 100% rename from examples/s4u/exec-remote/s4u-exec-remote.tesh rename to examples/cpp/exec-remote/s4u-exec-remote.tesh diff --git a/examples/s4u/exec-unassigned/s4u-exec-unassigned.cpp b/examples/cpp/exec-unassigned/s4u-exec-unassigned.cpp similarity index 100% rename from examples/s4u/exec-unassigned/s4u-exec-unassigned.cpp rename to examples/cpp/exec-unassigned/s4u-exec-unassigned.cpp diff --git a/examples/s4u/exec-unassigned/s4u-exec-unassigned.tesh b/examples/cpp/exec-unassigned/s4u-exec-unassigned.tesh similarity index 100% rename from examples/s4u/exec-unassigned/s4u-exec-unassigned.tesh rename to examples/cpp/exec-unassigned/s4u-exec-unassigned.tesh diff --git a/examples/s4u/exec-waitany/s4u-exec-waitany.cpp b/examples/cpp/exec-waitany/s4u-exec-waitany.cpp similarity index 100% rename from examples/s4u/exec-waitany/s4u-exec-waitany.cpp rename to examples/cpp/exec-waitany/s4u-exec-waitany.cpp diff --git a/examples/s4u/exec-waitany/s4u-exec-waitany.tesh b/examples/cpp/exec-waitany/s4u-exec-waitany.tesh similarity index 100% rename from examples/s4u/exec-waitany/s4u-exec-waitany.tesh rename to examples/cpp/exec-waitany/s4u-exec-waitany.tesh diff --git a/examples/s4u/exec-waitfor/s4u-exec-waitfor.cpp b/examples/cpp/exec-waitfor/s4u-exec-waitfor.cpp similarity index 100% rename from examples/s4u/exec-waitfor/s4u-exec-waitfor.cpp rename to examples/cpp/exec-waitfor/s4u-exec-waitfor.cpp diff --git a/examples/s4u/exec-waitfor/s4u-exec-waitfor.tesh b/examples/cpp/exec-waitfor/s4u-exec-waitfor.tesh similarity index 100% rename from examples/s4u/exec-waitfor/s4u-exec-waitfor.tesh rename to examples/cpp/exec-waitfor/s4u-exec-waitfor.tesh diff --git a/examples/s4u/io-async/s4u-io-async.cpp b/examples/cpp/io-async/s4u-io-async.cpp similarity index 100% rename from examples/s4u/io-async/s4u-io-async.cpp rename to examples/cpp/io-async/s4u-io-async.cpp diff --git a/examples/s4u/io-async/s4u-io-async.tesh b/examples/cpp/io-async/s4u-io-async.tesh similarity index 100% rename from examples/s4u/io-async/s4u-io-async.tesh rename to examples/cpp/io-async/s4u-io-async.tesh diff --git a/examples/s4u/io-dependent/s4u-io-dependent.cpp b/examples/cpp/io-dependent/s4u-io-dependent.cpp similarity index 100% rename from examples/s4u/io-dependent/s4u-io-dependent.cpp rename to examples/cpp/io-dependent/s4u-io-dependent.cpp diff --git a/examples/s4u/io-dependent/s4u-io-dependent.tesh b/examples/cpp/io-dependent/s4u-io-dependent.tesh similarity index 100% rename from examples/s4u/io-dependent/s4u-io-dependent.tesh rename to examples/cpp/io-dependent/s4u-io-dependent.tesh diff --git a/examples/s4u/io-disk-raw/s4u-io-disk-raw.cpp b/examples/cpp/io-disk-raw/s4u-io-disk-raw.cpp similarity index 100% rename from examples/s4u/io-disk-raw/s4u-io-disk-raw.cpp rename to examples/cpp/io-disk-raw/s4u-io-disk-raw.cpp diff --git a/examples/s4u/io-disk-raw/s4u-io-disk-raw.tesh b/examples/cpp/io-disk-raw/s4u-io-disk-raw.tesh similarity index 100% rename from examples/s4u/io-disk-raw/s4u-io-disk-raw.tesh rename to examples/cpp/io-disk-raw/s4u-io-disk-raw.tesh diff --git a/examples/s4u/io-file-remote/s4u-io-file-remote.cpp b/examples/cpp/io-file-remote/s4u-io-file-remote.cpp similarity index 100% rename from examples/s4u/io-file-remote/s4u-io-file-remote.cpp rename to examples/cpp/io-file-remote/s4u-io-file-remote.cpp diff --git a/examples/s4u/io-file-remote/s4u-io-file-remote.tesh b/examples/cpp/io-file-remote/s4u-io-file-remote.tesh similarity index 100% rename from examples/s4u/io-file-remote/s4u-io-file-remote.tesh rename to examples/cpp/io-file-remote/s4u-io-file-remote.tesh diff --git a/examples/s4u/io-file-remote/s4u-io-file-remote_d.xml b/examples/cpp/io-file-remote/s4u-io-file-remote_d.xml similarity index 100% rename from examples/s4u/io-file-remote/s4u-io-file-remote_d.xml rename to examples/cpp/io-file-remote/s4u-io-file-remote_d.xml diff --git a/examples/s4u/io-file-system/.gitignore b/examples/cpp/io-file-system/.gitignore similarity index 100% rename from examples/s4u/io-file-system/.gitignore rename to examples/cpp/io-file-system/.gitignore diff --git a/examples/s4u/io-file-system/s4u-io-file-system.cpp b/examples/cpp/io-file-system/s4u-io-file-system.cpp similarity index 100% rename from examples/s4u/io-file-system/s4u-io-file-system.cpp rename to examples/cpp/io-file-system/s4u-io-file-system.cpp diff --git a/examples/s4u/io-file-system/s4u-io-file-system.tesh b/examples/cpp/io-file-system/s4u-io-file-system.tesh similarity index 100% rename from examples/s4u/io-file-system/s4u-io-file-system.tesh rename to examples/cpp/io-file-system/s4u-io-file-system.tesh diff --git a/examples/s4u/maestro-set/s4u-maestro-set.cpp b/examples/cpp/maestro-set/s4u-maestro-set.cpp similarity index 100% rename from examples/s4u/maestro-set/s4u-maestro-set.cpp rename to examples/cpp/maestro-set/s4u-maestro-set.cpp diff --git a/examples/s4u/maestro-set/s4u-maestro-set.tesh b/examples/cpp/maestro-set/s4u-maestro-set.tesh similarity index 100% rename from examples/s4u/maestro-set/s4u-maestro-set.tesh rename to examples/cpp/maestro-set/s4u-maestro-set.tesh diff --git a/examples/s4u/mc-bugged1-liveness/promela_bugged1_liveness b/examples/cpp/mc-bugged1-liveness/promela_bugged1_liveness similarity index 100% rename from examples/s4u/mc-bugged1-liveness/promela_bugged1_liveness rename to examples/cpp/mc-bugged1-liveness/promela_bugged1_liveness diff --git a/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner b/examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner similarity index 100% rename from examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner rename to examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner diff --git a/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh b/examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh similarity index 100% rename from examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh rename to examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh diff --git a/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp b/examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp similarity index 100% rename from examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp rename to examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp diff --git a/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.tesh b/examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness.tesh similarity index 100% rename from examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.tesh rename to examples/cpp/mc-bugged1-liveness/s4u-mc-bugged1-liveness.tesh diff --git a/examples/s4u/mc-bugged1/s4u-mc-bugged1.cpp b/examples/cpp/mc-bugged1/s4u-mc-bugged1.cpp similarity index 100% rename from examples/s4u/mc-bugged1/s4u-mc-bugged1.cpp rename to examples/cpp/mc-bugged1/s4u-mc-bugged1.cpp diff --git a/examples/s4u/mc-bugged1/s4u-mc-bugged1.tesh b/examples/cpp/mc-bugged1/s4u-mc-bugged1.tesh similarity index 100% rename from examples/s4u/mc-bugged1/s4u-mc-bugged1.tesh rename to examples/cpp/mc-bugged1/s4u-mc-bugged1.tesh diff --git a/examples/s4u/mc-bugged2/s4u-mc-bugged2.cpp b/examples/cpp/mc-bugged2/s4u-mc-bugged2.cpp similarity index 100% rename from examples/s4u/mc-bugged2/s4u-mc-bugged2.cpp rename to examples/cpp/mc-bugged2/s4u-mc-bugged2.cpp diff --git a/examples/s4u/mc-bugged2/s4u-mc-bugged2.tesh b/examples/cpp/mc-bugged2/s4u-mc-bugged2.tesh similarity index 100% rename from examples/s4u/mc-bugged2/s4u-mc-bugged2.tesh rename to examples/cpp/mc-bugged2/s4u-mc-bugged2.tesh diff --git a/examples/s4u/mc-electric-fence/s4u-mc-electric-fence.cpp b/examples/cpp/mc-electric-fence/s4u-mc-electric-fence.cpp similarity index 100% rename from examples/s4u/mc-electric-fence/s4u-mc-electric-fence.cpp rename to examples/cpp/mc-electric-fence/s4u-mc-electric-fence.cpp diff --git a/examples/s4u/mc-electric-fence/s4u-mc-electric-fence.tesh b/examples/cpp/mc-electric-fence/s4u-mc-electric-fence.tesh similarity index 100% rename from examples/s4u/mc-electric-fence/s4u-mc-electric-fence.tesh rename to examples/cpp/mc-electric-fence/s4u-mc-electric-fence.tesh diff --git a/examples/s4u/mc-failing-assert/s4u-mc-failing-assert.cpp b/examples/cpp/mc-failing-assert/s4u-mc-failing-assert.cpp similarity index 100% rename from examples/s4u/mc-failing-assert/s4u-mc-failing-assert.cpp rename to examples/cpp/mc-failing-assert/s4u-mc-failing-assert.cpp diff --git a/examples/s4u/mc-failing-assert/s4u-mc-failing-assert.tesh b/examples/cpp/mc-failing-assert/s4u-mc-failing-assert.tesh similarity index 100% rename from examples/s4u/mc-failing-assert/s4u-mc-failing-assert.tesh rename to examples/cpp/mc-failing-assert/s4u-mc-failing-assert.tesh diff --git a/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.cpp b/examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi.cpp similarity index 100% rename from examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.cpp rename to examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi.cpp diff --git a/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.tesh b/examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi.tesh similarity index 100% rename from examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.tesh rename to examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi.tesh diff --git a/examples/s4u/network-ns3/3hosts_2links_d.xml b/examples/cpp/network-ns3/3hosts_2links_d.xml similarity index 100% rename from examples/s4u/network-ns3/3hosts_2links_d.xml rename to examples/cpp/network-ns3/3hosts_2links_d.xml diff --git a/examples/s4u/network-ns3/3links-timer_d.xml b/examples/cpp/network-ns3/3links-timer_d.xml similarity index 100% rename from examples/s4u/network-ns3/3links-timer_d.xml rename to examples/cpp/network-ns3/3links-timer_d.xml diff --git a/examples/s4u/network-ns3/3links_d.xml b/examples/cpp/network-ns3/3links_d.xml similarity index 100% rename from examples/s4u/network-ns3/3links_d.xml rename to examples/cpp/network-ns3/3links_d.xml diff --git a/examples/s4u/network-ns3/crosstraffic_d.xml b/examples/cpp/network-ns3/crosstraffic_d.xml similarity index 100% rename from examples/s4u/network-ns3/crosstraffic_d.xml rename to examples/cpp/network-ns3/crosstraffic_d.xml diff --git a/examples/s4u/network-ns3/dogbone_d.xml b/examples/cpp/network-ns3/dogbone_d.xml similarity index 100% rename from examples/s4u/network-ns3/dogbone_d.xml rename to examples/cpp/network-ns3/dogbone_d.xml diff --git a/examples/s4u/network-ns3/one_cluster_d.xml b/examples/cpp/network-ns3/one_cluster_d.xml similarity index 100% rename from examples/s4u/network-ns3/one_cluster_d.xml rename to examples/cpp/network-ns3/one_cluster_d.xml diff --git a/examples/s4u/network-ns3/onelink_d.xml b/examples/cpp/network-ns3/onelink_d.xml similarity index 100% rename from examples/s4u/network-ns3/onelink_d.xml rename to examples/cpp/network-ns3/onelink_d.xml diff --git a/examples/s4u/network-ns3/s4u-network-ns3.cpp b/examples/cpp/network-ns3/s4u-network-ns3.cpp similarity index 100% rename from examples/s4u/network-ns3/s4u-network-ns3.cpp rename to examples/cpp/network-ns3/s4u-network-ns3.cpp diff --git a/examples/s4u/network-ns3/s4u-network-ns3.tesh b/examples/cpp/network-ns3/s4u-network-ns3.tesh similarity index 100% rename from examples/s4u/network-ns3/s4u-network-ns3.tesh rename to examples/cpp/network-ns3/s4u-network-ns3.tesh diff --git a/examples/s4u/network-wifi/s4u-network-wifi.cpp b/examples/cpp/network-wifi/s4u-network-wifi.cpp similarity index 100% rename from examples/s4u/network-wifi/s4u-network-wifi.cpp rename to examples/cpp/network-wifi/s4u-network-wifi.cpp diff --git a/examples/s4u/network-wifi/s4u-network-wifi.tesh b/examples/cpp/network-wifi/s4u-network-wifi.tesh similarity index 100% rename from examples/s4u/network-wifi/s4u-network-wifi.tesh rename to examples/cpp/network-wifi/s4u-network-wifi.tesh diff --git a/examples/s4u/platform-failures/s4u-platform-failures.cpp b/examples/cpp/platform-failures/s4u-platform-failures.cpp similarity index 100% rename from examples/s4u/platform-failures/s4u-platform-failures.cpp rename to examples/cpp/platform-failures/s4u-platform-failures.cpp diff --git a/examples/s4u/platform-failures/s4u-platform-failures.tesh b/examples/cpp/platform-failures/s4u-platform-failures.tesh similarity index 100% rename from examples/s4u/platform-failures/s4u-platform-failures.tesh rename to examples/cpp/platform-failures/s4u-platform-failures.tesh diff --git a/examples/s4u/platform-failures/s4u-platform-failures_d.xml b/examples/cpp/platform-failures/s4u-platform-failures_d.xml similarity index 100% rename from examples/s4u/platform-failures/s4u-platform-failures_d.xml rename to examples/cpp/platform-failures/s4u-platform-failures_d.xml diff --git a/examples/s4u/platform-profile/s4u-platform-profile.cpp b/examples/cpp/platform-profile/s4u-platform-profile.cpp similarity index 100% rename from examples/s4u/platform-profile/s4u-platform-profile.cpp rename to examples/cpp/platform-profile/s4u-platform-profile.cpp diff --git a/examples/s4u/platform-profile/s4u-platform-profile.tesh b/examples/cpp/platform-profile/s4u-platform-profile.tesh similarity index 100% rename from examples/s4u/platform-profile/s4u-platform-profile.tesh rename to examples/cpp/platform-profile/s4u-platform-profile.tesh diff --git a/examples/s4u/platform-properties/s4u-platform-properties.cpp b/examples/cpp/platform-properties/s4u-platform-properties.cpp similarity index 100% rename from examples/s4u/platform-properties/s4u-platform-properties.cpp rename to examples/cpp/platform-properties/s4u-platform-properties.cpp diff --git a/examples/s4u/platform-properties/s4u-platform-properties.tesh b/examples/cpp/platform-properties/s4u-platform-properties.tesh similarity index 100% rename from examples/s4u/platform-properties/s4u-platform-properties.tesh rename to examples/cpp/platform-properties/s4u-platform-properties.tesh diff --git a/examples/s4u/platform-properties/s4u-platform-properties_d.xml b/examples/cpp/platform-properties/s4u-platform-properties_d.xml similarity index 100% rename from examples/s4u/platform-properties/s4u-platform-properties_d.xml rename to examples/cpp/platform-properties/s4u-platform-properties_d.xml diff --git a/examples/s4u/plugin-host-load/s4u-plugin-host-load.cpp b/examples/cpp/plugin-host-load/s4u-plugin-host-load.cpp similarity index 100% rename from examples/s4u/plugin-host-load/s4u-plugin-host-load.cpp rename to examples/cpp/plugin-host-load/s4u-plugin-host-load.cpp diff --git a/examples/s4u/plugin-host-load/s4u-plugin-host-load.tesh b/examples/cpp/plugin-host-load/s4u-plugin-host-load.tesh similarity index 100% rename from examples/s4u/plugin-host-load/s4u-plugin-host-load.tesh rename to examples/cpp/plugin-host-load/s4u-plugin-host-load.tesh diff --git a/examples/s4u/plugin-link-load/s4u-plugin-link-load.cpp b/examples/cpp/plugin-link-load/s4u-plugin-link-load.cpp similarity index 100% rename from examples/s4u/plugin-link-load/s4u-plugin-link-load.cpp rename to examples/cpp/plugin-link-load/s4u-plugin-link-load.cpp diff --git a/examples/s4u/plugin-link-load/s4u-plugin-link-load.tesh b/examples/cpp/plugin-link-load/s4u-plugin-link-load.tesh similarity index 100% rename from examples/s4u/plugin-link-load/s4u-plugin-link-load.tesh rename to examples/cpp/plugin-link-load/s4u-plugin-link-load.tesh diff --git a/examples/s4u/replay-comm/s4u-replay-comm-split-p0.txt b/examples/cpp/replay-comm/s4u-replay-comm-split-p0.txt similarity index 100% rename from examples/s4u/replay-comm/s4u-replay-comm-split-p0.txt rename to examples/cpp/replay-comm/s4u-replay-comm-split-p0.txt diff --git a/examples/s4u/replay-comm/s4u-replay-comm-split-p1.txt b/examples/cpp/replay-comm/s4u-replay-comm-split-p1.txt similarity index 100% rename from examples/s4u/replay-comm/s4u-replay-comm-split-p1.txt rename to examples/cpp/replay-comm/s4u-replay-comm-split-p1.txt diff --git a/examples/s4u/replay-comm/s4u-replay-comm-split_d.xml b/examples/cpp/replay-comm/s4u-replay-comm-split_d.xml similarity index 100% rename from examples/s4u/replay-comm/s4u-replay-comm-split_d.xml rename to examples/cpp/replay-comm/s4u-replay-comm-split_d.xml diff --git a/examples/s4u/replay-comm/s4u-replay-comm.cpp b/examples/cpp/replay-comm/s4u-replay-comm.cpp similarity index 100% rename from examples/s4u/replay-comm/s4u-replay-comm.cpp rename to examples/cpp/replay-comm/s4u-replay-comm.cpp diff --git a/examples/s4u/replay-comm/s4u-replay-comm.tesh b/examples/cpp/replay-comm/s4u-replay-comm.tesh similarity index 100% rename from examples/s4u/replay-comm/s4u-replay-comm.tesh rename to examples/cpp/replay-comm/s4u-replay-comm.tesh diff --git a/examples/s4u/replay-comm/s4u-replay-comm.txt b/examples/cpp/replay-comm/s4u-replay-comm.txt similarity index 100% rename from examples/s4u/replay-comm/s4u-replay-comm.txt rename to examples/cpp/replay-comm/s4u-replay-comm.txt diff --git a/examples/s4u/replay-comm/s4u-replay-comm_d.xml b/examples/cpp/replay-comm/s4u-replay-comm_d.xml similarity index 100% rename from examples/s4u/replay-comm/s4u-replay-comm_d.xml rename to examples/cpp/replay-comm/s4u-replay-comm_d.xml diff --git a/examples/s4u/replay-io/s4u-replay-io.cpp b/examples/cpp/replay-io/s4u-replay-io.cpp similarity index 100% rename from examples/s4u/replay-io/s4u-replay-io.cpp rename to examples/cpp/replay-io/s4u-replay-io.cpp diff --git a/examples/s4u/replay-io/s4u-replay-io.tesh b/examples/cpp/replay-io/s4u-replay-io.tesh similarity index 100% rename from examples/s4u/replay-io/s4u-replay-io.tesh rename to examples/cpp/replay-io/s4u-replay-io.tesh diff --git a/examples/s4u/replay-io/s4u-replay-io.txt b/examples/cpp/replay-io/s4u-replay-io.txt similarity index 100% rename from examples/s4u/replay-io/s4u-replay-io.txt rename to examples/cpp/replay-io/s4u-replay-io.txt diff --git a/examples/s4u/replay-io/s4u-replay-io_d.xml b/examples/cpp/replay-io/s4u-replay-io_d.xml similarity index 100% rename from examples/s4u/replay-io/s4u-replay-io_d.xml rename to examples/cpp/replay-io/s4u-replay-io_d.xml diff --git a/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.cpp b/examples/cpp/routing-get-clusters/s4u-routing-get-clusters.cpp similarity index 100% rename from examples/s4u/routing-get-clusters/s4u-routing-get-clusters.cpp rename to examples/cpp/routing-get-clusters/s4u-routing-get-clusters.cpp diff --git a/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh b/examples/cpp/routing-get-clusters/s4u-routing-get-clusters.tesh similarity index 100% rename from examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh rename to examples/cpp/routing-get-clusters/s4u-routing-get-clusters.tesh diff --git a/examples/s4u/synchro-barrier/s4u-synchro-barrier.cpp b/examples/cpp/synchro-barrier/s4u-synchro-barrier.cpp similarity index 100% rename from examples/s4u/synchro-barrier/s4u-synchro-barrier.cpp rename to examples/cpp/synchro-barrier/s4u-synchro-barrier.cpp diff --git a/examples/s4u/synchro-barrier/s4u-synchro-barrier.tesh b/examples/cpp/synchro-barrier/s4u-synchro-barrier.tesh similarity index 100% rename from examples/s4u/synchro-barrier/s4u-synchro-barrier.tesh rename to examples/cpp/synchro-barrier/s4u-synchro-barrier.tesh diff --git a/examples/s4u/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.cpp b/examples/cpp/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.cpp similarity index 100% rename from examples/s4u/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.cpp rename to examples/cpp/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.cpp diff --git a/examples/s4u/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.tesh b/examples/cpp/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.tesh similarity index 100% rename from examples/s4u/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.tesh rename to examples/cpp/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.tesh diff --git a/examples/s4u/synchro-condition-variable/s4u-synchro-condition-variable.cpp b/examples/cpp/synchro-condition-variable/s4u-synchro-condition-variable.cpp similarity index 100% rename from examples/s4u/synchro-condition-variable/s4u-synchro-condition-variable.cpp rename to examples/cpp/synchro-condition-variable/s4u-synchro-condition-variable.cpp diff --git a/examples/s4u/synchro-condition-variable/s4u-synchro-condition-variable.tesh b/examples/cpp/synchro-condition-variable/s4u-synchro-condition-variable.tesh similarity index 100% rename from examples/s4u/synchro-condition-variable/s4u-synchro-condition-variable.tesh rename to examples/cpp/synchro-condition-variable/s4u-synchro-condition-variable.tesh diff --git a/examples/s4u/synchro-mutex/.gitignore b/examples/cpp/synchro-mutex/.gitignore similarity index 100% rename from examples/s4u/synchro-mutex/.gitignore rename to examples/cpp/synchro-mutex/.gitignore diff --git a/examples/s4u/synchro-mutex/s4u-synchro-mutex.cpp b/examples/cpp/synchro-mutex/s4u-synchro-mutex.cpp similarity index 100% rename from examples/s4u/synchro-mutex/s4u-synchro-mutex.cpp rename to examples/cpp/synchro-mutex/s4u-synchro-mutex.cpp diff --git a/examples/s4u/synchro-mutex/s4u-synchro-mutex.tesh b/examples/cpp/synchro-mutex/s4u-synchro-mutex.tesh similarity index 100% rename from examples/s4u/synchro-mutex/s4u-synchro-mutex.tesh rename to examples/cpp/synchro-mutex/s4u-synchro-mutex.tesh diff --git a/examples/s4u/synchro-semaphore/s4u-synchro-semaphore.cpp b/examples/cpp/synchro-semaphore/s4u-synchro-semaphore.cpp similarity index 100% rename from examples/s4u/synchro-semaphore/s4u-synchro-semaphore.cpp rename to examples/cpp/synchro-semaphore/s4u-synchro-semaphore.cpp diff --git a/examples/s4u/synchro-semaphore/s4u-synchro-semaphore.tesh b/examples/cpp/synchro-semaphore/s4u-synchro-semaphore.tesh similarity index 100% rename from examples/s4u/synchro-semaphore/s4u-synchro-semaphore.tesh rename to examples/cpp/synchro-semaphore/s4u-synchro-semaphore.tesh diff --git a/examples/s4u/trace-categories/s4u-trace-categories.cpp b/examples/cpp/trace-categories/s4u-trace-categories.cpp similarity index 100% rename from examples/s4u/trace-categories/s4u-trace-categories.cpp rename to examples/cpp/trace-categories/s4u-trace-categories.cpp diff --git a/examples/s4u/trace-categories/s4u-trace-categories.tesh b/examples/cpp/trace-categories/s4u-trace-categories.tesh similarity index 100% rename from examples/s4u/trace-categories/s4u-trace-categories.tesh rename to examples/cpp/trace-categories/s4u-trace-categories.tesh diff --git a/examples/s4u/trace-host-user-variables/s4u-trace-host-user-variables.cpp b/examples/cpp/trace-host-user-variables/s4u-trace-host-user-variables.cpp similarity index 100% rename from examples/s4u/trace-host-user-variables/s4u-trace-host-user-variables.cpp rename to examples/cpp/trace-host-user-variables/s4u-trace-host-user-variables.cpp diff --git a/examples/s4u/trace-host-user-variables/s4u-trace-host-user-variables.tesh b/examples/cpp/trace-host-user-variables/s4u-trace-host-user-variables.tesh similarity index 100% rename from examples/s4u/trace-host-user-variables/s4u-trace-host-user-variables.tesh rename to examples/cpp/trace-host-user-variables/s4u-trace-host-user-variables.tesh diff --git a/examples/s4u/trace-link-user-variables/s4u-trace-link-user-variables.cpp b/examples/cpp/trace-link-user-variables/s4u-trace-link-user-variables.cpp similarity index 100% rename from examples/s4u/trace-link-user-variables/s4u-trace-link-user-variables.cpp rename to examples/cpp/trace-link-user-variables/s4u-trace-link-user-variables.cpp diff --git a/examples/s4u/trace-link-user-variables/s4u-trace-link-user-variables.tesh b/examples/cpp/trace-link-user-variables/s4u-trace-link-user-variables.tesh similarity index 100% rename from examples/s4u/trace-link-user-variables/s4u-trace-link-user-variables.tesh rename to examples/cpp/trace-link-user-variables/s4u-trace-link-user-variables.tesh diff --git a/examples/s4u/trace-masterworkers/s4u-trace-masterworkers.cpp b/examples/cpp/trace-masterworkers/s4u-trace-masterworkers.cpp similarity index 100% rename from examples/s4u/trace-masterworkers/s4u-trace-masterworkers.cpp rename to examples/cpp/trace-masterworkers/s4u-trace-masterworkers.cpp diff --git a/examples/s4u/trace-masterworkers/s4u-trace-masterworkers.tesh b/examples/cpp/trace-masterworkers/s4u-trace-masterworkers.tesh similarity index 100% rename from examples/s4u/trace-masterworkers/s4u-trace-masterworkers.tesh rename to examples/cpp/trace-masterworkers/s4u-trace-masterworkers.tesh diff --git a/examples/s4u/trace-platform/s4u-trace-platform.cpp b/examples/cpp/trace-platform/s4u-trace-platform.cpp similarity index 100% rename from examples/s4u/trace-platform/s4u-trace-platform.cpp rename to examples/cpp/trace-platform/s4u-trace-platform.cpp diff --git a/examples/s4u/trace-platform/s4u-trace-platform.tesh b/examples/cpp/trace-platform/s4u-trace-platform.tesh similarity index 100% rename from examples/s4u/trace-platform/s4u-trace-platform.tesh rename to examples/cpp/trace-platform/s4u-trace-platform.tesh diff --git a/examples/s4u/trace-process-migration/s4u-trace-process-migration.cpp b/examples/cpp/trace-process-migration/s4u-trace-process-migration.cpp similarity index 100% rename from examples/s4u/trace-process-migration/s4u-trace-process-migration.cpp rename to examples/cpp/trace-process-migration/s4u-trace-process-migration.cpp diff --git a/examples/s4u/trace-process-migration/s4u-trace-process-migration.tesh b/examples/cpp/trace-process-migration/s4u-trace-process-migration.tesh similarity index 100% rename from examples/s4u/trace-process-migration/s4u-trace-process-migration.tesh rename to examples/cpp/trace-process-migration/s4u-trace-process-migration.tesh diff --git a/examples/s4u/trace-route-user-variables/s4u-trace-route-user-variables.cpp b/examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables.cpp similarity index 100% rename from examples/s4u/trace-route-user-variables/s4u-trace-route-user-variables.cpp rename to examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables.cpp diff --git a/examples/s4u/trace-route-user-variables/s4u-trace-route-user-variables.tesh b/examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables.tesh similarity index 100% rename from examples/s4u/trace-route-user-variables/s4u-trace-route-user-variables.tesh rename to examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables.tesh diff --git a/examples/python/actor-yield/actor-yield.tesh b/examples/python/actor-yield/actor-yield.tesh index 68f020f2d4..7348d31b91 100644 --- a/examples/python/actor-yield/actor-yield.tesh +++ b/examples/python/actor-yield/actor-yield.tesh @@ -1,5 +1,5 @@ #!/usr/bin/env tesh -$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/actor-yield.py ${platfdir}/small_platform_fatpipe.xml ${srcdir:=.}/../../s4u/actor-yield/s4u-actor-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" +$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/actor-yield.py ${platfdir}/small_platform_fatpipe.xml ${srcdir:=.}/../../cpp/actor-yield/s4u-actor-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%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/include/simgrid/engine.h b/include/simgrid/engine.h index 2e7f1d8742..1ffbe2771a 100644 --- a/include/simgrid/engine.h +++ b/include/simgrid/engine.h @@ -36,7 +36,7 @@ XBT_PUBLIC void simgrid_register_function(const char* name, void (*code)(int, ch /** Registers a function as the default main function of actors * * It will be used as fallback when the function requested from the deployment file was not registered. - * It is used for trace-based simulations (see examples/s4u/replay-comms and similar). + * It is used for trace-based simulations (see examples/cpp/replay-comms and similar). */ XBT_PUBLIC void simgrid_register_default(void (*code)(int, char**)); /** Retrieve the simulation time (in seconds) */ diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp index 3b3502115e..cbbeddc6f3 100644 --- a/include/simgrid/s4u/Actor.hpp +++ b/include/simgrid/s4u/Actor.hpp @@ -262,7 +262,7 @@ XBT_PUBLIC void execute(double flop); XBT_PUBLIC void execute(double flop, double priority); /** - * @example examples/s4u/exec-ptask/s4u-exec-ptask.cpp + * @example examples/cpp/exec-ptask/s4u-exec-ptask.cpp */ /** Block the current actor until the built parallel execution terminates @@ -270,8 +270,8 @@ XBT_PUBLIC void execute(double flop, double priority); * \rst * .. _API_s4u_parallel_execute: * - * **Example of use:** `examples/s4u/exec-ptask/s4u-exec-ptask.cpp - * `_ + * **Example of use:** `examples/cpp/exec-ptask/s4u-exec-ptask.cpp + * `_ * * Parallel executions convenient abstractions of parallel computational kernels that span over several machines, * such as a PDGEM and the other ScaLAPACK routines. If you are interested in the effects of such parallel kernel diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index c140382196..0cfdc0754f 100644 --- a/src/s4u/s4u_Engine.cpp +++ b/src/s4u/s4u_Engine.cpp @@ -121,7 +121,7 @@ void Engine::register_function(const std::string& name, const std::function& code) { diff --git a/teshsuite/lua/lua_platforms.tesh b/teshsuite/lua/lua_platforms.tesh index 94fa230343..2feaa49852 100644 --- a/teshsuite/lua/lua_platforms.tesh +++ b/teshsuite/lua/lua_platforms.tesh @@ -1,4 +1,4 @@ -$ ${bindir:=.}/examples/s4u/app-masterworkers/s4u-app-masterworkers-fun ${srcdir:=.}/examples/platforms/small_platform.lua ${srcdir:=.}/examples/s4u/app-masterworkers/s4u-app-masterworkers_d.xml +$ ${bindir:=.}/examples/cpp/app-masterworkers/s4u-app-masterworkers-fun ${srcdir:=.}/examples/platforms/small_platform.lua ${srcdir:=.}/examples/cpp/app-masterworkers/s4u-app-masterworkers_d.xml > [Tremblay:master:(1) 0.000000] [s4u_app_masterworker/INFO] Got 5 workers and 20 tasks to process > [Tremblay:master:(1) 0.000000] [s4u_app_masterworker/INFO] Sending task 0 of 20 to mailbox 'Tremblay' > [Tremblay:master:(1) 0.002265] [s4u_app_masterworker/INFO] Sending task 1 of 20 to mailbox 'Jupiter' @@ -28,7 +28,7 @@ $ ${bindir:=.}/examples/s4u/app-masterworkers/s4u-app-masterworkers-fun ${srcdir > [Bourassa:worker:(6) 5.133855] [s4u_app_masterworker/INFO] Exiting now. > [5.133855] [s4u_app_masterworker/INFO] Simulation is over -$ ${bindir:=.}/examples/s4u/app-token-ring/s4u-app-token-ring ${srcdir:=.}/examples/platforms/routing_cluster.lua "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" +$ ${bindir:=.}/examples/cpp/app-token-ring/s4u-app-token-ring ${srcdir:=.}/examples/platforms/routing_cluster.lua "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Number of hosts '6' > [ 0.000000] (1:0@host1) Host "0" send 'Token' to Host "1" > [ 0.017354] (2:1@host2) Host "1" received "Token" diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 4bba946fda..d9e4f779dd 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -1005,7 +1005,7 @@ set(txt_files # Add your CMakeLists file here to see your subdir built. set(CMAKEFILES_TXT examples/c/CMakeLists.txt - examples/s4u/CMakeLists.txt + examples/cpp/CMakeLists.txt examples/smpi/CMakeLists.txt examples/smpi/NAS/CMakeLists.txt examples/smpi/smpi_s4u_masterworker/CMakeLists.txt