From: Martin Quinson Date: Tue, 15 Jan 2019 11:58:06 +0000 (+0100) Subject: Move MSG and SimDag examples out of the sight of users X-Git-Tag: v3_22~559 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1ff90bc7103df77877d6860f1f117425afe1a516 Move MSG and SimDag examples out of the sight of users --- diff --git a/.gitignore b/.gitignore index 14b64d5683..2e2b9e65e4 100644 --- a/.gitignore +++ b/.gitignore @@ -31,11 +31,10 @@ CTestResults.xml src/simdag/dax_dtd.l src/surf/xml/simgrid_dtd.l ### Jedule -examples/simdag/scheduling/sd_scheduling.jed +examples/deprecated/simdag/scheduling/sd_scheduling.jed teshsuite/simdag/platforms/simgrid.jed ### Libraries links examples/lua/simgrid.so -examples/simdag/simgrid.so examples/lua/console/simgrid.so SimGrid-*.tar.gz simgrid.jar @@ -118,33 +117,33 @@ tags callgrind.out.* ### Examples and traces *.exe -examples/msg/app-masterworker/app-masterworker -examples/msg/cloud-masterworker/cloud-masterworker -examples/msg/dht-kademlia/dht-kademlia -examples/msg/dht-pastry/dht-pastry -examples/msg/energy-vm/energy-vm -examples/msg/maestro-set/maestro-set -examples/msg/mc/bugged1 -examples/msg/mc/bugged1_liveness -examples/msg/mc/bugged2 -examples/msg/mc/bugged2_liveness -examples/msg/mc/bugged3 -examples/msg/mc/centralized_mutex -examples/msg/mc/electric_fence -examples/msg/network-ns3/network-ns3 -examples/msg/platform-failures/platform-failures -examples/msg/process-create/process-create -examples/msg/procmig.trace -examples/msg/simulation.trace -examples/msg/synchro-semaphore/synchro-semaphore -examples/msg/trace-categories/trace-categories -examples/msg/trace-host-user-variables/trace-host-user-variables -examples/msg/trace-link-user-variables/trace-link-user-variables -examples/msg/trace-masterworker/trace-masterworker -examples/msg/trace-process-migration/trace-process-migration -examples/msg/trace-route-user-variables/trace-route-user-variables -examples/msg/*.pcap -examples/msg/*.tr +examples/deprecated/msg/app-masterworker/app-masterworker +examples/deprecated/msg/cloud-masterworker/cloud-masterworker +examples/deprecated/msg/dht-kademlia/dht-kademlia +examples/deprecated/msg/dht-pastry/dht-pastry +examples/deprecated/msg/energy-vm/energy-vm +examples/deprecated/msg/maestro-set/maestro-set +examples/deprecated/msg/mc/bugged1 +examples/deprecated/msg/mc/bugged1_liveness +examples/deprecated/msg/mc/bugged2 +examples/deprecated/msg/mc/bugged2_liveness +examples/deprecated/msg/mc/bugged3 +examples/deprecated/msg/mc/centralized_mutex +examples/deprecated/msg/mc/electric_fence +examples/deprecated/msg/network-ns3/network-ns3 +examples/deprecated/msg/platform-failures/platform-failures +examples/deprecated/msg/process-create/process-create +examples/deprecated/msg/procmig.trace +examples/deprecated/msg/simulation.trace +examples/deprecated/msg/synchro-semaphore/synchro-semaphore +examples/deprecated/msg/trace-categories/trace-categories +examples/deprecated/msg/trace-host-user-variables/trace-host-user-variables +examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables +examples/deprecated/msg/trace-masterworker/trace-masterworker +examples/deprecated/msg/trace-process-migration/trace-process-migration +examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables +examples/deprecated/msg/*.pcap +examples/deprecated/msg/*.tr examples/s4u/actor-create/s4u-actor-create examples/s4u/actor-daemon/s4u-actor-daemon examples/s4u/actor-join/s4u-actor-join @@ -194,17 +193,17 @@ examples/s4u/synchro-barrier/s4u-synchro-barrier examples/s4u/synchro-mutex/s4u-synchro-mutex examples/s4u/synchro-semaphore/s4u-synchro-semaphore examples/s4u/trace-platform/s4u-trace-platform -examples/simdag/dag-dotload/sd_dag-dotload -examples/simdag/daxload/sd_daxload -examples/simdag/fail/sd_fail -examples/simdag/goal/goal_test -examples/simdag/properties/sd_properties -examples/simdag/ptg-dotload/sd_ptg-dotload -examples/simdag/schedule-dotload/sd_schedule-dotload -examples/simdag/scheduling/sd_scheduling -examples/simdag/test/sd_test -examples/simdag/throttling/sd_throttling -examples/simdag/typed_tasks/sd_typed_tasks +examples/deprecated/simdag/dag-dotload/sd_dag-dotload +examples/deprecated/simdag/daxload/sd_daxload +examples/deprecated/simdag/fail/sd_fail +examples/deprecated/simdag/goal/goal_test +examples/deprecated/simdag/properties/sd_properties +examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload +examples/deprecated/simdag/schedule-dotload/sd_schedule-dotload +examples/deprecated/simdag/scheduling/sd_scheduling +examples/deprecated/simdag/test/sd_test +examples/deprecated/simdag/throttling/sd_throttling +examples/deprecated/simdag/typed_tasks/sd_typed_tasks examples/smpi/ampi/smpi_ampi examples/smpi/energy/f77/sef examples/smpi/energy/f90/sef90 diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index e9de18f804..0a43e360ed 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -686,7 +686,7 @@ INPUT = @CMAKE_HOME_DIRECTORY@/doc/doxygen/index.doc \ @CMAKE_BINARY_DIR@/doc/doxygen/logcategories.doc \ @CMAKE_HOME_DIRECTORY@/include/ \ @CMAKE_HOME_DIRECTORY@/src/plugins/ \ - @CMAKE_HOME_DIRECTORY@/examples/msg/README.doc \ + @CMAKE_HOME_DIRECTORY@/examples/deprecated/msg/README.doc \ @CMAKE_HOME_DIRECTORY@/examples/s4u/README.doc diff --git a/doc/doxygen/FAQ.doc b/doc/doxygen/FAQ.doc index 6682d8d2f4..c8b98fffbf 100644 --- a/doc/doxygen/FAQ.doc +++ b/doc/doxygen/FAQ.doc @@ -359,7 +359,7 @@ subtasks. @subsubsection faq_platform_example Where can I find SimGrid platform files? -There are several little examples in the archive, in the examples/msg +There are several little examples in the archive, in the examples/platforms directory. From time to time, we are asked for other files, but we don't have much at hand right now. diff --git a/doc/doxygen/inside_cmake.doc b/doc/doxygen/inside_cmake.doc index ffb7d5c4f2..6f31b641cb 100644 --- a/doc/doxygen/inside_cmake.doc +++ b/doc/doxygen/inside_cmake.doc @@ -61,18 +61,18 @@ upon them by error. To add a new example, the first thing is to find the right place to add it. The examples/ directory is organized as follows: - - examples/java/ for examples using the Java bindings to the MSG API. This directory contains packages (app, async, + - examples/deprecated/java/ for examples using the Java bindings to the MSG API. This directory contains packages (app, async, cloud, ...) which in turn contain individual examples. If your new example fits in an existing package, add it here, or create a new package otherwise. - - examples/msg/ for examples using the MSG API. Here the naming convention is package-example (e.g., app-masterworker). + - examples/deprecated/msg/ for examples using the MSG API. Here the naming convention is package-example (e.g., app-masterworker). Again, please try to fit to an existing package before creating a new one. - examples/platforms/ only contains platforms descriptions in the XML format (see @ref platform for details) - examples/s4u/ for examples using the emerging S4U API - - examples/simdag/ for examples using the SimDag API + - examples/deprecated/simdag/ for examples using the SimDag API - examples/smpi/ or examples using the SMPI API In each of these directories, there is a CMakeLists.txt file that has to be edited to include the new examples. For -instance, examples/msg/CMakeLists.txt starts with a loop over all the (currently) existing tests in which we +instance, examples/deprecated/msg/CMakeLists.txt starts with a loop over all the (currently) existing tests in which we - compile and link the source file (which has to be named as the directory - add the source and tesh files to the distribution. @@ -123,7 +123,7 @@ foreach(x app-bittorrent app-chainsend app-masterworker app-pingpong app-token-r async-wait async-waitall async-waitany cloud-capping cloud-masterworker cloud-migration cloud-simple cloud-two-tasks dht-chord dht-kademlia platform-failures io-file io-remote io-storage task-priority process-kill process-migration process-suspend platform-properties synchro-semaphore process-startkilltime) - ADD_TESH_FACTORIES(msg-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/${x} ${x}.tesh) + ADD_TESH_FACTORIES(msg-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/deprecated/msg/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/${x} ${x}.tesh) endforeach() @endverbatim diff --git a/doc/doxygen/inside_tests.doc b/doc/doxygen/inside_tests.doc index 9d6d324eee..3c54491b9e 100644 --- a/doc/doxygen/inside_tests.doc +++ b/doc/doxygen/inside_tests.doc @@ -227,7 +227,7 @@ ADD_TEST(my-test-name ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/my-test/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/my-test/ --cd ${CMAKE_HOME_DIRECTORY}/examples/my-test/ - ${CMAKE_HOME_DIRECTORY}/examples/msg/io/io.tesh + ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/io/io.tesh ) @endverbatim diff --git a/doc/doxygen/ns3.doc b/doc/doxygen/ns3.doc index 5851f536ce..b1763a7147 100644 --- a/doc/doxygen/ns3.doc +++ b/doc/doxygen/ns3.doc @@ -115,7 +115,7 @@ configuration option to "NS3" as follows. The rest remains unchanged. Many other files from the examples/platform directory are usable with the ns-3 model, such as @ref examples/platforms/dogbone.xml. Check the file -examples/msg/network-ns3/network-ns3.tesh to see which ones are used +examples/deprecated/msg/network-ns3/network-ns3.tesh to see which ones are used in our regression tests. You may also be interested in the @ref msg_ex_ns3 "ns-3/SimGrid examples". diff --git a/docs/source/Start_Your_Own_Project.rst b/docs/source/Start_Your_Own_Project.rst index f0ec5c6ddc..bf0545313a 100644 --- a/docs/source/Start_Your_Own_Project.rst +++ b/docs/source/Start_Your_Own_Project.rst @@ -126,7 +126,7 @@ If you want to build our Java examples in Eclipse, get the whole source code and open the archive on your disk. In Eclipse, select the menu "File / Import", and then in the wizard "General / Existing Project into Workspace". On the Next page, select the directory -"examples/java" that you can find in the SimGrid source tree as a root +"examples/deprecated/java" that you can find in the SimGrid source tree as a root directory and finish the creation. The file ``simgrid.jar`` must be in the root directory of the SimGrid diff --git a/docs/source/app_java.rst b/docs/source/app_java.rst index 1e71be56e9..e77587c5f9 100644 --- a/docs/source/app_java.rst +++ b/docs/source/app_java.rst @@ -47,7 +47,7 @@ For example: .. code-block:: shell - $ cd examples/java + $ cd examples/deprecated/java $ java -classpath ../../simgrid.jar:. .:../../simgrid.jar app.pingpong.Main ../platforms/platform.xml Any SimGrid simulation (java or not) is usually constituted of several diff --git a/examples/java/.classpath b/examples/deprecated/java/.classpath similarity index 100% rename from examples/java/.classpath rename to examples/deprecated/java/.classpath diff --git a/examples/java/.project b/examples/deprecated/java/.project similarity index 100% rename from examples/java/.project rename to examples/deprecated/java/.project diff --git a/examples/java/CMakeLists.txt b/examples/deprecated/java/CMakeLists.txt similarity index 100% rename from examples/java/CMakeLists.txt rename to examples/deprecated/java/CMakeLists.txt diff --git a/examples/java/app/bittorrent/Common.java b/examples/deprecated/java/app/bittorrent/Common.java similarity index 100% rename from examples/java/app/bittorrent/Common.java rename to examples/deprecated/java/app/bittorrent/Common.java diff --git a/examples/java/app/bittorrent/Connection.java b/examples/deprecated/java/app/bittorrent/Connection.java similarity index 100% rename from examples/java/app/bittorrent/Connection.java rename to examples/deprecated/java/app/bittorrent/Connection.java diff --git a/examples/java/app/bittorrent/Main.java b/examples/deprecated/java/app/bittorrent/Main.java similarity index 100% rename from examples/java/app/bittorrent/Main.java rename to examples/deprecated/java/app/bittorrent/Main.java diff --git a/examples/java/app/bittorrent/MessageTask.java b/examples/deprecated/java/app/bittorrent/MessageTask.java similarity index 100% rename from examples/java/app/bittorrent/MessageTask.java rename to examples/deprecated/java/app/bittorrent/MessageTask.java diff --git a/examples/java/app/bittorrent/Peer.java b/examples/deprecated/java/app/bittorrent/Peer.java similarity index 100% rename from examples/java/app/bittorrent/Peer.java rename to examples/deprecated/java/app/bittorrent/Peer.java diff --git a/examples/java/app/bittorrent/Tracker.java b/examples/deprecated/java/app/bittorrent/Tracker.java similarity index 100% rename from examples/java/app/bittorrent/Tracker.java rename to examples/deprecated/java/app/bittorrent/Tracker.java diff --git a/examples/java/app/bittorrent/TrackerTask.java b/examples/deprecated/java/app/bittorrent/TrackerTask.java similarity index 100% rename from examples/java/app/bittorrent/TrackerTask.java rename to examples/deprecated/java/app/bittorrent/TrackerTask.java diff --git a/examples/java/app/bittorrent/app-bittorrent.tesh b/examples/deprecated/java/app/bittorrent/app-bittorrent.tesh similarity index 100% rename from examples/java/app/bittorrent/app-bittorrent.tesh rename to examples/deprecated/java/app/bittorrent/app-bittorrent.tesh diff --git a/examples/java/app/bittorrent/bittorrent.xml b/examples/deprecated/java/app/bittorrent/bittorrent.xml similarity index 100% rename from examples/java/app/bittorrent/bittorrent.xml rename to examples/deprecated/java/app/bittorrent/bittorrent.xml diff --git a/examples/java/app/bittorrent/generate.py b/examples/deprecated/java/app/bittorrent/generate.py similarity index 100% rename from examples/java/app/bittorrent/generate.py rename to examples/deprecated/java/app/bittorrent/generate.py diff --git a/examples/java/app/centralizedmutex/Coordinator.java b/examples/deprecated/java/app/centralizedmutex/Coordinator.java similarity index 100% rename from examples/java/app/centralizedmutex/Coordinator.java rename to examples/deprecated/java/app/centralizedmutex/Coordinator.java diff --git a/examples/java/app/centralizedmutex/GrantTask.java b/examples/deprecated/java/app/centralizedmutex/GrantTask.java similarity index 100% rename from examples/java/app/centralizedmutex/GrantTask.java rename to examples/deprecated/java/app/centralizedmutex/GrantTask.java diff --git a/examples/java/app/centralizedmutex/Main.java b/examples/deprecated/java/app/centralizedmutex/Main.java similarity index 100% rename from examples/java/app/centralizedmutex/Main.java rename to examples/deprecated/java/app/centralizedmutex/Main.java diff --git a/examples/java/app/centralizedmutex/Node.java b/examples/deprecated/java/app/centralizedmutex/Node.java similarity index 100% rename from examples/java/app/centralizedmutex/Node.java rename to examples/deprecated/java/app/centralizedmutex/Node.java diff --git a/examples/java/app/centralizedmutex/ReleaseTask.java b/examples/deprecated/java/app/centralizedmutex/ReleaseTask.java similarity index 100% rename from examples/java/app/centralizedmutex/ReleaseTask.java rename to examples/deprecated/java/app/centralizedmutex/ReleaseTask.java diff --git a/examples/java/app/centralizedmutex/RequestTask.java b/examples/deprecated/java/app/centralizedmutex/RequestTask.java similarity index 100% rename from examples/java/app/centralizedmutex/RequestTask.java rename to examples/deprecated/java/app/centralizedmutex/RequestTask.java diff --git a/examples/java/app/centralizedmutex/app-centralizedmutex.tesh b/examples/deprecated/java/app/centralizedmutex/app-centralizedmutex.tesh similarity index 100% rename from examples/java/app/centralizedmutex/app-centralizedmutex.tesh rename to examples/deprecated/java/app/centralizedmutex/app-centralizedmutex.tesh diff --git a/examples/java/app/centralizedmutex/centralizedmutex.xml b/examples/deprecated/java/app/centralizedmutex/centralizedmutex.xml similarity index 100% rename from examples/java/app/centralizedmutex/centralizedmutex.xml rename to examples/deprecated/java/app/centralizedmutex/centralizedmutex.xml diff --git a/examples/java/app/masterworker/Main.java b/examples/deprecated/java/app/masterworker/Main.java similarity index 100% rename from examples/java/app/masterworker/Main.java rename to examples/deprecated/java/app/masterworker/Main.java diff --git a/examples/java/app/masterworker/Master.java b/examples/deprecated/java/app/masterworker/Master.java similarity index 100% rename from examples/java/app/masterworker/Master.java rename to examples/deprecated/java/app/masterworker/Master.java diff --git a/examples/java/app/masterworker/README b/examples/deprecated/java/app/masterworker/README similarity index 100% rename from examples/java/app/masterworker/README rename to examples/deprecated/java/app/masterworker/README diff --git a/examples/java/app/masterworker/Worker.java b/examples/deprecated/java/app/masterworker/Worker.java similarity index 100% rename from examples/java/app/masterworker/Worker.java rename to examples/deprecated/java/app/masterworker/Worker.java diff --git a/examples/java/app/masterworker/app-masterworker.tesh b/examples/deprecated/java/app/masterworker/app-masterworker.tesh similarity index 100% rename from examples/java/app/masterworker/app-masterworker.tesh rename to examples/deprecated/java/app/masterworker/app-masterworker.tesh diff --git a/examples/java/app/masterworker/masterworker.xml b/examples/deprecated/java/app/masterworker/masterworker.xml similarity index 100% rename from examples/java/app/masterworker/masterworker.xml rename to examples/deprecated/java/app/masterworker/masterworker.xml diff --git a/examples/java/app/pingpong/Main.java b/examples/deprecated/java/app/pingpong/Main.java similarity index 100% rename from examples/java/app/pingpong/Main.java rename to examples/deprecated/java/app/pingpong/Main.java diff --git a/examples/java/app/pingpong/PingPongTask.java b/examples/deprecated/java/app/pingpong/PingPongTask.java similarity index 100% rename from examples/java/app/pingpong/PingPongTask.java rename to examples/deprecated/java/app/pingpong/PingPongTask.java diff --git a/examples/java/app/pingpong/Receiver.java b/examples/deprecated/java/app/pingpong/Receiver.java similarity index 100% rename from examples/java/app/pingpong/Receiver.java rename to examples/deprecated/java/app/pingpong/Receiver.java diff --git a/examples/java/app/pingpong/Sender.java b/examples/deprecated/java/app/pingpong/Sender.java similarity index 100% rename from examples/java/app/pingpong/Sender.java rename to examples/deprecated/java/app/pingpong/Sender.java diff --git a/examples/java/app/pingpong/app-pingpong.tesh b/examples/deprecated/java/app/pingpong/app-pingpong.tesh similarity index 100% rename from examples/java/app/pingpong/app-pingpong.tesh rename to examples/deprecated/java/app/pingpong/app-pingpong.tesh diff --git a/examples/java/app/tokenring/Main.java b/examples/deprecated/java/app/tokenring/Main.java similarity index 100% rename from examples/java/app/tokenring/Main.java rename to examples/deprecated/java/app/tokenring/Main.java diff --git a/examples/java/app/tokenring/RelayRunner.java b/examples/deprecated/java/app/tokenring/RelayRunner.java similarity index 100% rename from examples/java/app/tokenring/RelayRunner.java rename to examples/deprecated/java/app/tokenring/RelayRunner.java diff --git a/examples/java/app/tokenring/app-tokenring.tesh b/examples/deprecated/java/app/tokenring/app-tokenring.tesh similarity index 100% rename from examples/java/app/tokenring/app-tokenring.tesh rename to examples/deprecated/java/app/tokenring/app-tokenring.tesh diff --git a/examples/java/async/dsend/Main.java b/examples/deprecated/java/async/dsend/Main.java similarity index 100% rename from examples/java/async/dsend/Main.java rename to examples/deprecated/java/async/dsend/Main.java diff --git a/examples/java/async/dsend/Receiver.java b/examples/deprecated/java/async/dsend/Receiver.java similarity index 100% rename from examples/java/async/dsend/Receiver.java rename to examples/deprecated/java/async/dsend/Receiver.java diff --git a/examples/java/async/dsend/Sender.java b/examples/deprecated/java/async/dsend/Sender.java similarity index 100% rename from examples/java/async/dsend/Sender.java rename to examples/deprecated/java/async/dsend/Sender.java diff --git a/examples/java/async/dsend/async-dsend.tesh b/examples/deprecated/java/async/dsend/async-dsend.tesh similarity index 100% rename from examples/java/async/dsend/async-dsend.tesh rename to examples/deprecated/java/async/dsend/async-dsend.tesh diff --git a/examples/java/async/waitall/Main.java b/examples/deprecated/java/async/waitall/Main.java similarity index 100% rename from examples/java/async/waitall/Main.java rename to examples/deprecated/java/async/waitall/Main.java diff --git a/examples/java/async/waitall/Receiver.java b/examples/deprecated/java/async/waitall/Receiver.java similarity index 100% rename from examples/java/async/waitall/Receiver.java rename to examples/deprecated/java/async/waitall/Receiver.java diff --git a/examples/java/async/waitall/Sender.java b/examples/deprecated/java/async/waitall/Sender.java similarity index 100% rename from examples/java/async/waitall/Sender.java rename to examples/deprecated/java/async/waitall/Sender.java diff --git a/examples/java/async/waitall/async-waitall.tesh b/examples/deprecated/java/async/waitall/async-waitall.tesh similarity index 100% rename from examples/java/async/waitall/async-waitall.tesh rename to examples/deprecated/java/async/waitall/async-waitall.tesh diff --git a/examples/java/async/yield/Main.java b/examples/deprecated/java/async/yield/Main.java similarity index 100% rename from examples/java/async/yield/Main.java rename to examples/deprecated/java/async/yield/Main.java diff --git a/examples/java/async/yield/Yielder.java b/examples/deprecated/java/async/yield/Yielder.java similarity index 100% rename from examples/java/async/yield/Yielder.java rename to examples/deprecated/java/async/yield/Yielder.java diff --git a/examples/java/async/yield/async-yield.tesh b/examples/deprecated/java/async/yield/async-yield.tesh similarity index 100% rename from examples/java/async/yield/async-yield.tesh rename to examples/deprecated/java/async/yield/async-yield.tesh diff --git a/examples/java/cloud/masterworker/Main.java b/examples/deprecated/java/cloud/masterworker/Main.java similarity index 100% rename from examples/java/cloud/masterworker/Main.java rename to examples/deprecated/java/cloud/masterworker/Main.java diff --git a/examples/java/cloud/masterworker/Master.java b/examples/deprecated/java/cloud/masterworker/Master.java similarity index 100% rename from examples/java/cloud/masterworker/Master.java rename to examples/deprecated/java/cloud/masterworker/Master.java diff --git a/examples/java/cloud/masterworker/Worker.java b/examples/deprecated/java/cloud/masterworker/Worker.java similarity index 100% rename from examples/java/cloud/masterworker/Worker.java rename to examples/deprecated/java/cloud/masterworker/Worker.java diff --git a/examples/java/cloud/masterworker/cloud-masterworker.tesh b/examples/deprecated/java/cloud/masterworker/cloud-masterworker.tesh similarity index 100% rename from examples/java/cloud/masterworker/cloud-masterworker.tesh rename to examples/deprecated/java/cloud/masterworker/cloud-masterworker.tesh diff --git a/examples/java/cloud/migration/Daemon.java b/examples/deprecated/java/cloud/migration/Daemon.java similarity index 100% rename from examples/java/cloud/migration/Daemon.java rename to examples/deprecated/java/cloud/migration/Daemon.java diff --git a/examples/java/cloud/migration/Main.java b/examples/deprecated/java/cloud/migration/Main.java similarity index 100% rename from examples/java/cloud/migration/Main.java rename to examples/deprecated/java/cloud/migration/Main.java diff --git a/examples/java/cloud/migration/README b/examples/deprecated/java/cloud/migration/README similarity index 100% rename from examples/java/cloud/migration/README rename to examples/deprecated/java/cloud/migration/README diff --git a/examples/java/cloud/migration/Test.java b/examples/deprecated/java/cloud/migration/Test.java similarity index 100% rename from examples/java/cloud/migration/Test.java rename to examples/deprecated/java/cloud/migration/Test.java diff --git a/examples/java/cloud/migration/TestHostOnOff.java b/examples/deprecated/java/cloud/migration/TestHostOnOff.java similarity index 100% rename from examples/java/cloud/migration/TestHostOnOff.java rename to examples/deprecated/java/cloud/migration/TestHostOnOff.java diff --git a/examples/java/cloud/migration/XVM.java b/examples/deprecated/java/cloud/migration/XVM.java similarity index 100% rename from examples/java/cloud/migration/XVM.java rename to examples/deprecated/java/cloud/migration/XVM.java diff --git a/examples/java/cloud/migration/cloud-migration.tesh b/examples/deprecated/java/cloud/migration/cloud-migration.tesh similarity index 100% rename from examples/java/cloud/migration/cloud-migration.tesh rename to examples/deprecated/java/cloud/migration/cloud-migration.tesh diff --git a/examples/java/dht/chord/ChordTask.java b/examples/deprecated/java/dht/chord/ChordTask.java similarity index 100% rename from examples/java/dht/chord/ChordTask.java rename to examples/deprecated/java/dht/chord/ChordTask.java diff --git a/examples/java/dht/chord/Common.java b/examples/deprecated/java/dht/chord/Common.java similarity index 100% rename from examples/java/dht/chord/Common.java rename to examples/deprecated/java/dht/chord/Common.java diff --git a/examples/java/dht/chord/FindSuccessorAnswerTask.java b/examples/deprecated/java/dht/chord/FindSuccessorAnswerTask.java similarity index 100% rename from examples/java/dht/chord/FindSuccessorAnswerTask.java rename to examples/deprecated/java/dht/chord/FindSuccessorAnswerTask.java diff --git a/examples/java/dht/chord/FindSuccessorTask.java b/examples/deprecated/java/dht/chord/FindSuccessorTask.java similarity index 100% rename from examples/java/dht/chord/FindSuccessorTask.java rename to examples/deprecated/java/dht/chord/FindSuccessorTask.java diff --git a/examples/java/dht/chord/GetPredecessorAnswerTask.java b/examples/deprecated/java/dht/chord/GetPredecessorAnswerTask.java similarity index 100% rename from examples/java/dht/chord/GetPredecessorAnswerTask.java rename to examples/deprecated/java/dht/chord/GetPredecessorAnswerTask.java diff --git a/examples/java/dht/chord/GetPredecessorTask.java b/examples/deprecated/java/dht/chord/GetPredecessorTask.java similarity index 100% rename from examples/java/dht/chord/GetPredecessorTask.java rename to examples/deprecated/java/dht/chord/GetPredecessorTask.java diff --git a/examples/java/dht/chord/Main.java b/examples/deprecated/java/dht/chord/Main.java similarity index 100% rename from examples/java/dht/chord/Main.java rename to examples/deprecated/java/dht/chord/Main.java diff --git a/examples/java/dht/chord/Node.java b/examples/deprecated/java/dht/chord/Node.java similarity index 100% rename from examples/java/dht/chord/Node.java rename to examples/deprecated/java/dht/chord/Node.java diff --git a/examples/java/dht/chord/NotifyTask.java b/examples/deprecated/java/dht/chord/NotifyTask.java similarity index 100% rename from examples/java/dht/chord/NotifyTask.java rename to examples/deprecated/java/dht/chord/NotifyTask.java diff --git a/examples/java/dht/chord/chord.xml b/examples/deprecated/java/dht/chord/chord.xml similarity index 100% rename from examples/java/dht/chord/chord.xml rename to examples/deprecated/java/dht/chord/chord.xml diff --git a/examples/java/dht/chord/dht-chord.tesh b/examples/deprecated/java/dht/chord/dht-chord.tesh similarity index 100% rename from examples/java/dht/chord/dht-chord.tesh rename to examples/deprecated/java/dht/chord/dht-chord.tesh diff --git a/examples/java/dht/kademlia/Answer.java b/examples/deprecated/java/dht/kademlia/Answer.java similarity index 100% rename from examples/java/dht/kademlia/Answer.java rename to examples/deprecated/java/dht/kademlia/Answer.java diff --git a/examples/java/dht/kademlia/Bucket.java b/examples/deprecated/java/dht/kademlia/Bucket.java similarity index 100% rename from examples/java/dht/kademlia/Bucket.java rename to examples/deprecated/java/dht/kademlia/Bucket.java diff --git a/examples/java/dht/kademlia/Common.java b/examples/deprecated/java/dht/kademlia/Common.java similarity index 100% rename from examples/java/dht/kademlia/Common.java rename to examples/deprecated/java/dht/kademlia/Common.java diff --git a/examples/java/dht/kademlia/Contact.java b/examples/deprecated/java/dht/kademlia/Contact.java similarity index 100% rename from examples/java/dht/kademlia/Contact.java rename to examples/deprecated/java/dht/kademlia/Contact.java diff --git a/examples/java/dht/kademlia/FindNodeAnswerTask.java b/examples/deprecated/java/dht/kademlia/FindNodeAnswerTask.java similarity index 100% rename from examples/java/dht/kademlia/FindNodeAnswerTask.java rename to examples/deprecated/java/dht/kademlia/FindNodeAnswerTask.java diff --git a/examples/java/dht/kademlia/FindNodeTask.java b/examples/deprecated/java/dht/kademlia/FindNodeTask.java similarity index 100% rename from examples/java/dht/kademlia/FindNodeTask.java rename to examples/deprecated/java/dht/kademlia/FindNodeTask.java diff --git a/examples/java/dht/kademlia/KademliaTask.java b/examples/deprecated/java/dht/kademlia/KademliaTask.java similarity index 100% rename from examples/java/dht/kademlia/KademliaTask.java rename to examples/deprecated/java/dht/kademlia/KademliaTask.java diff --git a/examples/java/dht/kademlia/Main.java b/examples/deprecated/java/dht/kademlia/Main.java similarity index 100% rename from examples/java/dht/kademlia/Main.java rename to examples/deprecated/java/dht/kademlia/Main.java diff --git a/examples/java/dht/kademlia/Node.java b/examples/deprecated/java/dht/kademlia/Node.java similarity index 100% rename from examples/java/dht/kademlia/Node.java rename to examples/deprecated/java/dht/kademlia/Node.java diff --git a/examples/java/dht/kademlia/PingAnswerTask.java b/examples/deprecated/java/dht/kademlia/PingAnswerTask.java similarity index 100% rename from examples/java/dht/kademlia/PingAnswerTask.java rename to examples/deprecated/java/dht/kademlia/PingAnswerTask.java diff --git a/examples/java/dht/kademlia/PingTask.java b/examples/deprecated/java/dht/kademlia/PingTask.java similarity index 100% rename from examples/java/dht/kademlia/PingTask.java rename to examples/deprecated/java/dht/kademlia/PingTask.java diff --git a/examples/java/dht/kademlia/RoutingTable.java b/examples/deprecated/java/dht/kademlia/RoutingTable.java similarity index 100% rename from examples/java/dht/kademlia/RoutingTable.java rename to examples/deprecated/java/dht/kademlia/RoutingTable.java diff --git a/examples/java/dht/kademlia/dht-kademlia.tesh b/examples/deprecated/java/dht/kademlia/dht-kademlia.tesh similarity index 100% rename from examples/java/dht/kademlia/dht-kademlia.tesh rename to examples/deprecated/java/dht/kademlia/dht-kademlia.tesh diff --git a/examples/java/dht/kademlia/kademlia.xml b/examples/deprecated/java/dht/kademlia/kademlia.xml similarity index 100% rename from examples/java/dht/kademlia/kademlia.xml rename to examples/deprecated/java/dht/kademlia/kademlia.xml diff --git a/examples/java/energy/consumption/EnergyConsumer.java b/examples/deprecated/java/energy/consumption/EnergyConsumer.java similarity index 100% rename from examples/java/energy/consumption/EnergyConsumer.java rename to examples/deprecated/java/energy/consumption/EnergyConsumer.java diff --git a/examples/java/energy/consumption/Main.java b/examples/deprecated/java/energy/consumption/Main.java similarity index 100% rename from examples/java/energy/consumption/Main.java rename to examples/deprecated/java/energy/consumption/Main.java diff --git a/examples/java/energy/consumption/energy-consumption.tesh b/examples/deprecated/java/energy/consumption/energy-consumption.tesh similarity index 100% rename from examples/java/energy/consumption/energy-consumption.tesh rename to examples/deprecated/java/energy/consumption/energy-consumption.tesh diff --git a/examples/java/energy/pstate/Main.java b/examples/deprecated/java/energy/pstate/Main.java similarity index 100% rename from examples/java/energy/pstate/Main.java rename to examples/deprecated/java/energy/pstate/Main.java diff --git a/examples/java/energy/pstate/PstateRunner.java b/examples/deprecated/java/energy/pstate/PstateRunner.java similarity index 100% rename from examples/java/energy/pstate/PstateRunner.java rename to examples/deprecated/java/energy/pstate/PstateRunner.java diff --git a/examples/java/energy/pstate/energy-pstate.tesh b/examples/deprecated/java/energy/pstate/energy-pstate.tesh similarity index 100% rename from examples/java/energy/pstate/energy-pstate.tesh rename to examples/deprecated/java/energy/pstate/energy-pstate.tesh diff --git a/examples/java/energy/vm/EnergyVMRunner.java b/examples/deprecated/java/energy/vm/EnergyVMRunner.java similarity index 100% rename from examples/java/energy/vm/EnergyVMRunner.java rename to examples/deprecated/java/energy/vm/EnergyVMRunner.java diff --git a/examples/java/energy/vm/Main.java b/examples/deprecated/java/energy/vm/Main.java similarity index 100% rename from examples/java/energy/vm/Main.java rename to examples/deprecated/java/energy/vm/Main.java diff --git a/examples/java/energy/vm/energy-vm.tesh b/examples/deprecated/java/energy/vm/energy-vm.tesh similarity index 100% rename from examples/java/energy/vm/energy-vm.tesh rename to examples/deprecated/java/energy/vm/energy-vm.tesh diff --git a/examples/java/hostload/LoadRunner.java b/examples/deprecated/java/hostload/LoadRunner.java similarity index 100% rename from examples/java/hostload/LoadRunner.java rename to examples/deprecated/java/hostload/LoadRunner.java diff --git a/examples/java/hostload/Main.java b/examples/deprecated/java/hostload/Main.java similarity index 100% rename from examples/java/hostload/Main.java rename to examples/deprecated/java/hostload/Main.java diff --git a/examples/java/hostload/hostload.tesh b/examples/deprecated/java/hostload/hostload.tesh similarity index 100% rename from examples/java/hostload/hostload.tesh rename to examples/deprecated/java/hostload/hostload.tesh diff --git a/examples/java/io/file/Main.java b/examples/deprecated/java/io/file/Main.java similarity index 100% rename from examples/java/io/file/Main.java rename to examples/deprecated/java/io/file/Main.java diff --git a/examples/java/io/file/Node.java b/examples/deprecated/java/io/file/Node.java similarity index 100% rename from examples/java/io/file/Node.java rename to examples/deprecated/java/io/file/Node.java diff --git a/examples/java/io/file/io-file.tesh b/examples/deprecated/java/io/file/io-file.tesh similarity index 100% rename from examples/java/io/file/io-file.tesh rename to examples/deprecated/java/io/file/io-file.tesh diff --git a/examples/java/io/storage/Client.java b/examples/deprecated/java/io/storage/Client.java similarity index 100% rename from examples/java/io/storage/Client.java rename to examples/deprecated/java/io/storage/Client.java diff --git a/examples/java/io/storage/Main.java b/examples/deprecated/java/io/storage/Main.java similarity index 100% rename from examples/java/io/storage/Main.java rename to examples/deprecated/java/io/storage/Main.java diff --git a/examples/java/io/storage/io-storage.tesh b/examples/deprecated/java/io/storage/io-storage.tesh similarity index 100% rename from examples/java/io/storage/io-storage.tesh rename to examples/deprecated/java/io/storage/io-storage.tesh diff --git a/examples/java/process/kill/Killer.java b/examples/deprecated/java/process/kill/Killer.java similarity index 100% rename from examples/java/process/kill/Killer.java rename to examples/deprecated/java/process/kill/Killer.java diff --git a/examples/java/process/kill/Main.java b/examples/deprecated/java/process/kill/Main.java similarity index 100% rename from examples/java/process/kill/Main.java rename to examples/deprecated/java/process/kill/Main.java diff --git a/examples/java/process/kill/Victim.java b/examples/deprecated/java/process/kill/Victim.java similarity index 100% rename from examples/java/process/kill/Victim.java rename to examples/deprecated/java/process/kill/Victim.java diff --git a/examples/java/process/kill/process-kill.tesh b/examples/deprecated/java/process/kill/process-kill.tesh similarity index 100% rename from examples/java/process/kill/process-kill.tesh rename to examples/deprecated/java/process/kill/process-kill.tesh diff --git a/examples/java/process/migration/Emigrant.java b/examples/deprecated/java/process/migration/Emigrant.java similarity index 100% rename from examples/java/process/migration/Emigrant.java rename to examples/deprecated/java/process/migration/Emigrant.java diff --git a/examples/java/process/migration/Main.java b/examples/deprecated/java/process/migration/Main.java similarity index 100% rename from examples/java/process/migration/Main.java rename to examples/deprecated/java/process/migration/Main.java diff --git a/examples/java/process/migration/Policeman.java b/examples/deprecated/java/process/migration/Policeman.java similarity index 100% rename from examples/java/process/migration/Policeman.java rename to examples/deprecated/java/process/migration/Policeman.java diff --git a/examples/java/process/migration/process-migration.tesh b/examples/deprecated/java/process/migration/process-migration.tesh similarity index 100% rename from examples/java/process/migration/process-migration.tesh rename to examples/deprecated/java/process/migration/process-migration.tesh diff --git a/examples/java/process/startkilltime/Main.java b/examples/deprecated/java/process/startkilltime/Main.java similarity index 100% rename from examples/java/process/startkilltime/Main.java rename to examples/deprecated/java/process/startkilltime/Main.java diff --git a/examples/java/process/startkilltime/Sleeper.java b/examples/deprecated/java/process/startkilltime/Sleeper.java similarity index 100% rename from examples/java/process/startkilltime/Sleeper.java rename to examples/deprecated/java/process/startkilltime/Sleeper.java diff --git a/examples/java/process/startkilltime/process-startkilltime.tesh b/examples/deprecated/java/process/startkilltime/process-startkilltime.tesh similarity index 100% rename from examples/java/process/startkilltime/process-startkilltime.tesh rename to examples/deprecated/java/process/startkilltime/process-startkilltime.tesh diff --git a/examples/java/process/startkilltime/startkilltime.xml b/examples/deprecated/java/process/startkilltime/startkilltime.xml similarity index 100% rename from examples/java/process/startkilltime/startkilltime.xml rename to examples/deprecated/java/process/startkilltime/startkilltime.xml diff --git a/examples/java/process/suspend/DreamMaster.java b/examples/deprecated/java/process/suspend/DreamMaster.java similarity index 100% rename from examples/java/process/suspend/DreamMaster.java rename to examples/deprecated/java/process/suspend/DreamMaster.java diff --git a/examples/java/process/suspend/LazyGuy.java b/examples/deprecated/java/process/suspend/LazyGuy.java similarity index 100% rename from examples/java/process/suspend/LazyGuy.java rename to examples/deprecated/java/process/suspend/LazyGuy.java diff --git a/examples/java/process/suspend/Main.java b/examples/deprecated/java/process/suspend/Main.java similarity index 100% rename from examples/java/process/suspend/Main.java rename to examples/deprecated/java/process/suspend/Main.java diff --git a/examples/java/process/suspend/process-suspend.tesh b/examples/deprecated/java/process/suspend/process-suspend.tesh similarity index 100% rename from examples/java/process/suspend/process-suspend.tesh rename to examples/deprecated/java/process/suspend/process-suspend.tesh diff --git a/examples/java/task/priority/Main.java b/examples/deprecated/java/task/priority/Main.java similarity index 100% rename from examples/java/task/priority/Main.java rename to examples/deprecated/java/task/priority/Main.java diff --git a/examples/java/task/priority/Test.java b/examples/deprecated/java/task/priority/Test.java similarity index 100% rename from examples/java/task/priority/Test.java rename to examples/deprecated/java/task/priority/Test.java diff --git a/examples/java/task/priority/priority.xml b/examples/deprecated/java/task/priority/priority.xml similarity index 100% rename from examples/java/task/priority/priority.xml rename to examples/deprecated/java/task/priority/priority.xml diff --git a/examples/java/task/priority/task-priority.tesh b/examples/deprecated/java/task/priority/task-priority.tesh similarity index 100% rename from examples/java/task/priority/task-priority.tesh rename to examples/deprecated/java/task/priority/task-priority.tesh diff --git a/examples/java/trace/pingpong/Main.java b/examples/deprecated/java/trace/pingpong/Main.java similarity index 100% rename from examples/java/trace/pingpong/Main.java rename to examples/deprecated/java/trace/pingpong/Main.java diff --git a/examples/java/trace/pingpong/PingPongTask.java b/examples/deprecated/java/trace/pingpong/PingPongTask.java similarity index 100% rename from examples/java/trace/pingpong/PingPongTask.java rename to examples/deprecated/java/trace/pingpong/PingPongTask.java diff --git a/examples/java/trace/pingpong/Receiver.java b/examples/deprecated/java/trace/pingpong/Receiver.java similarity index 100% rename from examples/java/trace/pingpong/Receiver.java rename to examples/deprecated/java/trace/pingpong/Receiver.java diff --git a/examples/java/trace/pingpong/Sender.java b/examples/deprecated/java/trace/pingpong/Sender.java similarity index 100% rename from examples/java/trace/pingpong/Sender.java rename to examples/deprecated/java/trace/pingpong/Sender.java diff --git a/examples/java/trace/pingpong/trace-pingpong.tesh b/examples/deprecated/java/trace/pingpong/trace-pingpong.tesh similarity index 100% rename from examples/java/trace/pingpong/trace-pingpong.tesh rename to examples/deprecated/java/trace/pingpong/trace-pingpong.tesh diff --git a/examples/msg/CMakeLists.txt b/examples/deprecated/msg/CMakeLists.txt similarity index 81% rename from examples/msg/CMakeLists.txt rename to examples/deprecated/msg/CMakeLists.txt index 20494aac28..42ecf7ce0b 100644 --- a/examples/msg/CMakeLists.txt +++ b/examples/deprecated/msg/CMakeLists.txt @@ -67,55 +67,55 @@ foreach(x app-masterworker cloud-masterworker process-create synchro-semaphore) ADD_TESH_FACTORIES(msg-${x} "thread;ucontext;raw;boost" - --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/${x} - --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/${x} + --setenv bindir=${CMAKE_BINARY_DIR}/examples/deprecated/msg/${x} + --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/${x} --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms - ${CMAKE_HOME_DIRECTORY}/examples/msg/${x}/${x}.tesh) + ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/${x}/${x}.tesh) endforeach() foreach (x trace-categories trace-route-user-variables trace-link-user-variables trace-masterworker trace-process-migration trace-host-user-variables) - ADD_TESH(msg-${x} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/${x} - --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/${x} + ADD_TESH(msg-${x} --setenv bindir=${CMAKE_BINARY_DIR}/examples/deprecated/msg/${x} + --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/${x} --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms - --cd ${CMAKE_BINARY_DIR}/examples/msg/${x} - ${CMAKE_HOME_DIRECTORY}/examples/msg/${x}/${x}.tesh) + --cd ${CMAKE_BINARY_DIR}/examples/deprecated/msg/${x} + ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/${x}/${x}.tesh) endforeach() if(HAVE_SANITIZER_THREAD) ADD_TESH_FACTORIES(msg-dht-kademlia-parallel "thread" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} - --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-kademlia - --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/dht-kademlia + --setenv bindir=${CMAKE_BINARY_DIR}/examples/deprecated/msg/dht-kademlia + --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/dht-kademlia --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms - ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-kademlia/dht-kademlia.tesh) + ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/dht-kademlia/dht-kademlia.tesh) else() ADD_TESH_FACTORIES(msg-dht-kademlia-parallel "thread;ucontext;raw;boost" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} - --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-kademlia - --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/dht-kademlia + --setenv bindir=${CMAKE_BINARY_DIR}/examples/deprecated/msg/dht-kademlia + --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/dht-kademlia --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms - ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-kademlia/dht-kademlia.tesh) + ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/dht-kademlia/dht-kademlia.tesh) endif() if(NOT WIN32) - ADD_TESH_FACTORIES(msg-maestro-set "thread" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/maestro-set/maestro-set.tesh) + ADD_TESH_FACTORIES(msg-maestro-set "thread" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg --cd ${CMAKE_BINARY_DIR}/examples/deprecated/msg ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/maestro-set/maestro-set.tesh) else() message("Test maestro-set disabled on windows: this feature is not working") endif() ADD_TESH_FACTORIES(app-masterworker-multicore "thread;ucontext;raw;boost" - --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/app-masterworker - --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/app-masterworker + --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/app-masterworker + --setenv bindir=${CMAKE_BINARY_DIR}/examples/deprecated/msg/app-masterworker --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms - ${CMAKE_HOME_DIRECTORY}/examples/msg/app-masterworker/app-masterworker-multicore.tesh) + ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/app-masterworker/app-masterworker-multicore.tesh) ADD_TESH_FACTORIES(app-masterworker-vivaldi "thread;ucontext;raw;boost" - --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/app-masterworker - --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/app-masterworker + --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/app-masterworker + --setenv bindir=${CMAKE_BINARY_DIR}/examples/deprecated/msg/app-masterworker --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms - ${CMAKE_HOME_DIRECTORY}/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh) + ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/app-masterworker/app-masterworker-vivaldi.tesh) if(SIMGRID_HAVE_NS3) ADD_TESH_FACTORIES(msg-network-ns3 "thread;ucontext;raw;boost" - --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg - --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg + --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg + --setenv bindir=${CMAKE_BINARY_DIR}/examples/deprecated/msg --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms - ${CMAKE_HOME_DIRECTORY}/examples/msg/network-ns3/network-ns3.tesh) + ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/network-ns3/network-ns3.tesh) endif() diff --git a/examples/msg/README.doc b/examples/deprecated/msg/README.doc similarity index 76% rename from examples/msg/README.doc rename to examples/deprecated/msg/README.doc index 53ea4d7f2a..e2ffbeb8c0 100644 --- a/examples/msg/README.doc +++ b/examples/deprecated/msg/README.doc @@ -20,14 +20,14 @@ @section msg_ex_basics Basic examples and features - Master Workers. - @ref examples/msg/app-masterworker/app-masterworker.c\n + @ref examples/deprecated/msg/app-masterworker/app-masterworker.c\n Another good old example, where one Master process has a bunch of task to dispatch to a set of several Worker processes. @section msg_ex_process Acting on Processes - Creating processes. - @ref examples/msg/process-create/process-create.c \n + @ref examples/deprecated/msg/process-create/process-create.c \n Most processes are started from the deployment XML file, but they can also be used with the @ref MSG_process_create() function. @@ -41,7 +41,7 @@ It is interesting to run the process-create example with the following options to see the task executions: - Setting Categories. - @ref examples/msg/trace-categories/trace-categories.c \n + @ref examples/deprecated/msg/trace-categories/trace-categories.c \n This example declares several tracing categories to that are used to classify its tasks. When the program is executed, the tracing mechanism registers the resource utilization of hosts @@ -50,7 +50,7 @@ options to see the task executions: @endverbatim - Master Workers tracing. - @ref examples/msg/trace-masterworker/trace-masterworker.c \n + @ref examples/deprecated/msg/trace-masterworker/trace-masterworker.c \n This is an augmented version of our basic master/worker example using several tracing features. It traces resource usage, sorted out in several categories; Trace marks and user variables are also @@ -59,7 +59,7 @@ options to see the task executions: @endverbatim - Process migration tracing. - @ref examples/msg/trace-process-migration/trace-process-migration.c \n + @ref examples/deprecated/msg/trace-process-migration/trace-process-migration.c \n This version is enhanced so that the process migrations can be displayed as arrows in a Gantt-chart visualization. Recommanded options to that extend: @@ -80,15 +80,15 @@ They have to be run with the following options: @endverbatim - Attaching variables to Hosts. - @ref examples/msg/trace-host-user-variables/trace-host-user-variables.c + @ref examples/deprecated/msg/trace-host-user-variables/trace-host-user-variables.c - Attaching variables to Links. - @ref examples/msg/trace-link-user-variables/trace-link-user-variables.c \n + @ref examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables.c \n The tricky part is that you have to know the name of the link you want to enhance with a variable. - Attaching variables to network Routes - @ref examples/msg/trace-route-user-variables/trace-route-user-variables.c \n + @ref examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables.c \n It is often easier to update a given variable for all links of a given network path (identified by its source and destination hosts) instead of knowing the name of each specific link. @@ -105,7 +105,7 @@ file to see how to declare a platform to be used with the ns-3 bindings of SimGrid and the tesh file to see how to actually start a simulation in these settings. - - @ref examples/msg/network-ns3/network-ns3.c. Simple ping-pong using + - @ref examples/deprecated/msg/network-ns3/network-ns3.c. Simple ping-pong using ns-3 instead of the SimGrid network models. TODO: merge the C files @@ -123,18 +123,18 @@ TODO: show the XML files instead if it's what is interesting. On a "XML example /** -@example examples/msg/app-masterworker/app-masterworker.c +@example examples/deprecated/msg/app-masterworker/app-masterworker.c -@example examples/msg/process-create/process-create.c +@example examples/deprecated/msg/process-create/process-create.c -@example examples/msg/trace-categories/trace-categories.c -@example examples/msg/trace-masterworker/trace-masterworker.c -@example examples/msg/trace-process-migration/trace-process-migration.c -@example examples/msg/trace-host-user-variables/trace-host-user-variables.c -@example examples/msg/trace-link-user-variables/trace-link-user-variables.c -@example examples/msg/trace-route-user-variables/trace-route-user-variables.c +@example examples/deprecated/msg/trace-categories/trace-categories.c +@example examples/deprecated/msg/trace-masterworker/trace-masterworker.c +@example examples/deprecated/msg/trace-process-migration/trace-process-migration.c +@example examples/deprecated/msg/trace-host-user-variables/trace-host-user-variables.c +@example examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables.c +@example examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables.c -@example examples/msg/network-ns3/network-ns3.c +@example examples/deprecated/msg/network-ns3/network-ns3.c */ diff --git a/examples/msg/app-masterworker/app-masterworker-multicore.tesh b/examples/deprecated/msg/app-masterworker/app-masterworker-multicore.tesh similarity index 100% rename from examples/msg/app-masterworker/app-masterworker-multicore.tesh rename to examples/deprecated/msg/app-masterworker/app-masterworker-multicore.tesh diff --git a/examples/msg/app-masterworker/app-masterworker-multicore_d.xml b/examples/deprecated/msg/app-masterworker/app-masterworker-multicore_d.xml similarity index 100% rename from examples/msg/app-masterworker/app-masterworker-multicore_d.xml rename to examples/deprecated/msg/app-masterworker/app-masterworker-multicore_d.xml diff --git a/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh b/examples/deprecated/msg/app-masterworker/app-masterworker-vivaldi.tesh similarity index 100% rename from examples/msg/app-masterworker/app-masterworker-vivaldi.tesh rename to examples/deprecated/msg/app-masterworker/app-masterworker-vivaldi.tesh diff --git a/examples/msg/app-masterworker/app-masterworker-vivaldi_d.xml b/examples/deprecated/msg/app-masterworker/app-masterworker-vivaldi_d.xml similarity index 100% rename from examples/msg/app-masterworker/app-masterworker-vivaldi_d.xml rename to examples/deprecated/msg/app-masterworker/app-masterworker-vivaldi_d.xml diff --git a/examples/msg/app-masterworker/app-masterworker.c b/examples/deprecated/msg/app-masterworker/app-masterworker.c similarity index 100% rename from examples/msg/app-masterworker/app-masterworker.c rename to examples/deprecated/msg/app-masterworker/app-masterworker.c diff --git a/examples/msg/app-masterworker/app-masterworker.tesh b/examples/deprecated/msg/app-masterworker/app-masterworker.tesh similarity index 100% rename from examples/msg/app-masterworker/app-masterworker.tesh rename to examples/deprecated/msg/app-masterworker/app-masterworker.tesh diff --git a/examples/msg/app-masterworker/app-masterworker_d.xml b/examples/deprecated/msg/app-masterworker/app-masterworker_d.xml similarity index 100% rename from examples/msg/app-masterworker/app-masterworker_d.xml rename to examples/deprecated/msg/app-masterworker/app-masterworker_d.xml diff --git a/examples/msg/cloud-masterworker/cloud-masterworker.c b/examples/deprecated/msg/cloud-masterworker/cloud-masterworker.c similarity index 100% rename from examples/msg/cloud-masterworker/cloud-masterworker.c rename to examples/deprecated/msg/cloud-masterworker/cloud-masterworker.c diff --git a/examples/msg/cloud-masterworker/cloud-masterworker.tesh b/examples/deprecated/msg/cloud-masterworker/cloud-masterworker.tesh similarity index 100% rename from examples/msg/cloud-masterworker/cloud-masterworker.tesh rename to examples/deprecated/msg/cloud-masterworker/cloud-masterworker.tesh diff --git a/examples/msg/dht-kademlia/answer.c b/examples/deprecated/msg/dht-kademlia/answer.c similarity index 100% rename from examples/msg/dht-kademlia/answer.c rename to examples/deprecated/msg/dht-kademlia/answer.c diff --git a/examples/msg/dht-kademlia/answer.h b/examples/deprecated/msg/dht-kademlia/answer.h similarity index 100% rename from examples/msg/dht-kademlia/answer.h rename to examples/deprecated/msg/dht-kademlia/answer.h diff --git a/examples/msg/dht-kademlia/common.h b/examples/deprecated/msg/dht-kademlia/common.h similarity index 100% rename from examples/msg/dht-kademlia/common.h rename to examples/deprecated/msg/dht-kademlia/common.h diff --git a/examples/msg/dht-kademlia/dht-kademlia.c b/examples/deprecated/msg/dht-kademlia/dht-kademlia.c similarity index 100% rename from examples/msg/dht-kademlia/dht-kademlia.c rename to examples/deprecated/msg/dht-kademlia/dht-kademlia.c diff --git a/examples/msg/dht-kademlia/dht-kademlia.h b/examples/deprecated/msg/dht-kademlia/dht-kademlia.h similarity index 100% rename from examples/msg/dht-kademlia/dht-kademlia.h rename to examples/deprecated/msg/dht-kademlia/dht-kademlia.h diff --git a/examples/msg/dht-kademlia/dht-kademlia.tesh b/examples/deprecated/msg/dht-kademlia/dht-kademlia.tesh similarity index 100% rename from examples/msg/dht-kademlia/dht-kademlia.tesh rename to examples/deprecated/msg/dht-kademlia/dht-kademlia.tesh diff --git a/examples/msg/dht-kademlia/dht-kademlia_d.xml b/examples/deprecated/msg/dht-kademlia/dht-kademlia_d.xml similarity index 100% rename from examples/msg/dht-kademlia/dht-kademlia_d.xml rename to examples/deprecated/msg/dht-kademlia/dht-kademlia_d.xml diff --git a/examples/msg/dht-kademlia/generate.py b/examples/deprecated/msg/dht-kademlia/generate.py similarity index 100% rename from examples/msg/dht-kademlia/generate.py rename to examples/deprecated/msg/dht-kademlia/generate.py diff --git a/examples/msg/dht-kademlia/node.c b/examples/deprecated/msg/dht-kademlia/node.c similarity index 100% rename from examples/msg/dht-kademlia/node.c rename to examples/deprecated/msg/dht-kademlia/node.c diff --git a/examples/msg/dht-kademlia/node.h b/examples/deprecated/msg/dht-kademlia/node.h similarity index 100% rename from examples/msg/dht-kademlia/node.h rename to examples/deprecated/msg/dht-kademlia/node.h diff --git a/examples/msg/dht-kademlia/routing_table.c b/examples/deprecated/msg/dht-kademlia/routing_table.c similarity index 100% rename from examples/msg/dht-kademlia/routing_table.c rename to examples/deprecated/msg/dht-kademlia/routing_table.c diff --git a/examples/msg/dht-kademlia/routing_table.h b/examples/deprecated/msg/dht-kademlia/routing_table.h similarity index 100% rename from examples/msg/dht-kademlia/routing_table.h rename to examples/deprecated/msg/dht-kademlia/routing_table.h diff --git a/examples/msg/dht-kademlia/task.c b/examples/deprecated/msg/dht-kademlia/task.c similarity index 100% rename from examples/msg/dht-kademlia/task.c rename to examples/deprecated/msg/dht-kademlia/task.c diff --git a/examples/msg/dht-kademlia/task.h b/examples/deprecated/msg/dht-kademlia/task.h similarity index 100% rename from examples/msg/dht-kademlia/task.h rename to examples/deprecated/msg/dht-kademlia/task.h diff --git a/examples/msg/dht-pastry/dht-pastry.c b/examples/deprecated/msg/dht-pastry/dht-pastry.c similarity index 100% rename from examples/msg/dht-pastry/dht-pastry.c rename to examples/deprecated/msg/dht-pastry/dht-pastry.c diff --git a/examples/msg/dht-pastry/dht-pastry.tesh b/examples/deprecated/msg/dht-pastry/dht-pastry.tesh similarity index 100% rename from examples/msg/dht-pastry/dht-pastry.tesh rename to examples/deprecated/msg/dht-pastry/dht-pastry.tesh diff --git a/examples/msg/dht-pastry/dht-pastry_d.xml b/examples/deprecated/msg/dht-pastry/dht-pastry_d.xml similarity index 100% rename from examples/msg/dht-pastry/dht-pastry_d.xml rename to examples/deprecated/msg/dht-pastry/dht-pastry_d.xml diff --git a/examples/msg/dht-pastry/generate.py b/examples/deprecated/msg/dht-pastry/generate.py similarity index 100% rename from examples/msg/dht-pastry/generate.py rename to examples/deprecated/msg/dht-pastry/generate.py diff --git a/examples/msg/energy-vm/.gitignore b/examples/deprecated/msg/energy-vm/.gitignore similarity index 100% rename from examples/msg/energy-vm/.gitignore rename to examples/deprecated/msg/energy-vm/.gitignore diff --git a/examples/msg/energy-vm/energy-vm.c b/examples/deprecated/msg/energy-vm/energy-vm.c similarity index 100% rename from examples/msg/energy-vm/energy-vm.c rename to examples/deprecated/msg/energy-vm/energy-vm.c diff --git a/examples/msg/energy-vm/energy-vm.tesh b/examples/deprecated/msg/energy-vm/energy-vm.tesh similarity index 100% rename from examples/msg/energy-vm/energy-vm.tesh rename to examples/deprecated/msg/energy-vm/energy-vm.tesh diff --git a/examples/msg/maestro-set/maestro-set.cpp b/examples/deprecated/msg/maestro-set/maestro-set.cpp similarity index 100% rename from examples/msg/maestro-set/maestro-set.cpp rename to examples/deprecated/msg/maestro-set/maestro-set.cpp diff --git a/examples/msg/maestro-set/maestro-set.tesh b/examples/deprecated/msg/maestro-set/maestro-set.tesh similarity index 87% rename from examples/msg/maestro-set/maestro-set.tesh rename to examples/deprecated/msg/maestro-set/maestro-set.tesh index eaa6324804..b3f69dd8d6 100644 --- a/examples/msg/maestro-set/maestro-set.tesh +++ b/examples/deprecated/msg/maestro-set/maestro-set.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ $SG_TEST_EXENV maestro-set/maestro-set$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV maestro-set/maestro-set$EXEEXT ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) I am not the main thread, as expected > [ 0.000000] (2:receiver@Jupiter) I am not the main thread, as expected > [ 0.000000] (1:sender@Tremblay) I am the main thread, as expected diff --git a/examples/msg/mc/CMakeLists.txt b/examples/deprecated/msg/mc/CMakeLists.txt similarity index 100% rename from examples/msg/mc/CMakeLists.txt rename to examples/deprecated/msg/mc/CMakeLists.txt diff --git a/examples/msg/mc/bugged1.c b/examples/deprecated/msg/mc/bugged1.c similarity index 100% rename from examples/msg/mc/bugged1.c rename to examples/deprecated/msg/mc/bugged1.c diff --git a/examples/msg/mc/bugged1.tesh b/examples/deprecated/msg/mc/bugged1.tesh similarity index 100% rename from examples/msg/mc/bugged1.tesh rename to examples/deprecated/msg/mc/bugged1.tesh diff --git a/examples/msg/mc/bugged1_liveness.c b/examples/deprecated/msg/mc/bugged1_liveness.c similarity index 100% rename from examples/msg/mc/bugged1_liveness.c rename to examples/deprecated/msg/mc/bugged1_liveness.c diff --git a/examples/msg/mc/bugged1_liveness.tesh b/examples/deprecated/msg/mc/bugged1_liveness.tesh similarity index 100% rename from examples/msg/mc/bugged1_liveness.tesh rename to examples/deprecated/msg/mc/bugged1_liveness.tesh diff --git a/examples/msg/mc/bugged1_liveness_sparse.tesh b/examples/deprecated/msg/mc/bugged1_liveness_sparse.tesh similarity index 100% rename from examples/msg/mc/bugged1_liveness_sparse.tesh rename to examples/deprecated/msg/mc/bugged1_liveness_sparse.tesh diff --git a/examples/msg/mc/bugged1_liveness_stack_cleaner b/examples/deprecated/msg/mc/bugged1_liveness_stack_cleaner similarity index 100% rename from examples/msg/mc/bugged1_liveness_stack_cleaner rename to examples/deprecated/msg/mc/bugged1_liveness_stack_cleaner diff --git a/examples/msg/mc/bugged1_liveness_visited.tesh b/examples/deprecated/msg/mc/bugged1_liveness_visited.tesh similarity index 100% rename from examples/msg/mc/bugged1_liveness_visited.tesh rename to examples/deprecated/msg/mc/bugged1_liveness_visited.tesh diff --git a/examples/msg/mc/bugged1_liveness_visited_sparse.tesh b/examples/deprecated/msg/mc/bugged1_liveness_visited_sparse.tesh similarity index 100% rename from examples/msg/mc/bugged1_liveness_visited_sparse.tesh rename to examples/deprecated/msg/mc/bugged1_liveness_visited_sparse.tesh diff --git a/examples/msg/mc/bugged2.c b/examples/deprecated/msg/mc/bugged2.c similarity index 100% rename from examples/msg/mc/bugged2.c rename to examples/deprecated/msg/mc/bugged2.c diff --git a/examples/msg/mc/bugged2.tesh b/examples/deprecated/msg/mc/bugged2.tesh similarity index 100% rename from examples/msg/mc/bugged2.tesh rename to examples/deprecated/msg/mc/bugged2.tesh diff --git a/examples/msg/mc/bugged2_liveness.c b/examples/deprecated/msg/mc/bugged2_liveness.c similarity index 100% rename from examples/msg/mc/bugged2_liveness.c rename to examples/deprecated/msg/mc/bugged2_liveness.c diff --git a/examples/msg/mc/bugged3.c b/examples/deprecated/msg/mc/bugged3.c similarity index 100% rename from examples/msg/mc/bugged3.c rename to examples/deprecated/msg/mc/bugged3.c diff --git a/examples/msg/mc/centralized_mutex.c b/examples/deprecated/msg/mc/centralized_mutex.c similarity index 100% rename from examples/msg/mc/centralized_mutex.c rename to examples/deprecated/msg/mc/centralized_mutex.c diff --git a/examples/msg/mc/centralized_mutex.tesh b/examples/deprecated/msg/mc/centralized_mutex.tesh similarity index 100% rename from examples/msg/mc/centralized_mutex.tesh rename to examples/deprecated/msg/mc/centralized_mutex.tesh diff --git a/examples/msg/mc/deploy_bugged1.xml b/examples/deprecated/msg/mc/deploy_bugged1.xml similarity index 100% rename from examples/msg/mc/deploy_bugged1.xml rename to examples/deprecated/msg/mc/deploy_bugged1.xml diff --git a/examples/msg/mc/deploy_bugged1_liveness.xml b/examples/deprecated/msg/mc/deploy_bugged1_liveness.xml similarity index 100% rename from examples/msg/mc/deploy_bugged1_liveness.xml rename to examples/deprecated/msg/mc/deploy_bugged1_liveness.xml diff --git a/examples/msg/mc/deploy_bugged1_liveness_visited.xml b/examples/deprecated/msg/mc/deploy_bugged1_liveness_visited.xml similarity index 100% rename from examples/msg/mc/deploy_bugged1_liveness_visited.xml rename to examples/deprecated/msg/mc/deploy_bugged1_liveness_visited.xml diff --git a/examples/msg/mc/deploy_bugged2.xml b/examples/deprecated/msg/mc/deploy_bugged2.xml similarity index 100% rename from examples/msg/mc/deploy_bugged2.xml rename to examples/deprecated/msg/mc/deploy_bugged2.xml diff --git a/examples/msg/mc/deploy_bugged2_liveness.xml b/examples/deprecated/msg/mc/deploy_bugged2_liveness.xml similarity index 100% rename from examples/msg/mc/deploy_bugged2_liveness.xml rename to examples/deprecated/msg/mc/deploy_bugged2_liveness.xml diff --git a/examples/msg/mc/deploy_bugged3.xml b/examples/deprecated/msg/mc/deploy_bugged3.xml similarity index 100% rename from examples/msg/mc/deploy_bugged3.xml rename to examples/deprecated/msg/mc/deploy_bugged3.xml diff --git a/examples/msg/mc/deploy_centralized_mutex.xml b/examples/deprecated/msg/mc/deploy_centralized_mutex.xml similarity index 100% rename from examples/msg/mc/deploy_centralized_mutex.xml rename to examples/deprecated/msg/mc/deploy_centralized_mutex.xml diff --git a/examples/msg/mc/deploy_electric_fence.xml b/examples/deprecated/msg/mc/deploy_electric_fence.xml similarity index 100% rename from examples/msg/mc/deploy_electric_fence.xml rename to examples/deprecated/msg/mc/deploy_electric_fence.xml diff --git a/examples/msg/mc/electric_fence.c b/examples/deprecated/msg/mc/electric_fence.c similarity index 100% rename from examples/msg/mc/electric_fence.c rename to examples/deprecated/msg/mc/electric_fence.c diff --git a/examples/msg/mc/platform.xml b/examples/deprecated/msg/mc/platform.xml similarity index 100% rename from examples/msg/mc/platform.xml rename to examples/deprecated/msg/mc/platform.xml diff --git a/examples/msg/mc/promela_bugged1_liveness b/examples/deprecated/msg/mc/promela_bugged1_liveness similarity index 100% rename from examples/msg/mc/promela_bugged1_liveness rename to examples/deprecated/msg/mc/promela_bugged1_liveness diff --git a/examples/msg/mc/promela_bugged2_liveness b/examples/deprecated/msg/mc/promela_bugged2_liveness similarity index 100% rename from examples/msg/mc/promela_bugged2_liveness rename to examples/deprecated/msg/mc/promela_bugged2_liveness diff --git a/examples/msg/network-ns3/3hosts_2links_d.xml b/examples/deprecated/msg/network-ns3/3hosts_2links_d.xml similarity index 100% rename from examples/msg/network-ns3/3hosts_2links_d.xml rename to examples/deprecated/msg/network-ns3/3hosts_2links_d.xml diff --git a/examples/msg/network-ns3/3links-timer_d.xml b/examples/deprecated/msg/network-ns3/3links-timer_d.xml similarity index 100% rename from examples/msg/network-ns3/3links-timer_d.xml rename to examples/deprecated/msg/network-ns3/3links-timer_d.xml diff --git a/examples/msg/network-ns3/3links_d.xml b/examples/deprecated/msg/network-ns3/3links_d.xml similarity index 100% rename from examples/msg/network-ns3/3links_d.xml rename to examples/deprecated/msg/network-ns3/3links_d.xml diff --git a/examples/msg/network-ns3/crosstraffic_d.xml b/examples/deprecated/msg/network-ns3/crosstraffic_d.xml similarity index 100% rename from examples/msg/network-ns3/crosstraffic_d.xml rename to examples/deprecated/msg/network-ns3/crosstraffic_d.xml diff --git a/examples/msg/network-ns3/dogbone_d.xml b/examples/deprecated/msg/network-ns3/dogbone_d.xml similarity index 100% rename from examples/msg/network-ns3/dogbone_d.xml rename to examples/deprecated/msg/network-ns3/dogbone_d.xml diff --git a/examples/msg/network-ns3/network-ns3.c b/examples/deprecated/msg/network-ns3/network-ns3.c similarity index 100% rename from examples/msg/network-ns3/network-ns3.c rename to examples/deprecated/msg/network-ns3/network-ns3.c diff --git a/examples/msg/network-ns3/network-ns3.tesh b/examples/deprecated/msg/network-ns3/network-ns3.tesh similarity index 100% rename from examples/msg/network-ns3/network-ns3.tesh rename to examples/deprecated/msg/network-ns3/network-ns3.tesh diff --git a/examples/msg/network-ns3/one_cluster_d.xml b/examples/deprecated/msg/network-ns3/one_cluster_d.xml similarity index 100% rename from examples/msg/network-ns3/one_cluster_d.xml rename to examples/deprecated/msg/network-ns3/one_cluster_d.xml diff --git a/examples/msg/network-ns3/onelink_d.xml b/examples/deprecated/msg/network-ns3/onelink_d.xml similarity index 100% rename from examples/msg/network-ns3/onelink_d.xml rename to examples/deprecated/msg/network-ns3/onelink_d.xml diff --git a/examples/msg/platform-failures/platform-failures.c b/examples/deprecated/msg/platform-failures/platform-failures.c similarity index 100% rename from examples/msg/platform-failures/platform-failures.c rename to examples/deprecated/msg/platform-failures/platform-failures.c diff --git a/examples/msg/platform-failures/platform-failures.tesh b/examples/deprecated/msg/platform-failures/platform-failures.tesh similarity index 100% rename from examples/msg/platform-failures/platform-failures.tesh rename to examples/deprecated/msg/platform-failures/platform-failures.tesh diff --git a/examples/msg/process-create/process-create.c b/examples/deprecated/msg/process-create/process-create.c similarity index 100% rename from examples/msg/process-create/process-create.c rename to examples/deprecated/msg/process-create/process-create.c diff --git a/examples/msg/process-create/process-create.tesh b/examples/deprecated/msg/process-create/process-create.tesh similarity index 100% rename from examples/msg/process-create/process-create.tesh rename to examples/deprecated/msg/process-create/process-create.tesh diff --git a/examples/msg/synchro-semaphore/synchro-semaphore.c b/examples/deprecated/msg/synchro-semaphore/synchro-semaphore.c similarity index 100% rename from examples/msg/synchro-semaphore/synchro-semaphore.c rename to examples/deprecated/msg/synchro-semaphore/synchro-semaphore.c diff --git a/examples/msg/synchro-semaphore/synchro-semaphore.tesh b/examples/deprecated/msg/synchro-semaphore/synchro-semaphore.tesh similarity index 100% rename from examples/msg/synchro-semaphore/synchro-semaphore.tesh rename to examples/deprecated/msg/synchro-semaphore/synchro-semaphore.tesh diff --git a/examples/msg/trace-categories/trace-categories.c b/examples/deprecated/msg/trace-categories/trace-categories.c similarity index 100% rename from examples/msg/trace-categories/trace-categories.c rename to examples/deprecated/msg/trace-categories/trace-categories.c diff --git a/examples/msg/trace-categories/trace-categories.tesh b/examples/deprecated/msg/trace-categories/trace-categories.tesh similarity index 100% rename from examples/msg/trace-categories/trace-categories.tesh rename to examples/deprecated/msg/trace-categories/trace-categories.tesh diff --git a/examples/msg/trace-host-user-variables/trace-host-user-variables.c b/examples/deprecated/msg/trace-host-user-variables/trace-host-user-variables.c similarity index 100% rename from examples/msg/trace-host-user-variables/trace-host-user-variables.c rename to examples/deprecated/msg/trace-host-user-variables/trace-host-user-variables.c diff --git a/examples/msg/trace-host-user-variables/trace-host-user-variables.tesh b/examples/deprecated/msg/trace-host-user-variables/trace-host-user-variables.tesh similarity index 100% rename from examples/msg/trace-host-user-variables/trace-host-user-variables.tesh rename to examples/deprecated/msg/trace-host-user-variables/trace-host-user-variables.tesh diff --git a/examples/msg/trace-link-user-variables/trace-link-user-variables.c b/examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables.c similarity index 100% rename from examples/msg/trace-link-user-variables/trace-link-user-variables.c rename to examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables.c diff --git a/examples/msg/trace-link-user-variables/trace-link-user-variables.tesh b/examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables.tesh similarity index 100% rename from examples/msg/trace-link-user-variables/trace-link-user-variables.tesh rename to examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables.tesh diff --git a/examples/msg/trace-masterworker/trace-masterworker.c b/examples/deprecated/msg/trace-masterworker/trace-masterworker.c similarity index 100% rename from examples/msg/trace-masterworker/trace-masterworker.c rename to examples/deprecated/msg/trace-masterworker/trace-masterworker.c diff --git a/examples/msg/trace-masterworker/trace-masterworker.tesh b/examples/deprecated/msg/trace-masterworker/trace-masterworker.tesh similarity index 100% rename from examples/msg/trace-masterworker/trace-masterworker.tesh rename to examples/deprecated/msg/trace-masterworker/trace-masterworker.tesh diff --git a/examples/msg/trace-process-migration/trace-process-migration.c b/examples/deprecated/msg/trace-process-migration/trace-process-migration.c similarity index 100% rename from examples/msg/trace-process-migration/trace-process-migration.c rename to examples/deprecated/msg/trace-process-migration/trace-process-migration.c diff --git a/examples/msg/trace-process-migration/trace-process-migration.tesh b/examples/deprecated/msg/trace-process-migration/trace-process-migration.tesh similarity index 100% rename from examples/msg/trace-process-migration/trace-process-migration.tesh rename to examples/deprecated/msg/trace-process-migration/trace-process-migration.tesh diff --git a/examples/msg/trace-route-user-variables/trace-route-user-variables.c b/examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables.c similarity index 100% rename from examples/msg/trace-route-user-variables/trace-route-user-variables.c rename to examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables.c diff --git a/examples/msg/trace-route-user-variables/trace-route-user-variables.tesh b/examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables.tesh similarity index 100% rename from examples/msg/trace-route-user-variables/trace-route-user-variables.tesh rename to examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables.tesh diff --git a/examples/simdag/CMakeLists.txt b/examples/deprecated/simdag/CMakeLists.txt similarity index 91% rename from examples/simdag/CMakeLists.txt rename to examples/deprecated/simdag/CMakeLists.txt index 830276ca27..e18499670f 100644 --- a/examples/simdag/CMakeLists.txt +++ b/examples/deprecated/simdag/CMakeLists.txt @@ -45,11 +45,11 @@ set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/dag-dotload/dag_wi ${CMAKE_CURRENT_SOURCE_DIR}/scheduling/expected_output.jed PARENT_SCOPE) foreach(x daxload fail typed_tasks properties throttling scheduling test) - ADD_TESH(simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/${x}/sd_${x}.tesh) + ADD_TESH(simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/simdag --cd ${CMAKE_BINARY_DIR}/examples/deprecated/simdag ${CMAKE_HOME_DIRECTORY}/examples/deprecated/simdag/${x}/sd_${x}.tesh) endforeach() if(HAVE_GRAPHVIZ) foreach(x dag-dotload ptg-dotload schedule-dotload) - ADD_TESH(simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/${x}/sd_${x}.tesh) + ADD_TESH(simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/simdag --cd ${CMAKE_BINARY_DIR}/examples/deprecated/simdag ${CMAKE_HOME_DIRECTORY}/examples/deprecated/simdag/${x}/sd_${x}.tesh) endforeach() endif() diff --git a/examples/simdag/dag-dotload/dag.dot b/examples/deprecated/simdag/dag-dotload/dag.dot similarity index 100% rename from examples/simdag/dag-dotload/dag.dot rename to examples/deprecated/simdag/dag-dotload/dag.dot diff --git a/examples/simdag/dag-dotload/dag_with_cycle.dot b/examples/deprecated/simdag/dag-dotload/dag_with_cycle.dot similarity index 100% rename from examples/simdag/dag-dotload/dag_with_cycle.dot rename to examples/deprecated/simdag/dag-dotload/dag_with_cycle.dot diff --git a/examples/simdag/dag-dotload/sd_dag-dotload.c b/examples/deprecated/simdag/dag-dotload/sd_dag-dotload.c similarity index 100% rename from examples/simdag/dag-dotload/sd_dag-dotload.c rename to examples/deprecated/simdag/dag-dotload/sd_dag-dotload.c diff --git a/examples/simdag/dag-dotload/sd_dag-dotload.tesh b/examples/deprecated/simdag/dag-dotload/sd_dag-dotload.tesh similarity index 98% rename from examples/simdag/dag-dotload/sd_dag-dotload.tesh rename to examples/deprecated/simdag/dag-dotload/sd_dag-dotload.tesh index 82b831126e..929c084a6c 100644 --- a/examples/simdag/dag-dotload/sd_dag-dotload.tesh +++ b/examples/deprecated/simdag/dag-dotload/sd_dag-dotload.tesh @@ -4,7 +4,7 @@ p Test the loader of DAG written in the DOT format # The order differ when executed with gcc's thread sanitizer ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/dag-dotload/dag.dot +$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/dag-dotload/dag.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG --------------------------- > [0.000000] [sd_task/INFO] Displaying task root @@ -217,7 +217,7 @@ $ cat ${srcdir:=.}/dag-dotload/dag.trace $ rm -f ${srcdir:=.}/dag-dotload/dag.trace ${srcdir:=.}/dot.dot ! expect return 2 -$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/dag-dotload/dag_with_cycle.dot +$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/dag-dotload/dag_with_cycle.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_daxparse/WARNING] the task root is not marked > [0.000000] [sd_daxparse/WARNING] the task 1 is in a cycle diff --git a/examples/simdag/daxload/sd_daxload.c b/examples/deprecated/simdag/daxload/sd_daxload.c similarity index 100% rename from examples/simdag/daxload/sd_daxload.c rename to examples/deprecated/simdag/daxload/sd_daxload.c diff --git a/examples/simdag/daxload/sd_daxload.tesh b/examples/deprecated/simdag/daxload/sd_daxload.tesh similarity index 97% rename from examples/simdag/daxload/sd_daxload.tesh rename to examples/deprecated/simdag/daxload/sd_daxload.tesh index 79ad304b27..6294772cb3 100644 --- a/examples/simdag/daxload/sd_daxload.tesh +++ b/examples/deprecated/simdag/daxload/sd_daxload.tesh @@ -2,7 +2,7 @@ p Test the DAX loader on a small DAX instance ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/daxload/smalldax.xml +$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/daxload/smalldax.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_daxparse/WARNING] Ignore file o1 size redefinition from 1000000 to 304 > [0.000000] [sd_daxparse/WARNING] Ignore file o2 size redefinition from 1000000 to 304 @@ -127,7 +127,7 @@ $ cmake -E remove -f ${srcdir:=.}/dax.dot ${srcdir:=.}/daxload/smalldax.trace p Test the DAX loader with a DAX comprising a cycle. ! expect return 255 -$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/daxload/simple_dax_with_cycle.xml +$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/daxload/simple_dax_with_cycle.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_daxparse/WARNING] the task root is not marked > [0.000000] [sd_daxparse/WARNING] the task 1@task1 is in a cycle diff --git a/examples/simdag/daxload/simple_dax_with_cycle.xml b/examples/deprecated/simdag/daxload/simple_dax_with_cycle.xml similarity index 100% rename from examples/simdag/daxload/simple_dax_with_cycle.xml rename to examples/deprecated/simdag/daxload/simple_dax_with_cycle.xml diff --git a/examples/simdag/daxload/smalldax.xml b/examples/deprecated/simdag/daxload/smalldax.xml similarity index 100% rename from examples/simdag/daxload/smalldax.xml rename to examples/deprecated/simdag/daxload/smalldax.xml diff --git a/examples/simdag/fail/sd_fail.c b/examples/deprecated/simdag/fail/sd_fail.c similarity index 100% rename from examples/simdag/fail/sd_fail.c rename to examples/deprecated/simdag/fail/sd_fail.c diff --git a/examples/simdag/fail/sd_fail.tesh b/examples/deprecated/simdag/fail/sd_fail.tesh similarity index 96% rename from examples/simdag/fail/sd_fail.tesh rename to examples/deprecated/simdag/fail/sd_fail.tesh index 8bdd96bfd2..4586cf8d98 100644 --- a/examples/simdag/fail/sd_fail.tesh +++ b/examples/deprecated/simdag/fail/sd_fail.tesh @@ -2,7 +2,7 @@ p Test of the management of failed tasks simdag -$ $SG_TEST_EXENV ${bindir:=.}/fail/sd_fail ${srcdir:=.}/../platforms/faulty_host.xml +$ $SG_TEST_EXENV ${bindir:=.}/fail/sd_fail ${srcdir:=.}/../../platforms/faulty_host.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_fail/INFO] First test: COMP_SEQ task > [0.000000] [sd_fail/INFO] Schedule task 'Poor task' on 'Faulty Host' diff --git a/examples/simdag/goal/goal_test.c b/examples/deprecated/simdag/goal/goal_test.c similarity index 100% rename from examples/simdag/goal/goal_test.c rename to examples/deprecated/simdag/goal/goal_test.c diff --git a/examples/simdag/properties/sd_properties.c b/examples/deprecated/simdag/properties/sd_properties.c similarity index 100% rename from examples/simdag/properties/sd_properties.c rename to examples/deprecated/simdag/properties/sd_properties.c diff --git a/examples/simdag/properties/sd_properties.tesh b/examples/deprecated/simdag/properties/sd_properties.tesh similarity index 92% rename from examples/simdag/properties/sd_properties.tesh rename to examples/deprecated/simdag/properties/sd_properties.tesh index b1dc894061..80abf864aa 100644 --- a/examples/simdag/properties/sd_properties.tesh +++ b/examples/deprecated/simdag/properties/sd_properties.tesh @@ -2,7 +2,7 @@ p Simple test of simdag with properties -$ $SG_TEST_EXENV properties/sd_properties ${srcdir:=.}/../platforms/prop.xml +$ $SG_TEST_EXENV properties/sd_properties ${srcdir:=.}/../../platforms/prop.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] Property list for host host1 > [0.000000] [test/INFO] Property: mem has value: 4 diff --git a/examples/simdag/ptg-dotload/ptg.dot b/examples/deprecated/simdag/ptg-dotload/ptg.dot similarity index 100% rename from examples/simdag/ptg-dotload/ptg.dot rename to examples/deprecated/simdag/ptg-dotload/ptg.dot diff --git a/examples/simdag/ptg-dotload/sd_ptg-dotload.c b/examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.c similarity index 100% rename from examples/simdag/ptg-dotload/sd_ptg-dotload.c rename to examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.c diff --git a/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh b/examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.tesh similarity index 98% rename from examples/simdag/ptg-dotload/sd_ptg-dotload.tesh rename to examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.tesh index 22879fe81a..8861c46957 100644 --- a/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh +++ b/examples/deprecated/simdag/ptg-dotload/sd_ptg-dotload.tesh @@ -4,7 +4,7 @@ p Test the loader of PTG (Parallel Task Graph) written in the DOT format # The order differ when executed with gcc's thread sanitizer ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/ptg-dotload/sd_ptg-dotload ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/ptg-dotload/ptg.dot +$ $SG_TEST_EXENV ${bindir:=.}/ptg-dotload/sd_ptg-dotload ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/ptg-dotload/ptg.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG --------------------------- > [0.000000] [sd_task/INFO] Displaying task root diff --git a/examples/simdag/schedule-dotload/.gitignore b/examples/deprecated/simdag/schedule-dotload/.gitignore similarity index 100% rename from examples/simdag/schedule-dotload/.gitignore rename to examples/deprecated/simdag/schedule-dotload/.gitignore diff --git a/examples/simdag/schedule-dotload/dag_with_bad_schedule.dot b/examples/deprecated/simdag/schedule-dotload/dag_with_bad_schedule.dot similarity index 100% rename from examples/simdag/schedule-dotload/dag_with_bad_schedule.dot rename to examples/deprecated/simdag/schedule-dotload/dag_with_bad_schedule.dot diff --git a/examples/simdag/schedule-dotload/dag_with_good_schedule.dot b/examples/deprecated/simdag/schedule-dotload/dag_with_good_schedule.dot similarity index 100% rename from examples/simdag/schedule-dotload/dag_with_good_schedule.dot rename to examples/deprecated/simdag/schedule-dotload/dag_with_good_schedule.dot diff --git a/examples/simdag/schedule-dotload/sd_schedule-dotload.c b/examples/deprecated/simdag/schedule-dotload/sd_schedule-dotload.c similarity index 100% rename from examples/simdag/schedule-dotload/sd_schedule-dotload.c rename to examples/deprecated/simdag/schedule-dotload/sd_schedule-dotload.c diff --git a/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh b/examples/deprecated/simdag/schedule-dotload/sd_schedule-dotload.tesh similarity index 98% rename from examples/simdag/schedule-dotload/sd_schedule-dotload.tesh rename to examples/deprecated/simdag/schedule-dotload/sd_schedule-dotload.tesh index 0f0c302435..b679780c35 100644 --- a/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh +++ b/examples/deprecated/simdag/schedule-dotload/sd_schedule-dotload.tesh @@ -2,7 +2,7 @@ p Test the loader of DAG written in the DOT format ! expect return 2 -$ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc "--log=sd_dotparse.thres:verbose" ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/schedule-dotload/dag_with_bad_schedule.dot +$ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc "--log=sd_dotparse.thres:verbose" ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/schedule-dotload/dag_with_bad_schedule.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_dotparse/VERBOSE] The schedule is ignored, task 'end' can not be scheduled on -1 hosts > [0.000000] [sd_dotparse/VERBOSE] The schedule is ignored, task '1' can not be scheduled on 0 hosts @@ -15,7 +15,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc # The order differ when executed with gcc's thread sanitizer ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/schedule-dotload/dag_with_good_schedule.dot +$ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc ${srcdir:=.}/../../platforms/cluster_backbone.xml ${srcdir:=.}/schedule-dotload/dag_with_good_schedule.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG --------------------------- > [0.000000] [sd_task/INFO] Displaying task root diff --git a/examples/simdag/scheduling/Montage_25.xml b/examples/deprecated/simdag/scheduling/Montage_25.xml similarity index 100% rename from examples/simdag/scheduling/Montage_25.xml rename to examples/deprecated/simdag/scheduling/Montage_25.xml diff --git a/examples/simdag/scheduling/expected_output.jed b/examples/deprecated/simdag/scheduling/expected_output.jed similarity index 100% rename from examples/simdag/scheduling/expected_output.jed rename to examples/deprecated/simdag/scheduling/expected_output.jed diff --git a/examples/simdag/scheduling/sd_scheduling.c b/examples/deprecated/simdag/scheduling/sd_scheduling.c similarity index 100% rename from examples/simdag/scheduling/sd_scheduling.c rename to examples/deprecated/simdag/scheduling/sd_scheduling.c diff --git a/examples/simdag/scheduling/sd_scheduling.tesh b/examples/deprecated/simdag/scheduling/sd_scheduling.tesh similarity index 92% rename from examples/simdag/scheduling/sd_scheduling.tesh rename to examples/deprecated/simdag/scheduling/sd_scheduling.tesh index 49cd9dee58..82069b3fa9 100644 --- a/examples/simdag/scheduling/sd_scheduling.tesh +++ b/examples/deprecated/simdag/scheduling/sd_scheduling.tesh @@ -2,7 +2,7 @@ p Simple test of simdag -$ $SG_TEST_EXENV ${bindir:=.}/scheduling/sd_scheduling --log=sd_daxparse.thresh:critical ${srcdir:=.}/../platforms/simulacrum_7_hosts.xml ${srcdir:=.}/scheduling/Montage_25.xml +$ $SG_TEST_EXENV ${bindir:=.}/scheduling/sd_scheduling --log=sd_daxparse.thresh:critical ${srcdir:=.}/../../platforms/simulacrum_7_hosts.xml ${srcdir:=.}/scheduling/Montage_25.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] Schedule ID00002@mProjectPP on Host 27 > [0.000105] [test/INFO] Schedule ID00000@mProjectPP on Host 26 diff --git a/examples/simdag/test/sd_test.cpp b/examples/deprecated/simdag/test/sd_test.cpp similarity index 100% rename from examples/simdag/test/sd_test.cpp rename to examples/deprecated/simdag/test/sd_test.cpp diff --git a/examples/simdag/test/sd_test.tesh b/examples/deprecated/simdag/test/sd_test.tesh similarity index 95% rename from examples/simdag/test/sd_test.tesh rename to examples/deprecated/simdag/test/sd_test.tesh index 3b063a6907..7f03ba0b40 100644 --- a/examples/simdag/test/sd_test.tesh +++ b/examples/deprecated/simdag/test/sd_test.tesh @@ -3,7 +3,7 @@ p Simple test of simdag ! output sort -$ $SG_TEST_EXENV ./test/sd_test ${srcdir:=.}/../platforms/small_platform.xml +$ $SG_TEST_EXENV ./test/sd_test ${srcdir:=.}/../../platforms/small_platform.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_test/INFO] Computation time for 2000000.000000 flops on Jacquelin: 0.014563 > [0.000000] [sd_test/INFO] Computation time for 1000000.000000 flops on Fafard: 0.013107 diff --git a/examples/simdag/throttling/sd_throttling.c b/examples/deprecated/simdag/throttling/sd_throttling.c similarity index 100% rename from examples/simdag/throttling/sd_throttling.c rename to examples/deprecated/simdag/throttling/sd_throttling.c diff --git a/examples/simdag/throttling/sd_throttling.tesh b/examples/deprecated/simdag/throttling/sd_throttling.tesh similarity index 91% rename from examples/simdag/throttling/sd_throttling.tesh rename to examples/deprecated/simdag/throttling/sd_throttling.tesh index d2c17c776e..e52369a506 100644 --- a/examples/simdag/throttling/sd_throttling.tesh +++ b/examples/deprecated/simdag/throttling/sd_throttling.tesh @@ -4,7 +4,7 @@ p Modify the rate of communication tasks even when they are auto-scheduled # We need to sort this out because the order changes with the sanitizers (at least) ! output sort -$ $SG_TEST_EXENV ./throttling/sd_throttling ${srcdir:=.}/../platforms/cluster_backbone.xml +$ $SG_TEST_EXENV ./throttling/sd_throttling ${srcdir:=.}/../../platforms/cluster_backbone.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [5.000000] [sd_comm_throttling/INFO] Simulation stopped after 5.0000 seconds > [5.000000] [sd_comm_throttling/INFO] Task 'Task A' start time: 0.000000, finish time: 5.000000 diff --git a/examples/simdag/typed_tasks/sd_typed_tasks.c b/examples/deprecated/simdag/typed_tasks/sd_typed_tasks.c similarity index 100% rename from examples/simdag/typed_tasks/sd_typed_tasks.c rename to examples/deprecated/simdag/typed_tasks/sd_typed_tasks.c diff --git a/examples/simdag/typed_tasks/sd_typed_tasks.tesh b/examples/deprecated/simdag/typed_tasks/sd_typed_tasks.tesh similarity index 90% rename from examples/simdag/typed_tasks/sd_typed_tasks.tesh rename to examples/deprecated/simdag/typed_tasks/sd_typed_tasks.tesh index 9e87d2f233..3d2c6e1d02 100644 --- a/examples/simdag/typed_tasks/sd_typed_tasks.tesh +++ b/examples/deprecated/simdag/typed_tasks/sd_typed_tasks.tesh @@ -2,7 +2,7 @@ p Usage test of simdag's typed tasks ! output sort -$ $SG_TEST_EXENV ./typed_tasks/sd_typed_tasks ${srcdir:=.}/../platforms/cluster_backbone.xml +$ $SG_TEST_EXENV ./typed_tasks/sd_typed_tasks ${srcdir:=.}/../../platforms/cluster_backbone.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [2.080600] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 3' start time: 0.000000, finish time: 0.400000 > [2.080600] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 1' start time: 0.000000, finish time: 0.400000 diff --git a/teshsuite/lua/lua_platforms.tesh b/teshsuite/lua/lua_platforms.tesh index c761b457d5..c39217e686 100644 --- a/teshsuite/lua/lua_platforms.tesh +++ b/teshsuite/lua/lua_platforms.tesh @@ -1,4 +1,4 @@ -$ ${bindir:=.}/examples/msg/app-masterworker/app-masterworker ${srcdir:=.}/examples/platforms/small_platform.lua ${srcdir:=.}/examples/msg/app-masterworker/app-masterworker_d.xml +$ ${bindir:=.}/examples/deprecated/msg/app-masterworker/app-masterworker ${srcdir:=.}/examples/platforms/small_platform.lua ${srcdir:=.}/examples/deprecated/msg/app-masterworker/app-masterworker_d.xml > [Tremblay:master:(1) 0.000000] [msg_app_masterworker/INFO] Got 5 workers and 20 tasks to process > [Tremblay:master:(1) 0.000000] [msg_app_masterworker/INFO] Sending "Task_0" (of 20) to mailbox "worker-0" > [Tremblay:master:(1) 0.002265] [msg_app_masterworker/INFO] Sending "Task_1" (of 20) to mailbox "worker-1" diff --git a/teshsuite/simdag/availability/availability.tesh b/teshsuite/simdag/availability/availability.tesh index ec79ca17da..85c5250fd1 100644 --- a/teshsuite/simdag/availability/availability.tesh +++ b/teshsuite/simdag/availability/availability.tesh @@ -1,4 +1,4 @@ -$ ${bindir:=.}/availability ../../../examples/platforms/simulacrum_7_hosts.xml ../../../examples/simdag/scheduling/Montage_25.xml --cfg=network/TCP-gamma:4194304 --log=sd_daxparse.thresh:critical +$ ${bindir:=.}/availability ../../../examples/platforms/simulacrum_7_hosts.xml ../../../examples/deprecated/simdag/scheduling/Montage_25.xml --cfg=network/TCP-gamma:4194304 --log=sd_daxparse.thresh:critical > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] Scheduling DAX... diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index b943ec479c..19738ea3ea 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -88,8 +88,8 @@ set(EXTRA_DIST examples/smpi/mc/only_send_deterministic.tesh examples/smpi/mc/non_deterministic.tesh - examples/java/.classpath - examples/java/.project + examples/deprecated/java/.classpath + examples/deprecated/java/.project ) set(SMPI_SRC @@ -989,12 +989,7 @@ set(txt_files # The list of cmake build directories is constructed from the following list. # Add your CMakeLists file here to see your subdir built. set(CMAKEFILES_TXT - examples/java/CMakeLists.txt - examples/msg/CMakeLists.txt - examples/msg/mc/CMakeLists.txt - examples/python/CMakeLists.txt examples/s4u/CMakeLists.txt - examples/simdag/CMakeLists.txt examples/smpi/CMakeLists.txt examples/smpi/NAS/CMakeLists.txt examples/smpi/smpi_msg_masterslave/CMakeLists.txt @@ -1002,6 +997,11 @@ set(CMAKEFILES_TXT examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt examples/smpi/energy/f77/CMakeLists.txt examples/smpi/energy/f90/CMakeLists.txt + examples/python/CMakeLists.txt + examples/deprecated/java/CMakeLists.txt + examples/deprecated/msg/CMakeLists.txt + examples/deprecated/msg/mc/CMakeLists.txt + examples/deprecated/simdag/CMakeLists.txt teshsuite/java/CMakeLists.txt teshsuite/mc/CMakeLists.txt diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake index 971c6f5f56..889baddce5 100644 --- a/tools/cmake/Tests.cmake +++ b/tools/cmake/Tests.cmake @@ -84,24 +84,24 @@ ENDMACRO() IF(enable_java) IF(WIN32) - SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/java/\;${CMAKE_BINARY_DIR}/teshsuite/java/\;${SIMGRID_JAR}") + SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/deprecated/java/\;${CMAKE_BINARY_DIR}/teshsuite/deprecated/java/\;${SIMGRID_JAR}") STRING(REPLACE "\;" "§" TESH_CLASSPATH "${TESH_CLASSPATH}") ELSE() - SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/java/:${CMAKE_BINARY_DIR}/teshsuite/java/:${SIMGRID_JAR}") + SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/deprecated/java/:${CMAKE_BINARY_DIR}/teshsuite/deprecated/java/:${SIMGRID_JAR}") ENDIF() ENDIF() IF(SIMGRID_HAVE_MC) - ADD_TESH_FACTORIES(mc-bugged1 "ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh) - ADD_TESH_FACTORIES(mc-bugged2 "ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh) + ADD_TESH_FACTORIES(mc-bugged1 "ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/examples/deprecated/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/mc bugged1.tesh) + ADD_TESH_FACTORIES(mc-bugged2 "ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/examples/deprecated/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/mc bugged2.tesh) IF(HAVE_UCONTEXT_CONTEXTS AND SIMGRID_PROCESSOR_x86_64) # liveness model-checking works only on 64bits (for now ...) - ADD_TESH(mc-bugged1-liveness-ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1_liveness.tesh) - ADD_TESH(mc-bugged1-liveness-ucontext-sparse --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1_liveness_sparse.tesh) - ADD_TESH(mc-bugged1-liveness-visited-ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1_liveness_visited.tesh) - ADD_TESH(mc-bugged1-liveness-visited-ucontext-sparse --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1_liveness_visited_sparse.tesh) + ADD_TESH(mc-bugged1-liveness-ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/deprecated/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/mc bugged1_liveness.tesh) + ADD_TESH(mc-bugged1-liveness-ucontext-sparse --setenv bindir=${CMAKE_BINARY_DIR}/examples/deprecated/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/mc bugged1_liveness_sparse.tesh) + ADD_TESH(mc-bugged1-liveness-visited-ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/deprecated/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/mc bugged1_liveness_visited.tesh) + ADD_TESH(mc-bugged1-liveness-visited-ucontext-sparse --setenv bindir=${CMAKE_BINARY_DIR}/examples/deprecated/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/mc bugged1_liveness_visited_sparse.tesh) IF(HAVE_C_STACK_CLEANER) # This test checks if the stack cleaner is making a difference: - ADD_TEST(mc-bugged1-liveness-stack-cleaner ${CMAKE_HOME_DIRECTORY}/examples/msg/mc/bugged1_liveness_stack_cleaner ${CMAKE_HOME_DIRECTORY}/examples/msg/mc/ ${CMAKE_BINARY_DIR}/examples/msg/mc/) + ADD_TEST(mc-bugged1-liveness-stack-cleaner ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/mc/bugged1_liveness_stack_cleaner ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/mc/ ${CMAKE_BINARY_DIR}/examples/deprecated/msg/mc/) ENDIF() ENDIF() ENDIF()