rename an example to stick to the function name

diff --git a/.gitignore b/.gitignore
index 5af3b34..14b64d5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -150,7 +150,7 @@ examples/s4u/actor-daemon/s4u-actor-daemon
 examples/s4u/actor-join/s4u-actor-join
 examples/s4u/actor-kill/s4u-actor-kill
 examples/s4u/actor-lifetime/s4u-actor-lifetime
 examples/s4u/actor-join/s4u-actor-join
 examples/s4u/actor-kill/s4u-actor-kill
 examples/s4u/actor-lifetime/s4u-actor-lifetime

-examples/s4u/actor-migration/s4u-actor-migration
+examples/s4u/actor-migrate/s4u-actor-migrate

 examples/s4u/actor-suspend/s4u-actor-suspend
 examples/s4u/actor-yield/s4u-actor-yield
 examples/s4u/app-bittorrent/s4u-bittorrent
 examples/s4u/actor-suspend/s4u-actor-suspend
 examples/s4u/actor-yield/s4u-actor-yield
 examples/s4u/app-bittorrent/s4u-bittorrent

diff --git a/examples/python/CMakeLists.txt b/examples/python/CMakeLists.txt
index b230d30..7ba5189 100644 (file)
--- a/examples/python/CMakeLists.txt
+++ b/examples/python/CMakeLists.txt
@@ -1,4 +1,4 @@
-foreach(example actor-create actor-join actor-migration actor-yield 
+foreach(example actor-create actor-join actor-migrate actor-yield 

                 exec-basic)
   set(tesh_files    ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/${example}/${example}.tesh)
   set(examples_src  ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${example}/${example}.py)
                 exec-basic)
   set(tesh_files    ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/${example}/${example}.tesh)
   set(examples_src  ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${example}/${example}.py)

diff --git a/examples/python/actor-migration/actor-migration.py b/examples/python/actor-migrate/actor-migrate.py
similarity index 100%
rename from examples/python/actor-migration/actor-migration.py
rename to examples/python/actor-migrate/actor-migrate.py

diff --git a/examples/python/actor-migration/actor-migration.tesh b/examples/python/actor-migrate/actor-migrate.tesh
similarity index 81%
rename from examples/python/actor-migration/actor-migration.tesh
rename to examples/python/actor-migrate/actor-migrate.tesh
index 50745bf..4ec3fca 100644 (file)
--- a/examples/python/actor-migration/actor-migration.tesh
+++ b/examples/python/actor-migrate/actor-migrate.tesh
@@ -2,7 +2,7 @@
 
 p Testing the actor migration feature 
 
 
 p Testing the actor migration feature 
 

-$ python3 ${bindir:=.}/actor-migration.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
+$ python3 ${bindir:=.}/actor-migrate.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"

 > [  0.000000] (worker@Fafard) Let's move to Boivin to execute 1177.14 Mflops (5sec on Boivin and 5sec on Jacquelin)
 > [  5.000000] (monitor@Boivin) After 5 seconds, move the process to Jacquelin
 > [ 10.000000] (worker@Jacquelin) I wake up on Jacquelin. Let's suspend a bit
 > [  0.000000] (worker@Fafard) Let's move to Boivin to execute 1177.14 Mflops (5sec on Boivin and 5sec on Jacquelin)
 > [  5.000000] (monitor@Boivin) After 5 seconds, move the process to Jacquelin
 > [ 10.000000] (worker@Jacquelin) I wake up on Jacquelin. Let's suspend a bit

diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt
index b9ed396..2261ce8 100644 (file)
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@ -1,7 +1,7 @@
 # THIS IS ONLY FOR THE FILES. To add your test (tesh) as well, make sure you add
 # the same at the bottom of the file as well.
 foreach (example actor-create actor-daemon actor-join actor-kill
 # THIS IS ONLY FOR THE FILES. To add your test (tesh) as well, make sure you add
 # the same at the bottom of the file as well.
 foreach (example actor-create actor-daemon actor-join actor-kill

-                 actor-lifetime actor-migration actor-suspend actor-yield
+                 actor-lifetime actor-migrate actor-suspend actor-yield

                  app-chainsend app-pingpong app-token-ring
                  async-ready async-wait async-waitany async-waitall async-waituntil
                  cloud-capping cloud-migration cloud-simple
                  app-chainsend app-pingpong app-token-ring
                  async-ready async-wait async-waitany async-waitall async-waituntil
                  cloud-capping cloud-migration cloud-simple


@@ -97,7 +97,7 @@ set(txt_files     ${txt_files}    ${CMAKE_CURRENT_SOURCE_DIR}/replay-comm/s4u-re
                                   ${CMAKE_CURRENT_SOURCE_DIR}/README.rst                                   PARENT_SCOPE)
 
 foreach(example actor-create actor-daemon actor-join actor-kill
                                   ${CMAKE_CURRENT_SOURCE_DIR}/README.rst                                   PARENT_SCOPE)
 
 foreach(example actor-create actor-daemon actor-join actor-kill

-                actor-lifetime actor-migration actor-suspend actor-yield
+                actor-lifetime actor-migrate 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
                 cloud-capping cloud-migration cloud-simple
                 app-bittorrent app-chainsend app-masterworkers app-pingpong app-token-ring 
                 async-ready async-wait async-waitall async-waitany async-waituntil
                 cloud-capping cloud-migration cloud-simple

diff --git a/examples/s4u/README.rst b/examples/s4u/README.rst
index 48bded2..8c6c87b 100644 (file)
--- a/examples/s4u/README.rst
+++ b/examples/s4u/README.rst
@@ -69,9 +69,9 @@ Inter-Actors Interactions
 
   - **Migrating Actors:**
     Actors can move or be moved from a host to another very easily.
 
   - **Migrating Actors:**
     Actors can move or be moved from a host to another very easily.

-    |br| |cpp| `examples/s4u/actor-migration/s4u-actor-migration.cpp <https://framagit.org/simgrid/simgrid/tree/master/examples/s4u/actor-migration/s4u-actor-migration.cpp>`_
+    |br| |cpp| `examples/s4u/actor-migrate/s4u-actor-migrate.cpp <https://framagit.org/simgrid/simgrid/tree/master/examples/s4u/actor-migrate/s4u-actor-migrate.cpp>`_

     :cpp:func:`simgrid::s4u::this_actor::migrate()` |cpp|
     :cpp:func:`simgrid::s4u::this_actor::migrate()` |cpp|

-    |br|  |py| `examples/python/actor-migration/actor-migration.py <https://framagit.org/simgrid/simgrid/tree/master/examples/python/actor-migration/actor-migration.py>`_
+    |br|  |py| `examples/python/actor-migrate/actor-migrate.py <https://framagit.org/simgrid/simgrid/tree/master/examples/python/actor-migrate/actor-migrate.py>`_

     :py:func:`simgrid.this_actor.migrate()` |py|
 
   - **Waiting for the termination of an actor:** (joining on it)
     :py:func:`simgrid.this_actor.migrate()` |py|
 
   - **Waiting for the termination of an actor:** (joining on it)


@@ -79,7 +79,7 @@ Inter-Actors Interactions
     |br| |cpp| `examples/s4u/actor-join/s4u-actor-join.cpp <https://framagit.org/simgrid/simgrid/tree/master/examples/s4u/actor-join/s4u-actor-join.cpp>`_
     :cpp:func:`simgrid::s4u::Actor::join()` |cpp|
     |br| |py| `examples/python/actor-join/actor-join.py <https://framagit.org/simgrid/simgrid/tree/master/examples/python/actor-join/actor-join.py>`_
     |br| |cpp| `examples/s4u/actor-join/s4u-actor-join.cpp <https://framagit.org/simgrid/simgrid/tree/master/examples/s4u/actor-join/s4u-actor-join.cpp>`_
     :cpp:func:`simgrid::s4u::Actor::join()` |cpp|
     |br| |py| `examples/python/actor-join/actor-join.py <https://framagit.org/simgrid/simgrid/tree/master/examples/python/actor-join/actor-join.py>`_

-    :cpp:func:`simgrid.Actor.join()` |py|
+    :py:func:`simgrid.Actor.join()` |py|

 
   - **Yielding to other actors**.
     The ```yield()``` function interrupts the execution of the current
 
   - **Yielding to other actors**.
     The ```yield()``` function interrupts the execution of the current

diff --git a/examples/s4u/actor-migration/s4u-actor-migration.cpp b/examples/s4u/actor-migrate/s4u-actor-migrate.cpp
similarity index 100%
rename from examples/s4u/actor-migration/s4u-actor-migration.cpp
rename to examples/s4u/actor-migrate/s4u-actor-migrate.cpp

diff --git a/examples/s4u/actor-migration/s4u-actor-migration.tesh b/examples/s4u/actor-migrate/s4u-actor-migrate.tesh
similarity index 80%
rename from examples/s4u/actor-migration/s4u-actor-migration.tesh
rename to examples/s4u/actor-migrate/s4u-actor-migrate.tesh
index 5e6e383..ef8867a 100644 (file)
--- a/examples/s4u/actor-migration/s4u-actor-migration.tesh
+++ b/examples/s4u/actor-migrate/s4u-actor-migrate.tesh
@@ -2,7 +2,7 @@
 
 p Testing the actor migration feature 
 
 
 p Testing the actor migration feature 
 

-$ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-migration ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-migrate ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"

 > [  0.000000] (worker@Fafard) Let's move to Boivin to execute 1177.14 Mflops (5sec on Boivin and 5sec on Jacquelin)
 > [  5.000000] (monitor@Boivin) After 5 seconds, move the process to Jacquelin
 > [ 10.000000] (worker@Jacquelin) I wake up on Jacquelin. Let's suspend a bit
 > [  0.000000] (worker@Fafard) Let's move to Boivin to execute 1177.14 Mflops (5sec on Boivin and 5sec on Jacquelin)
 > [  5.000000] (monitor@Boivin) After 5 seconds, move the process to Jacquelin
 > [ 10.000000] (worker@Jacquelin) I wake up on Jacquelin. Let's suspend a bit