[examples] s4u-{barrier,mutex} -> s4u-synchro-*

diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt
index 42f6f42..9ae63e2 100644 (file)
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@ -4,16 +4,15 @@ foreach (example actor-create actor-daemon actor-join actor-kill
                  actor-lifetime actor-migration actor-suspend actor-yield
                  app-chainsend app-pingpong app-token-ring
                  async-ready async-wait async-waitany async-waitall async-waituntil
-                 barrier
                  cloud-capping cloud-migration cloud-simple
                  energy-exec energy-boot energy-link energy-vm
                  engine-filtering
                  exec-async exec-basic exec-dvfs exec-monitor exec-ptask exec-remote
                  io-async io-file-system io-file-remote io-storage-raw
-                 mutex
                  platform-failures platform-properties plugin-hostload 
                  replay-comm replay-storage
                  routing-get-clusters
+                 synchro-barrier synchro-mutex
                  trace-platform)
   add_executable       (s4u-${example}  ${example}/s4u-${example}.cpp)
   target_link_libraries(s4u-${example}  simgrid)
@@ -101,16 +100,16 @@ foreach(example actor-create actor-daemon actor-join actor-kill
                 actor-lifetime actor-migration actor-suspend actor-yield
                 app-bittorrent app-chainsend app-masterworkers app-pingpong app-token-ring 
                 async-ready async-wait async-waitall async-waitany async-waituntil
-                barrier
                 cloud-capping cloud-migration cloud-simple
                 dht-chord dht-kademlia
                 energy-exec energy-boot energy-link energy-vm
                 engine-filtering
                 exec-async exec-basic exec-dvfs exec-monitor exec-ptask exec-remote
-                platform-properties plugin-hostload mutex # FIXME: platform-failures is disabled
+                platform-properties plugin-hostload # FIXME: platform-failures is disabled
                 io-async io-file-system io-file-remote io-storage-raw
                 replay-comm replay-storage
                 routing-get-clusters
+                synchro-barrier synchro-mutex
                 )
   ADD_TESH_FACTORIES(s4u-${example} "thread;ucontext;raw;boost" 
                                     --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/${example} 

diff --git a/examples/s4u/README.rst b/examples/s4u/README.rst
index 0b7201b..a1f2bf4 100644 (file)
--- a/examples/s4u/README.rst
+++ b/examples/s4u/README.rst
@@ -209,11 +209,11 @@ Classical synchronization objects
 
  - **Mutex:**
    Shows how to use simgrid::s4u::Mutex synchronization objects.
-   |br| `examples/s4u/mutex/s4u-mutex.cpp <https://framagit.org/simgrid/simgrid/tree/master/examples/s4u/mutex/s4u-mutex.cpp>`_
+   |br| `examples/s4u/synchro-mutex/s4u-synchro-mutex.cpp <https://framagit.org/simgrid/simgrid/tree/master/examples/s4u/synchro-mutex/s4u-synchro-mutex.cpp>`_
 
  - **Barrier:**
    Shows how to use simgrid::s4u::Barrier synchronization objects.
-   |br| `examples/s4u/barrier/s4u-barrier.cpp <https://framagit.org/simgrid/simgrid/tree/master/examples/s4u/barrier/s4u-barrier.cpp>`_
+   |br| `examples/s4u/synchro-barrier/s4u-synchro-barrier.cpp <https://framagit.org/simgrid/simgrid/tree/master/examples/s4u/synchro-barrier/s4u-synchro-barrier.cpp>`_
 
 .............................
 Interacting with the platform

diff --git a/examples/s4u/barrier/s4u-barrier.cpp b/examples/s4u/synchro-barrier/s4u-synchro-barrier.cpp
similarity index 100%
rename from examples/s4u/barrier/s4u-barrier.cpp
rename to examples/s4u/synchro-barrier/s4u-synchro-barrier.cpp

diff --git a/examples/s4u/barrier/s4u-barrier.tesh b/examples/s4u/synchro-barrier/s4u-synchro-barrier.tesh
similarity index 91%
rename from examples/s4u/barrier/s4u-barrier.tesh
rename to examples/s4u/synchro-barrier/s4u-synchro-barrier.tesh
index d1d07a2..56dd082 100644 (file)
--- a/examples/s4u/barrier/s4u-barrier.tesh
+++ b/examples/s4u/synchro-barrier/s4u-synchro-barrier.tesh
@@ -1,18 +1,18 @@
 #!/usr/bin/env tesh
 
-$ $SG_TEST_EXENV ${bindir:=.}/s4u-barrier 1
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-synchro-barrier 1
 > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Spawning 0 workers
 > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Waiting on the barrier
 > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Bye
 
-$ $SG_TEST_EXENV ${bindir:=.}/s4u-barrier 2
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-synchro-barrier 2
 > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Spawning 1 workers
 > [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] Waiting on the barrier
 > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Waiting on the barrier
 > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Bye
 > [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] Bye
 
-$ $SG_TEST_EXENV ${bindir:=.}/s4u-barrier 3
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-synchro-barrier 3
 > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Spawning 2 workers
 > [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] Waiting on the barrier
 > [Jupiter:worker:(3) 0.000000] [s4u_test/INFO] Waiting on the barrier
@@ -21,7 +21,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-barrier 3
 > [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] Bye
 > [Jupiter:worker:(3) 0.000000] [s4u_test/INFO] Bye
 
-$ $SG_TEST_EXENV ${bindir:=.}/s4u-barrier 10
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-synchro-barrier 10
 > [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Spawning 9 workers
 > [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] Waiting on the barrier
 > [Jupiter:worker:(3) 0.000000] [s4u_test/INFO] Waiting on the barrier

diff --git a/examples/s4u/mutex/.gitignore b/examples/s4u/synchro-mutex/.gitignore
similarity index 100%
rename from examples/s4u/mutex/.gitignore
rename to examples/s4u/synchro-mutex/.gitignore

diff --git a/examples/s4u/mutex/s4u-mutex.cpp b/examples/s4u/synchro-mutex/s4u-synchro-mutex.cpp
similarity index 100%
rename from examples/s4u/mutex/s4u-mutex.cpp
rename to examples/s4u/synchro-mutex/s4u-synchro-mutex.cpp

diff --git a/examples/s4u/mutex/s4u-mutex.tesh b/examples/s4u/synchro-mutex/s4u-synchro-mutex.tesh
similarity index 97%
rename from examples/s4u/mutex/s4u-mutex.tesh
rename to examples/s4u/synchro-mutex/s4u-synchro-mutex.tesh
index ac3127f..94bf0ec 100644 (file)
--- a/examples/s4u/mutex/s4u-mutex.tesh
+++ b/examples/s4u/synchro-mutex/s4u-synchro-mutex.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ $SG_TEST_EXENV ${bindir:=.}/s4u-mutex
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-synchro-mutex
 > [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a lock_guard
 > [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] I'm done, good bye
 > [Tremblay:worker:(3) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a regular lock