s|s4u_|s4u-|

diff --git a/.gitignore b/.gitignore
index 5c80711..7275993 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -189,22 +189,24 @@ examples/msg/trace-masterworker/trace-masterworker
 examples/msg/trace-process-migration/trace-process-migration
 examples/msg/trace-platform/trace-platform
 examples/msg/trace-host-user-variables/trace-host-user-variables
 examples/msg/trace-process-migration/trace-process-migration
 examples/msg/trace-platform/trace-platform
 examples/msg/trace-host-user-variables/trace-host-user-variables

-examples/s4u/app-masterworker/s4u_app-masterworker
-examples/s4u/app-pingpong/s4u_app-pingpong
-examples/s4u/app-token-ring/s4u_app-token-ring
-examples/s4u/actions-comm/s4u_actions-comm
-examples/s4u/actions-storage/s4u_actions-storage
-examples/s4u/actor-create/s4u_actor-create
-examples/s4u/actor-daemon/s4u_actor-daemon
-examples/s4u/actor-kill/s4u_actor-kill
-examples/s4u/actor-migration/s4u_actor-migration
-examples/s4u/actor-suspend/s4u_actor-suspend
-examples/s4u/basic/s4u_basic
-examples/s4u/basic/s4u_basic_deployment
-examples/s4u/basic/s4u_basic_function
-examples/s4u/dht-chord/s4u_dht-chord
-examples/s4u/io/s4u_io
-examples/s4u/mutex/s4u_mutex
+examples/s4u/actions-comm/s4u-actions-comm
+examples/s4u/actions-storage/s4u-actions-storage
+examples/s4u/actor-create/s4u-actor-create
+examples/s4u/actor-daemon/s4u-actor-daemon
+examples/s4u/actor-kill/s4u-actor-kill
+examples/s4u/actor-migration/s4u-actor-migration
+examples/s4u/actor-suspend/s4u-actor-suspend
+examples/s4u/app-masterworker/s4u-app-masterworker
+examples/s4u/app-pingpong/s4u-app-pingpong
+examples/s4u/app-token-ring/s4u-app-token-ring
+examples/s4u/async-waitall/s4u-async-waitall
+examples/s4u/async-waitany/s4u-async-waitany
+examples/s4u/basic/s4u-basic
+examples/s4u/basic/s4u-basic_deployment
+examples/s4u/basic/s4u-basic_function
+examples/s4u/dht-chord/s4u-dht-chord
+examples/s4u/io/s4u-io
+examples/s4u/mutex/s4u-mutex

 examples/simdag/daxload/sd_daxload
 examples/simdag/dag-dotload/sd_dag-dotload
 examples/simdag/ptg-dotload/sd_ptg-dotload
 examples/simdag/daxload/sd_daxload
 examples/simdag/dag-dotload/sd_dag-dotload
 examples/simdag/ptg-dotload/sd_ptg-dotload

diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt
index 7713645..5c74c9c 100644 (file)
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@ -1,53 +1,59 @@
-foreach (example actions-comm actions-storage actor-create actor-daemon actor-kill actor-migration actor-suspend 
-                 app-masterworker app-pingpong app-token-ring plugin-hostload io mutex async-waitany async-waitall)
-  add_executable       (s4u_${example}  ${example}/s4u_${example}.cpp)
-  target_link_libraries(s4u_${example}  simgrid)
-  set_target_properties(s4u_${example}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${example})
+foreach (example actions-comm actions-storage 
+                 actor-create actor-daemon actor-kill actor-migration actor-suspend 
+                 app-masterworker app-pingpong app-token-ring
+                async-waitany async-waitall
+                plugin-hostload io mutex)
+  add_executable       (s4u-${example}  ${example}/s4u-${example}.cpp)
+  target_link_libraries(s4u-${example}  simgrid)
+  set_target_properties(s4u-${example}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${example})

 
 

-  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${example}/s4u_${example}.tesh)
-  set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/${example}/s4u_${example}.cpp)
+  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${example}/s4u-${example}.tesh)
+  set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/${example}/s4u-${example}.cpp)

 endforeach()
 
 # CHORD EXAMPLE
 endforeach()
 
 # CHORD EXAMPLE

-add_executable       (s4u_dht-chord dht-chord/s4u_dht-chord.cpp dht-chord/node.cpp)
-target_link_libraries(s4u_dht-chord simgrid)
-set_target_properties(s4u_dht-chord PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dht-chord)
-foreach (file s4u_dht-chord node)
+add_executable       (s4u-dht-chord dht-chord/s4u-dht-chord.cpp dht-chord/node.cpp)
+target_link_libraries(s4u-dht-chord simgrid)
+set_target_properties(s4u-dht-chord PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dht-chord)
+foreach (file s4u-dht-chord node)

   set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/${file}.cpp)
 endforeach()
   set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/${file}.cpp)
 endforeach()

-set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u_dht-chord.hpp)
+set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord.hpp)

 
 

-add_executable       (s4u_bittorrent app-bittorrent/s4u_bittorrent.cpp app-bittorrent/s4u_peer.cpp
-                      app-bittorrent/s4u_tracker.cpp)
-target_link_libraries(s4u_bittorrent simgrid)
-set_target_properties(s4u_bittorrent PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/app-bittorrent)
-foreach (file s4u_bittorrent s4u_peer s4u_tracker)
+add_executable       (s4u-bittorrent app-bittorrent/s4u-bittorrent.cpp app-bittorrent/s4u-peer.cpp
+                      app-bittorrent/s4u-tracker.cpp)
+target_link_libraries(s4u-bittorrent simgrid)
+set_target_properties(s4u-bittorrent PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/app-bittorrent)
+foreach (file s4u-bittorrent s4u-peer s4u-tracker)

   set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/${file}.cpp
                                      ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/${file}.hpp)
 endforeach()
 
 set(examples_src  ${examples_src}                                                                          PARENT_SCOPE)
   set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/${file}.cpp
                                      ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/${file}.hpp)
 endforeach()
 
 set(examples_src  ${examples_src}                                                                          PARENT_SCOPE)

-set(tesh_files    ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/s4u_app-bittorrent.tesh
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u_dht-chord.tesh
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u_dht-chord.tesh
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/async-waitany/s4u_async-waitany.tesh
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/async-waitall/s4u_async-waitall.tesh         PARENT_SCOPE)
-set(xml_files     ${xml_files}    ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_actions-comm_split_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_actions-comm_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/actions-storage/s4u_actions-storage_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/actor-create/s4u_actor-create_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/s4u_app-bittorrent_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/s4u_app-masterworker_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/async-waitany/s4u_async-waitany_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/async-waitany/s4u_async-waitall_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u_dht-chord_d.xml                PARENT_SCOPE)
-set(txt_files     ${txt_files}    ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_actions-comm_split_p0.txt
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_actions-comm_split_p1.txt
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_actions-comm.txt
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/actions-storage/s4u_actions-storage.txt
+set(tesh_files    ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/s4u-app-bittorrent.tesh
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord.tesh
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord.tesh
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/async-waitany/s4u-async-waitany.tesh
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/async-waitall/s4u-async-waitall.tesh         PARENT_SCOPE)
+set(xml_files     ${xml_files}    ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u-actions-comm-split_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u-actions-comm_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/actions-storage/s4u-actions-storage_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/actor-create/s4u-actor-create_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/s4u-app-bittorrent_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/s4u-app-masterworker_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/async-waitany/s4u-async-waitany_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/async-waitall/s4u-async-waitall_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord_d.xml                PARENT_SCOPE)
+set(txt_files     ${txt_files}    ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u-actions-comm-split-p0.txt
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u-actions-comm-split-p1.txt
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u-actions-comm.txt
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/actions-storage/s4u-actions-storage.txt

                                   ${CMAKE_CURRENT_SOURCE_DIR}/README.doc                                   PARENT_SCOPE)
 
                                   ${CMAKE_CURRENT_SOURCE_DIR}/README.doc                                   PARENT_SCOPE)
 

-foreach(example actions-comm actions-storage actor-create actor-daemon actor-kill actor-migration actor-suspend 
-                app-bittorrent app-masterworker app-pingpong app-token-ring dht-chord plugin-hostload io mutex async-waitall async-waitany )
-  ADD_TESH_FACTORIES(s4u-${example} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/${example} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example} s4u_${example}.tesh)
+foreach(example actions-comm actions-storage 
+                actor-create actor-daemon actor-kill actor-migration actor-suspend
+                app-bittorrent app-masterworker app-pingpong app-token-ring 
+               async-waitall async-waitany
+               dht-chord plugin-hostload io mutex)
+  ADD_TESH_FACTORIES(s4u-${example} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/${example} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example} s4u-${example}.tesh)

 endforeach()
 endforeach()

diff --git a/examples/s4u/README.doc b/examples/s4u/README.doc
index d566c5a..78c9933 100644 (file)
--- a/examples/s4u/README.doc
+++ b/examples/s4u/README.doc
@@ -21,32 +21,32 @@ documentation, but it should remain readable directly.
 
 @section s4u_ex_basics Basics of SimGrid simulation
 
 
 @section s4u_ex_basics Basics of SimGrid simulation
 

-  - <b>Creating actors:</b> @ref examples/s4u/actor-create/s4u_actor-create.cpp and 
-    @ref examples/s4u/actor-create/s4u_actor-create_d.xml \n
+  - <b>Creating actors:</b> @ref examples/s4u/actor-create/s4u-actor-create.cpp and 
+    @ref examples/s4u/actor-create/s4u-actor-create_d.xml \n

     Shows how to start your actors to populate your simulation.
 
     Shows how to start your actors to populate your simulation.
 

-  - <b>Ping Pong</b>: @ref examples/s4u/app-pingpong/s4u_app-pingpong.c\n
+  - <b>Ping Pong</b>: @ref examples/s4u/app-pingpong/s4u-app-pingpong.c\n

    It's hard to think of a simpler example: it is just sending one message back and forth.
    The tesh file laying in the directory show how to start the simulator binary, highlighting how to pass options to 
    the simulators (as detailed in Section \ref options). 
 
    It's hard to think of a simpler example: it is just sending one message back and forth.
    The tesh file laying in the directory show how to start the simulator binary, highlighting how to pass options to 
    the simulators (as detailed in Section \ref options). 
 

-  - <b>Token ring:</b> @ref examples/s4u/app-token-ring/s4u_app-token-ring.cpp \n
+  - <b>Token ring:</b> @ref examples/s4u/app-token-ring/s4u-app-token-ring.cpp \n

     Shows how to implement a classical communication pattern, where a token is exchanged along a ring to reach every
     participant.
 
     Shows how to implement a classical communication pattern, where a token is exchanged along a ring to reach every
     participant.
 

-  - <b>Master Workers:</b> @ref examples/s4u/app-masterworker/s4u_app-masterworker.cpp \n
+  - <b>Master Workers:</b> @ref examples/s4u/app-masterworker/s4u-app-masterworker.cpp \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_async Asynchronous communications
 
  - <b>Waiting for all communications in a set</b>.
     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_async Asynchronous communications
 
  - <b>Waiting for all communications in a set</b>.

-   @ref examples/s4u/async-waitall/s4u_async-waitall.cpp\n
+   @ref examples/s4u/async-waitall/s4u-async-waitall.cpp\n

    The @ref simgrid::s4u::Comm::wait_all() function is useful when you want to block
    until all activities in a given set have completed.
 
  - <b>Waiting for the first completed communication in a set</b>.
    The @ref simgrid::s4u::Comm::wait_all() function is useful when you want to block
    until all activities in a given set have completed.
 
  - <b>Waiting for the first completed communication in a set</b>.

-   @ref examples/s4u/async-waitany/s4u_async-waitany.cpp\n
+   @ref examples/s4u/async-waitany/s4u-async-waitany.cpp\n

    The @ref simgrid::s4u::Comm::wait_any() function is useful when you want to block
    until one activity of the set completes, no matter which terminates
    first.   
    The @ref simgrid::s4u::Comm::wait_any() function is useful when you want to block
    until one activity of the set completes, no matter which terminates
    first.   


@@ -54,30 +54,30 @@ documentation, but it should remain readable directly.
 @section s4u_ex_actors Acting on Actors
 
   - <b>Creating actors</b>. 
 @section s4u_ex_actors Acting on Actors
 
   - <b>Creating actors</b>. 

-    @ref examples/s4u/actor-create/s4u_actor-create.cpp \n
+    @ref examples/s4u/actor-create/s4u-actor-create.cpp \n

     Most actors are started from the deployment XML file, but they exist other methods.
 
   - <b>Daemonize actors</b>
     Most actors are started from the deployment XML file, but they exist other methods.
 
   - <b>Daemonize actors</b>

-    @ref examples/s4u/actor-daemon/s4u_actor-daemon.cpp \n
+    @ref examples/s4u/actor-daemon/s4u-actor-daemon.cpp \n

     Some actors may be intended to simulate daemons that run in background. This example show how to transform a regular
     actor into a daemon that will be automatically killed once the simulation is over. 
 
   - <b>Suspend and Resume actors</b>.
     Some actors may be intended to simulate daemons that run in background. This example show how to transform a regular
     actor into a daemon that will be automatically killed once the simulation is over. 
 
   - <b>Suspend and Resume actors</b>.

-    @ref examples/s4u/actor-suspend/s4u_actor-suspend.cpp \n
+    @ref examples/s4u/actor-suspend/s4u-actor-suspend.cpp \n

     Actors can be suspended and resumed during their executions
     thanks to the @ref suspend and @ref resume methods.
 
   - <b>Kill actors</b>.
     Actors can be suspended and resumed during their executions
     thanks to the @ref suspend and @ref resume methods.
 
   - <b>Kill actors</b>.

-    @ref examples/s4u/actor-kill/s4u_actor-kill.cpp \n
+    @ref examples/s4u/actor-kill/s4u-actor-kill.cpp \n

     Actors can forcefully stop other actors with the @ref kill method.
 
   - <b>Migrating Actors</b>.
     Actors can forcefully stop other actors with the @ref kill method.
 
   - <b>Migrating Actors</b>.

-    @ref examples/s4u/actor-migration/s4u_actor-migration.cpp \n
+    @ref examples/s4u/actor-migration/s4u-actor-migration.cpp \n

     Actors can move or be moved from a host to another with the @ref migrate method.
 
 @section s4u_ex_synchro Inter-Actor Synchronization 
 
     Actors can move or be moved from a host to another with the @ref migrate method.
 
 @section s4u_ex_synchro Inter-Actor Synchronization 
 

- - <b>Mutex: </b> @ref examples/s4u/mutex/s4u_mutex.cpp \n
+ - <b>Mutex: </b> @ref examples/s4u/mutex/s4u-mutex.cpp \n

    Shows how to use simgrid::s4u::Mutex synchronization objects.
 
 @section s4u_ex_actions Following Workload Traces
    Shows how to use simgrid::s4u::Mutex synchronization objects.
 
 @section s4u_ex_actions Following Workload Traces


@@ -99,30 +99,30 @@ with, but the second is more efficient on very large traces. Check
 also the tesh files in the example directories for details.
 
   - <b>Communication replay</b>.
 also the tesh files in the example directories for details.
 
   - <b>Communication replay</b>.

-    @ref examples/s4u/actions-comm/s4u_actions-comm.cpp \n
+    @ref examples/s4u/actions-comm/s4u-actions-comm.cpp \n

     Presents a set of event handlers reproducing classical communication
     primitives (asynchronous send/receive at the moment).
 
   - <b>I/O replay</b>.
     Presents a set of event handlers reproducing classical communication
     primitives (asynchronous send/receive at the moment).
 
   - <b>I/O replay</b>.

-    @ref examples/s4u/actions-storage/s4u_actions-storage.cpp \n
+    @ref examples/s4u/actions-storage/s4u-actions-storage.cpp \n

     Presents a set of event handlers reproducing classical I/O
     primitives (open, read, close).
 
 */
 
 /**
     Presents a set of event handlers reproducing classical I/O
     primitives (open, read, close).
 
 */
 
 /**

-@example examples/s4u/actions-comm/s4u_actions-comm.cpp
-@example examples/s4u/actions-storage/s4u_actions-storage.cpp
-@example examples/s4u/actor-create/s4u_actor-create.cpp
-@example examples/s4u/actor-create/s4u_actor-create_d.xml
-@example examples/s4u/actor-daemon/s4u_actor-daemon.cpp
-@example examples/s4u/actor-kill/s4u_actor-kill.cpp
-@example examples/s4u/actor-migration/s4u_actor-migration.cpp
-@example examples/s4u/actor-suspend/s4u_actor-suspend.cpp
-@example examples/s4u/app-token-ring/s4u_app-token-ring.cpp
-@example examples/s4u/app-masterworker/s4u_app-masterworker.cpp
-@example examples/s4u/app-pingpong/s4u_app-pingpong.cpp
-
-@example examples/s4u/mutex/s4u_mutex.cpp
+@example examples/s4u/actions-comm/s4u-actions-comm.cpp
+@example examples/s4u/actions-storage/s4u-actions-storage.cpp
+@example examples/s4u/actor-create/s4u-actor-create.cpp
+@example examples/s4u/actor-create/s4u-actor-create_d.xml
+@example examples/s4u/actor-daemon/s4u-actor-daemon.cpp
+@example examples/s4u/actor-kill/s4u-actor-kill.cpp
+@example examples/s4u/actor-migration/s4u-actor-migration.cpp
+@example examples/s4u/actor-suspend/s4u-actor-suspend.cpp
+@example examples/s4u/app-token-ring/s4u-app-token-ring.cpp
+@example examples/s4u/app-masterworker/s4u-app-masterworker.cpp
+@example examples/s4u/app-pingpong/s4u-app-pingpong.cpp
+
+@example examples/s4u/mutex/s4u-mutex.cpp

 
 */
\ No newline at end of file
 
 */
\ No newline at end of file

diff --git a/examples/s4u/actions-comm/s4u_actions-comm_split_p0.txt b/examples/s4u/actions-comm/s4u-actions-comm-split-p0.txt
similarity index 100%
rename from examples/s4u/actions-comm/s4u_actions-comm_split_p0.txt
rename to examples/s4u/actions-comm/s4u-actions-comm-split-p0.txt

diff --git a/examples/s4u/actions-comm/s4u_actions-comm_split_p1.txt b/examples/s4u/actions-comm/s4u-actions-comm-split-p1.txt
similarity index 100%
rename from examples/s4u/actions-comm/s4u_actions-comm_split_p1.txt
rename to examples/s4u/actions-comm/s4u-actions-comm-split-p1.txt

diff --git a/examples/s4u/actions-comm/s4u_actions-comm_split_d.xml b/examples/s4u/actions-comm/s4u-actions-comm-split_d.xml
similarity index 77%
rename from examples/s4u/actions-comm/s4u_actions-comm_split_d.xml
rename to examples/s4u/actions-comm/s4u-actions-comm-split_d.xml
index 71d521a..993a803 100644 (file)
--- a/examples/s4u/actions-comm/s4u_actions-comm_split_d.xml
+++ b/examples/s4u/actions-comm/s4u-actions-comm-split_d.xml
@@ -3,12 +3,12 @@
 <platform version="4.1">
 <!-- Example file of how to use trace replay, with actions split in separate files, one per actor.
      Launch it like this:
 <platform version="4.1">
 <!-- Example file of how to use trace replay, with actions split in separate files, one per actor.
      Launch it like this:

-         ./actions-comm ../../platforms/platform.xml actions-comm_split_d.xml  -->
+         ./actions-comm ../../platforms/platform.xml actions-comm-split_d.xml  -->

 
   <actor host="Tremblay" function="p0">
 
   <actor host="Tremblay" function="p0">

-    <argument value="s4u_actions-comm_split_p0.txt"/>
+    <argument value="s4u-actions-comm-split-p0.txt"/>

   </actor>
   <actor host="Ruby"     function="p1">
   </actor>
   <actor host="Ruby"     function="p1">

-    <argument value="s4u_actions-comm_split_p1.txt"/>
+    <argument value="s4u-actions-comm-split-p1.txt"/>

   </actor>
 </platform>
   </actor>
 </platform>

diff --git a/examples/s4u/actions-comm/s4u_actions-comm.cpp b/examples/s4u/actions-comm/s4u-actions-comm.cpp
similarity index 100%
rename from examples/s4u/actions-comm/s4u_actions-comm.cpp
rename to examples/s4u/actions-comm/s4u-actions-comm.cpp

diff --git a/examples/s4u/actions-comm/s4u_actions-comm.tesh b/examples/s4u/actions-comm/s4u-actions-comm.tesh
similarity index 71%
rename from examples/s4u/actions-comm/s4u_actions-comm.tesh
rename to examples/s4u/actions-comm/s4u-actions-comm.tesh
index 3c133b0..53e6b04 100644 (file)
--- a/examples/s4u/actions-comm/s4u_actions-comm.tesh
+++ b/examples/s4u/actions-comm/s4u-actions-comm.tesh
@@ -1,12 +1,12 @@
 ! output sort 19
 ! output sort 19

-$ ${bindir:=.}/s4u_actions-comm --log=actions.thres=verbose ${srcdir:=.}/small_platform_fatpipe.xml s4u_actions-comm_split_d.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
+$ ${bindir:=.}/s4u-actions-comm --log=actions.thres=verbose ${srcdir:=.}/small_platform_fatpipe.xml s4u-actions-comm-split_d.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"

 > [ 20.703314] (p0@Tremblay) p0 recv p1 20.703314
 > [ 20.703314] (p1@Ruby) p1 send p0 1e10 20.703314
 > [ 30.897513] (p0@Tremblay) p0 compute 1e9 10.194200
 > [ 30.897513] (p1@Ruby) p1 compute 1e9 10.194200
 > [ 30.897513] (maestro@) Simulation time 30.8975
 
 > [ 20.703314] (p0@Tremblay) p0 recv p1 20.703314
 > [ 20.703314] (p1@Ruby) p1 send p0 1e10 20.703314
 > [ 30.897513] (p0@Tremblay) p0 compute 1e9 10.194200
 > [ 30.897513] (p1@Ruby) p1 compute 1e9 10.194200
 > [ 30.897513] (maestro@) Simulation time 30.8975
 

-$ ${bindir:=.}/s4u_actions-comm --log=actions.thres=verbose ${srcdir:=.}/small_platform_fatpipe.xml s4u_actions-comm_d.xml s4u_actions-comm.txt "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
+$ ${bindir:=.}/s4u-actions-comm --log=actions.thres=verbose ${srcdir:=.}/small_platform_fatpipe.xml s4u-actions-comm_d.xml s4u-actions-comm.txt "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"

 > [ 20.703314] (p0@Tremblay) p0 recv p1 20.703314
 > [ 20.703314] (p1@Ruby) p1 send p0 1e10 20.703314
 > [ 30.897513] (p0@Tremblay) p0 compute 1e9 10.194200
 > [ 20.703314] (p0@Tremblay) p0 recv p1 20.703314
 > [ 20.703314] (p1@Ruby) p1 send p0 1e10 20.703314
 > [ 30.897513] (p0@Tremblay) p0 compute 1e9 10.194200

diff --git a/examples/s4u/actions-comm/s4u_actions-comm.txt b/examples/s4u/actions-comm/s4u-actions-comm.txt
similarity index 100%
rename from examples/s4u/actions-comm/s4u_actions-comm.txt
rename to examples/s4u/actions-comm/s4u-actions-comm.txt

diff --git a/examples/s4u/actions-comm/s4u_actions-comm_d.xml b/examples/s4u/actions-comm/s4u-actions-comm_d.xml
similarity index 100%
rename from examples/s4u/actions-comm/s4u_actions-comm_d.xml
rename to examples/s4u/actions-comm/s4u-actions-comm_d.xml

diff --git a/examples/s4u/actions-storage/s4u_actions-storage.cpp b/examples/s4u/actions-storage/s4u-actions-storage.cpp
similarity index 100%
rename from examples/s4u/actions-storage/s4u_actions-storage.cpp
rename to examples/s4u/actions-storage/s4u-actions-storage.cpp

diff --git a/examples/s4u/actions-storage/s4u_actions-storage.tesh b/examples/s4u/actions-storage/s4u-actions-storage.tesh
similarity index 61%
rename from examples/s4u/actions-storage/s4u_actions-storage.tesh
rename to examples/s4u/actions-storage/s4u-actions-storage.tesh
index 9e6f09d..1881e68 100644 (file)
--- a/examples/s4u/actions-storage/s4u_actions-storage.tesh
+++ b/examples/s4u/actions-storage/s4u-actions-storage.tesh
@@ -1,5 +1,5 @@
 ! output sort 19
 ! output sort 19

-$ ${bindir:=.}/s4u_actions-storage --log=storage_actions.thres=verbose ${srcdir:=.}/storage/storage.xml s4u_actions-storage_d.xml s4u_actions-storage.txt "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
+$ ${bindir:=.}/s4u-actions-storage --log=storage_actions.thres=verbose ${srcdir:=.}/storage/storage.xml s4u-actions-storage_d.xml s4u-actions-storage.txt "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"

 > [  0.000000] (p0@denise) p0 open /home/lib/libsimgrid.so.3.6.2 0.000000
 > [  0.063552] (p0@denise) p0 read /home/lib/libsimgrid.so.3.6.2 12710497 0.063552
 > [  0.063552] (p0@denise) p0 close /home/lib/libsimgrid.so.3.6.2 0.000000
 > [  0.000000] (p0@denise) p0 open /home/lib/libsimgrid.so.3.6.2 0.000000
 > [  0.063552] (p0@denise) p0 read /home/lib/libsimgrid.so.3.6.2 12710497 0.063552
 > [  0.063552] (p0@denise) p0 close /home/lib/libsimgrid.so.3.6.2 0.000000

diff --git a/examples/s4u/actions-storage/s4u_actions-storage.txt b/examples/s4u/actions-storage/s4u-actions-storage.txt
similarity index 100%
rename from examples/s4u/actions-storage/s4u_actions-storage.txt
rename to examples/s4u/actions-storage/s4u-actions-storage.txt

diff --git a/examples/s4u/actions-storage/s4u_actions-storage_d.xml b/examples/s4u/actions-storage/s4u-actions-storage_d.xml
similarity index 100%
rename from examples/s4u/actions-storage/s4u_actions-storage_d.xml
rename to examples/s4u/actions-storage/s4u-actions-storage_d.xml

diff --git a/examples/s4u/actor-create/s4u_actor-create.cpp b/examples/s4u/actor-create/s4u-actor-create.cpp
similarity index 98%
rename from examples/s4u/actor-create/s4u_actor-create.cpp
rename to examples/s4u/actor-create/s4u-actor-create.cpp
index 0d72402..ca6cd9b 100644 (file)
--- a/examples/s4u/actor-create/s4u_actor-create.cpp
+++ b/examples/s4u/actor-create/s4u-actor-create.cpp
@@ -108,7 +108,7 @@ int main(int argc, char** argv)
 
   /* The third way to start your actors is to use a deployment file. */
   e->registerFunction<Receiver>("receiver");   // You first have to register the actor as with the second approach
 
   /* The third way to start your actors is to use a deployment file. */
   e->registerFunction<Receiver>("receiver");   // You first have to register the actor as with the second approach

-  e->loadDeployment("s4u_actor-create_d.xml"); // And then, you load the deployment file
+  e->loadDeployment("s4u-actor-create_d.xml"); // And then, you load the deployment file

 
   /* Once every actors are started in the engine, the simulation can start */
   e->run();
 
   /* Once every actors are started in the engine, the simulation can start */
   e->run();

diff --git a/examples/s4u/actor-create/s4u_actor-create.tesh b/examples/s4u/actor-create/s4u-actor-create.tesh
similarity index 93%
rename from examples/s4u/actor-create/s4u_actor-create.tesh
rename to examples/s4u/actor-create/s4u-actor-create.tesh
index e056a48..f907ba1 100644 (file)
--- a/examples/s4u/actor-create/s4u_actor-create.tesh
+++ b/examples/s4u/actor-create/s4u-actor-create.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
 #! ./tesh
 

-$ $SG_TEST_EXENV ${bindir:=.}/s4u_actor-create
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-create

 > [Tremblay:sender1:(1) 0.000000] [s4u_actor_create/INFO] Hello s4u, I have something to send
 > [Jupiter:sender2:(2) 0.000000] [s4u_actor_create/INFO] Hello s4u, I have something to send
 > [Fafard:receiver:(3) 0.000000] [s4u_actor_create/INFO] Hello s4u, I'm ready to get any message you'd want on mb42
 > [Tremblay:sender1:(1) 0.000000] [s4u_actor_create/INFO] Hello s4u, I have something to send
 > [Jupiter:sender2:(2) 0.000000] [s4u_actor_create/INFO] Hello s4u, I have something to send
 > [Fafard:receiver:(3) 0.000000] [s4u_actor_create/INFO] Hello s4u, I'm ready to get any message you'd want on mb42

diff --git a/examples/s4u/actor-create/s4u_actor-create_d.xml b/examples/s4u/actor-create/s4u-actor-create_d.xml
similarity index 100%
rename from examples/s4u/actor-create/s4u_actor-create_d.xml
rename to examples/s4u/actor-create/s4u-actor-create_d.xml

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

diff --git a/examples/s4u/actor-daemon/s4u_actor-daemon.tesh b/examples/s4u/actor-daemon/s4u-actor-daemon.tesh
similarity index 89%
rename from examples/s4u/actor-daemon/s4u_actor-daemon.tesh
rename to examples/s4u/actor-daemon/s4u-actor-daemon.tesh
index bc42237..ca9781e 100644 (file)
--- a/examples/s4u/actor-daemon/s4u_actor-daemon.tesh
+++ b/examples/s4u/actor-daemon/s4u-actor-daemon.tesh
@@ -2,7 +2,7 @@
 
 p Testing the process daemonization feature
 
 
 p Testing the process daemonization feature
 

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

 > [  0.000000] (worker@Boivin) Let's do some work (for 10 sec on Boivin).
 > [  0.000000] (daemon@Tremblay) Hello from the infinite loop
 > [  3.000000] (daemon@Tremblay) Hello from the infinite loop
 > [  0.000000] (worker@Boivin) Let's do some work (for 10 sec on Boivin).
 > [  0.000000] (daemon@Tremblay) Hello from the infinite loop
 > [  3.000000] (daemon@Tremblay) Hello from the infinite loop

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

diff --git a/examples/s4u/actor-kill/s4u_actor-kill.tesh b/examples/s4u/actor-kill/s4u-actor-kill.tesh
similarity index 86%
rename from examples/s4u/actor-kill/s4u_actor-kill.tesh
rename to examples/s4u/actor-kill/s4u-actor-kill.tesh
index 1492f44..0c876df 100644 (file)
--- a/examples/s4u/actor-kill/s4u_actor-kill.tesh
+++ b/examples/s4u/actor-kill/s4u-actor-kill.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
 #! ./tesh
 

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

 > [  0.000000] (killer@Tremblay) Hello!
 > [  0.000000] (victim@Fafard) Hello!
 > [  0.000000] (victim@Fafard) Suspending myself
 > [  0.000000] (killer@Tremblay) Hello!
 > [  0.000000] (victim@Fafard) Hello!
 > [  0.000000] (victim@Fafard) Suspending myself

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

diff --git a/examples/s4u/actor-migration/s4u_actor-migration.tesh b/examples/s4u/actor-migration/s4u-actor-migration.tesh
similarity index 91%
rename from examples/s4u/actor-migration/s4u_actor-migration.tesh
rename to examples/s4u/actor-migration/s4u-actor-migration.tesh
index 19b9f97..cf20427 100644 (file)
--- a/examples/s4u/actor-migration/s4u_actor-migration.tesh
+++ b/examples/s4u/actor-migration/s4u-actor-migration.tesh
@@ -3,7 +3,7 @@
 p Testing the migration feature of MSG
 
 ! output sort 19
 p Testing the migration feature of MSG
 
 ! output sort 19

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

 > [  0.000000] (emigrant@Jacquelin) I'll look for a new job on another machine ('Boivin') where the grass is greener.
 > [  0.000000] (emigrant@Boivin) Yeah, found something to do
 > [  0.000000] (policeman@Boivin) Wait at the checkpoint.
 > [  0.000000] (emigrant@Jacquelin) I'll look for a new job on another machine ('Boivin') where the grass is greener.
 > [  0.000000] (emigrant@Boivin) Yeah, found something to do
 > [  0.000000] (policeman@Boivin) Wait at the checkpoint.

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

diff --git a/examples/s4u/actor-suspend/s4u_actor-suspend.tesh b/examples/s4u/actor-suspend/s4u-actor-suspend.tesh
similarity index 95%
rename from examples/s4u/actor-suspend/s4u_actor-suspend.tesh
rename to examples/s4u/actor-suspend/s4u-actor-suspend.tesh
index b0d8b65..f5d897c 100644 (file)
--- a/examples/s4u/actor-suspend/s4u_actor-suspend.tesh
+++ b/examples/s4u/actor-suspend/s4u-actor-suspend.tesh
@@ -3,7 +3,7 @@
 p Testing the suspend/resume feature of MSG
 
 ! output sort 19
 p Testing the suspend/resume feature of MSG
 
 ! output sort 19

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

 > [  0.000000] (dream_master@Boivin) Let's create a lazy guy.
 > [  0.000000] (Lazy@Boivin) Nobody's watching me ? Let's go to sleep.
 > [  0.000000] (dream_master@Boivin) Let's wait a little bit...
 > [  0.000000] (dream_master@Boivin) Let's create a lazy guy.
 > [  0.000000] (Lazy@Boivin) Nobody's watching me ? Let's go to sleep.
 > [  0.000000] (dream_master@Boivin) Let's wait a little bit...

diff --git a/examples/s4u/app-bittorrent/s4u_app-bittorrent.tesh b/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh
similarity index 91%
rename from examples/s4u/app-bittorrent/s4u_app-bittorrent.tesh
rename to examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh
index d309e01..cd07097 100644 (file)
--- a/examples/s4u/app-bittorrent/s4u_app-bittorrent.tesh
+++ b/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh
@@ -4,7 +4,7 @@ p Testing the Bittorrent implementation with MSG
 
 ! timeout 10
 ! output sort 19
 
 ! timeout 10
 ! output sort 19

-$ $SG_TEST_EXENV ${bindir:=.}/s4u_bittorrent ${srcdir:=.}/cluster.xml ${srcdir:=.}/../s4u/app-bittorrent/s4u_app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-bittorrent ${srcdir:=.}/cluster.xml ${srcdir:=.}/../s4u/app-bittorrent/s4u-app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"

 > [    0.000000] (1:tracker@node-0.acme.org) Tracker launched.
 > [    0.000000] (2:peer@node-1.acme.org) Hi, I'm joining the network with id 2
 > [    0.000000] (3:peer@node-2.acme.org) Hi, I'm joining the network with id 3
 > [    0.000000] (1:tracker@node-0.acme.org) Tracker launched.
 > [    0.000000] (2:peer@node-1.acme.org) Hi, I'm joining the network with id 2
 > [    0.000000] (3:peer@node-2.acme.org) Hi, I'm joining the network with id 3

diff --git a/examples/s4u/app-bittorrent/s4u_app-bittorrent_d.xml b/examples/s4u/app-bittorrent/s4u-app-bittorrent_d.xml
similarity index 100%
rename from examples/s4u/app-bittorrent/s4u_app-bittorrent_d.xml
rename to examples/s4u/app-bittorrent/s4u-app-bittorrent_d.xml

diff --git a/examples/s4u/app-bittorrent/s4u_bittorrent.cpp b/examples/s4u/app-bittorrent/s4u-bittorrent.cpp
similarity index 92%
rename from examples/s4u/app-bittorrent/s4u_bittorrent.cpp
rename to examples/s4u/app-bittorrent/s4u-bittorrent.cpp
index e45b1e7..d205165 100644 (file)
--- a/examples/s4u/app-bittorrent/s4u_bittorrent.cpp
+++ b/examples/s4u/app-bittorrent/s4u-bittorrent.cpp
@@ -4,9 +4,9 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 

-#include "s4u_bittorrent.hpp"
-#include "s4u_peer.hpp"
-#include "s4u_tracker.hpp"
+#include "s4u-bittorrent.hpp"
+#include "s4u-peer.hpp"
+#include "s4u-tracker.hpp"

 
 simgrid::xbt::Extension<simgrid::s4u::Host, HostBittorrent> HostBittorrent::EXTENSION_ID;
 
 
 simgrid::xbt::Extension<simgrid::s4u::Host, HostBittorrent> HostBittorrent::EXTENSION_ID;
 

diff --git a/examples/s4u/app-bittorrent/s4u_bittorrent.hpp b/examples/s4u/app-bittorrent/s4u-bittorrent.hpp
similarity index 100%
rename from examples/s4u/app-bittorrent/s4u_bittorrent.hpp
rename to examples/s4u/app-bittorrent/s4u-bittorrent.hpp

diff --git a/examples/s4u/app-bittorrent/s4u_peer.cpp b/examples/s4u/app-bittorrent/s4u-peer.cpp
similarity index 99%
rename from examples/s4u/app-bittorrent/s4u_peer.cpp
rename to examples/s4u/app-bittorrent/s4u-peer.cpp
index 431f433..8f57ee9 100644 (file)
--- a/examples/s4u/app-bittorrent/s4u_peer.cpp
+++ b/examples/s4u/app-bittorrent/s4u-peer.cpp
@@ -6,8 +6,8 @@
 #include <climits>
 #include <xbt/ex.hpp>
 
 #include <climits>
 #include <xbt/ex.hpp>
 

-#include "s4u_peer.hpp"
-#include "s4u_tracker.hpp"
+#include "s4u-peer.hpp"
+#include "s4u-tracker.hpp"

 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_bt_peer, "Messages specific for the peers");
 
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_bt_peer, "Messages specific for the peers");
 

diff --git a/examples/s4u/app-bittorrent/s4u_peer.hpp b/examples/s4u/app-bittorrent/s4u-peer.hpp
similarity index 99%
rename from examples/s4u/app-bittorrent/s4u_peer.hpp
rename to examples/s4u/app-bittorrent/s4u-peer.hpp
index bbbbcdd..9d1e195 100644 (file)
--- a/examples/s4u/app-bittorrent/s4u_peer.hpp
+++ b/examples/s4u/app-bittorrent/s4u-peer.hpp
@@ -6,7 +6,7 @@
 
 #ifndef BITTORRENT_PEER_HPP
 #define BITTORRENT_PEER_HPP
 
 #ifndef BITTORRENT_PEER_HPP
 #define BITTORRENT_PEER_HPP

-#include "s4u_bittorrent.hpp"
+#include "s4u-bittorrent.hpp"

 #include <set>
 #include <unordered_map>
 
 #include <set>
 #include <unordered_map>
 

diff --git a/examples/s4u/app-bittorrent/s4u_tracker.cpp b/examples/s4u/app-bittorrent/s4u-tracker.cpp
similarity index 98%
rename from examples/s4u/app-bittorrent/s4u_tracker.cpp
rename to examples/s4u/app-bittorrent/s4u-tracker.cpp
index 1b8e3e4..d450951 100644 (file)
--- a/examples/s4u/app-bittorrent/s4u_tracker.cpp
+++ b/examples/s4u/app-bittorrent/s4u-tracker.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 

-#include "s4u_tracker.hpp"
+#include "s4u-tracker.hpp"

 #include <xbt/RngStream.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_bt_tracker, "Messages specific for the tracker");
 #include <xbt/RngStream.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_bt_tracker, "Messages specific for the tracker");

diff --git a/examples/s4u/app-bittorrent/s4u_tracker.hpp b/examples/s4u/app-bittorrent/s4u-tracker.hpp
similarity index 98%
rename from examples/s4u/app-bittorrent/s4u_tracker.hpp
rename to examples/s4u/app-bittorrent/s4u-tracker.hpp
index bebc397..d167dc0 100644 (file)
--- a/examples/s4u/app-bittorrent/s4u_tracker.hpp
+++ b/examples/s4u/app-bittorrent/s4u-tracker.hpp
@@ -7,7 +7,7 @@
 #ifndef BITTORRENT_TRACKER_HPP_
 #define BITTORRENT_TRACKER_HPP_
 
 #ifndef BITTORRENT_TRACKER_HPP_
 #define BITTORRENT_TRACKER_HPP_
 

-#include "s4u_bittorrent.hpp"
+#include "s4u-bittorrent.hpp"

 #include <set>
 
 class TrackerQuery {
 #include <set>
 
 class TrackerQuery {

diff --git a/examples/s4u/app-masterworker/s4u_app-masterworker.cpp b/examples/s4u/app-masterworker/s4u-app-masterworker.cpp
similarity index 100%
rename from examples/s4u/app-masterworker/s4u_app-masterworker.cpp
rename to examples/s4u/app-masterworker/s4u-app-masterworker.cpp

diff --git a/examples/s4u/app-masterworker/s4u_app-masterworker.tesh b/examples/s4u/app-masterworker/s4u-app-masterworker.tesh
similarity index 94%
rename from examples/s4u/app-masterworker/s4u_app-masterworker.tesh
rename to examples/s4u/app-masterworker/s4u-app-masterworker.tesh
index f9b20df..e2c8b75 100644 (file)
--- a/examples/s4u/app-masterworker/s4u_app-masterworker.tesh
+++ b/examples/s4u/app-masterworker/s4u-app-masterworker.tesh
@@ -3,7 +3,7 @@
 p Testing a simple master/worker example application (mailbox version)
 
 ! output sort 19
 p Testing a simple master/worker example application (mailbox version)
 
 ! output sort 19

-$ $SG_TEST_EXENV ${bindir:=.}/s4u_app-masterworker$EXEEXT ${srcdir:=.}/small_platform_with_routers.xml ${srcdir:=.}/../s4u/app-masterworker/s4u_app-masterworker_d.xml --cfg=network/crosstraffic:0 --trace "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-masterworker$EXEEXT ${srcdir:=.}/small_platform_with_routers.xml ${srcdir:=.}/../s4u/app-masterworker/s4u-app-masterworker_d.xml --cfg=network/crosstraffic:0 --trace "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"

 > [  0.000000] (maestro@) Configuration change: Set 'network/crosstraffic' to '0'
 > [  0.000000] (master@Tremblay) Got 5 workers and 20 tasks to process
 > [  0.000000] (master@Tremblay) Sending "Task_0" (of 20) to mailbox "worker-0"
 > [  0.000000] (maestro@) Configuration change: Set 'network/crosstraffic' to '0'
 > [  0.000000] (master@Tremblay) Got 5 workers and 20 tasks to process
 > [  0.000000] (master@Tremblay) Sending "Task_0" (of 20) to mailbox "worker-0"

diff --git a/examples/s4u/app-masterworker/s4u_app-masterworker_d.xml b/examples/s4u/app-masterworker/s4u-app-masterworker_d.xml
similarity index 100%
rename from examples/s4u/app-masterworker/s4u_app-masterworker_d.xml
rename to examples/s4u/app-masterworker/s4u-app-masterworker_d.xml

diff --git a/examples/s4u/app-pingpong/s4u_app-pingpong.cpp b/examples/s4u/app-pingpong/s4u-app-pingpong.cpp
similarity index 100%
rename from examples/s4u/app-pingpong/s4u_app-pingpong.cpp
rename to examples/s4u/app-pingpong/s4u-app-pingpong.cpp

diff --git a/examples/s4u/app-pingpong/s4u_app-pingpong.tesh b/examples/s4u/app-pingpong/s4u-app-pingpong.tesh
similarity index 93%
rename from examples/s4u/app-pingpong/s4u_app-pingpong.tesh
rename to examples/s4u/app-pingpong/s4u-app-pingpong.tesh
index 22a6bb3..dd1102d 100644 (file)
--- a/examples/s4u/app-pingpong/s4u_app-pingpong.tesh
+++ b/examples/s4u/app-pingpong/s4u-app-pingpong.tesh
@@ -2,7 +2,7 @@
 
 p Testing with default compound
 
 
 p Testing with default compound
 

-$ $SG_TEST_EXENV ${bindir:=.}/s4u_app-pingpong$EXEEXT ${srcdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${srcdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (1:pinger@Tremblay) Ping -> Jupiter
 > [  0.000000] (2:ponger@Jupiter) Pong -> Tremblay
 > [  0.019014] (2:ponger@Jupiter) Task received : small communication (latency bound)
 > [  0.000000] (1:pinger@Tremblay) Ping -> Jupiter
 > [  0.000000] (2:ponger@Jupiter) Pong -> Tremblay
 > [  0.019014] (2:ponger@Jupiter) Task received : small communication (latency bound)


@@ -14,7 +14,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u_app-pingpong$EXEEXT ${srcdir:=.}/small_platfor
 
 p Testing the deprecated CM02 network model
 
 
 p Testing the deprecated CM02 network model
 

-$ $SG_TEST_EXENV ${bindir:=.}/s4u_app-pingpong$EXEEXT ${srcdir:=.}/small_platform.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${srcdir:=.}/small_platform.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (1:pinger@Tremblay) Ping -> Jupiter
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (1:pinger@Tremblay) Ping -> Jupiter


@@ -28,7 +28,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u_app-pingpong$EXEEXT ${srcdir:=.}/small_platfor
 
 p Testing the surf network Reno fairness model using lagrangian approach
 
 
 p Testing the surf network Reno fairness model using lagrangian approach
 

-$ $SG_TEST_EXENV ${bindir:=.}/s4u_app-pingpong$EXEEXT ${srcdir:=.}/small_platform.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${srcdir:=.}/small_platform.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Reno'
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Reno'


@@ -43,7 +43,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u_app-pingpong$EXEEXT ${srcdir:=.}/small_platfor
 
 p Testing the surf network Vegas fairness model using lagrangian approach
 
 
 p Testing the surf network Vegas fairness model using lagrangian approach
 

-$ $SG_TEST_EXENV ${bindir:=.}/s4u_app-pingpong$EXEEXT ${srcdir:=.}/small_platform.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Vegas" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-pingpong$EXEEXT ${srcdir:=.}/small_platform.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Vegas" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Vegas'
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Vegas'

diff --git a/examples/s4u/app-token-ring/s4u_app-token-ring.cpp b/examples/s4u/app-token-ring/s4u-app-token-ring.cpp
similarity index 100%
rename from examples/s4u/app-token-ring/s4u_app-token-ring.cpp
rename to examples/s4u/app-token-ring/s4u-app-token-ring.cpp

diff --git a/examples/s4u/app-token-ring/s4u_app-token-ring.tesh b/examples/s4u/app-token-ring/s4u-app-token-ring.tesh
similarity index 98%
rename from examples/s4u/app-token-ring/s4u_app-token-ring.tesh
rename to examples/s4u/app-token-ring/s4u-app-token-ring.tesh
index cf956aa..99a4567 100644 (file)
--- a/examples/s4u/app-token-ring/s4u_app-token-ring.tesh
+++ b/examples/s4u/app-token-ring/s4u-app-token-ring.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
 #! ./tesh
 

-$ $SG_TEST_EXENV ${bindir:=.}/s4u_app-token-ring ${srcdir:=.}/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-token-ring ${srcdir:=.}/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"

 > [  0.000000] (maestro@) Number of hosts '6'
 > [  0.000000] (0@host1) Host "0" send 'Token' to Host "1"
 > [  0.017354] (1@host2) Host "1" received "Token"
 > [  0.000000] (maestro@) Number of hosts '6'
 > [  0.000000] (0@host1) Host "0" send 'Token' to Host "1"
 > [  0.017354] (1@host2) Host "1" received "Token"


@@ -16,7 +16,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u_app-token-ring ${srcdir:=.}/routing_cluster.xm
 > [  0.131796] (0@host1) Host "0" received "Token"
 > [  0.131796] (maestro@) Simulation time 0.131796
 
 > [  0.131796] (0@host1) Host "0" received "Token"
 > [  0.131796] (maestro@) Simulation time 0.131796
 

-$ $SG_TEST_EXENV ${bindir:=.}/s4u_app-token-ring ${srcdir:=.}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-token-ring ${srcdir:=.}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%P@%h)%e%m%n"

 > [    0.000000] (maestro@) Number of hosts '2'
 > [    0.000000] (0@100030591) Host "0" send 'Token' to Host "1"
 > [    0.624423] (1@100036570) Host "1" received "Token"
 > [    0.000000] (maestro@) Number of hosts '2'
 > [    0.000000] (0@100030591) Host "0" send 'Token' to Host "1"
 > [    0.624423] (1@100036570) Host "1" received "Token"


@@ -24,7 +24,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u_app-token-ring ${srcdir:=.}/two_peers.xml "--l
 > [    1.248846] (0@100030591) Host "0" received "Token"
 > [    1.248846] (maestro@) Simulation time 1.24885
 
 > [    1.248846] (0@100030591) Host "0" received "Token"
 > [    1.248846] (maestro@) Simulation time 1.24885
 

-$ $SG_TEST_EXENV ${bindir:=.}/s4u_app-token-ring ${srcdir:=.}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-token-ring ${srcdir:=.}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"

 > [  0.000000] (maestro@) Number of hosts '60'
 > [  0.000000] (0@host-1.cluster1) Host "0" send 'Token' to Host "1"
 > [  0.030364] (1@host-1.cluster2) Host "1" received "Token"
 > [  0.000000] (maestro@) Number of hosts '60'
 > [  0.000000] (0@host-1.cluster1) Host "0" send 'Token' to Host "1"
 > [  0.030364] (1@host-1.cluster2) Host "1" received "Token"

diff --git a/examples/s4u/async-waitall/s4u_async-waitall.cpp b/examples/s4u/async-waitall/s4u-async-waitall.cpp
similarity index 100%
rename from examples/s4u/async-waitall/s4u_async-waitall.cpp
rename to examples/s4u/async-waitall/s4u-async-waitall.cpp

diff --git a/examples/s4u/async-waitall/s4u_async-waitall.tesh b/examples/s4u/async-waitall/s4u-async-waitall.tesh
similarity index 90%
rename from examples/s4u/async-waitall/s4u_async-waitall.tesh
rename to examples/s4u/async-waitall/s4u-async-waitall.tesh
index 402131a..0ae70d1 100644 (file)
--- a/examples/s4u/async-waitall/s4u_async-waitall.tesh
+++ b/examples/s4u/async-waitall/s4u-async-waitall.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
 #! ./tesh
 

-$ $SG_TEST_EXENV ${bindir:=.}/s4u_async-waitall ${srcdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/../s4u/async-waitall/s4u_async-waitall_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-async-waitall ${srcdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/../s4u/async-waitall/s4u-async-waitall_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0'
 > [  0.000000] (2:receiver@Ruby) Wait for my first message
 > [  0.000000] (3:receiver@Perl) Wait for my first message
 > [  0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0'
 > [  0.000000] (2:receiver@Ruby) Wait for my first message
 > [  0.000000] (3:receiver@Perl) Wait for my first message

diff --git a/examples/s4u/async-waitall/s4u_async-waitall_d.xml b/examples/s4u/async-waitall/s4u-async-waitall_d.xml
similarity index 100%
rename from examples/s4u/async-waitall/s4u_async-waitall_d.xml
rename to examples/s4u/async-waitall/s4u-async-waitall_d.xml

diff --git a/examples/s4u/async-waitany/s4u_async-waitany.cpp b/examples/s4u/async-waitany/s4u-async-waitany.cpp
similarity index 100%
rename from examples/s4u/async-waitany/s4u_async-waitany.cpp
rename to examples/s4u/async-waitany/s4u-async-waitany.cpp

diff --git a/examples/s4u/async-waitany/s4u_async-waitany.tesh b/examples/s4u/async-waitany/s4u-async-waitany.tesh
similarity index 92%
rename from examples/s4u/async-waitany/s4u_async-waitany.tesh
rename to examples/s4u/async-waitany/s4u-async-waitany.tesh
index cdf8038..1ec6a42 100644 (file)
--- a/examples/s4u/async-waitany/s4u_async-waitany.tesh
+++ b/examples/s4u/async-waitany/s4u-async-waitany.tesh
@@ -3,7 +3,7 @@
 p Testing this_actor->wait_any()
 
 ! output sort 19
 p Testing this_actor->wait_any()
 
 ! output sort 19

-$ $SG_TEST_EXENV ${bindir:=.}/s4u_async-waitany ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../s4u/async-waitany/s4u_async-waitany_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-async-waitany ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../s4u/async-waitany/s4u-async-waitany_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0'
 > [  0.000000] (2:receiver@Fafard) Wait for my first message
 > [  0.000000] (3:receiver@Jupiter) Wait for my first message
 > [  0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0'
 > [  0.000000] (2:receiver@Fafard) Wait for my first message
 > [  0.000000] (3:receiver@Jupiter) Wait for my first message

diff --git a/examples/s4u/async-waitany/s4u_async-waitany_d.xml b/examples/s4u/async-waitany/s4u-async-waitany_d.xml
similarity index 100%
rename from examples/s4u/async-waitany/s4u_async-waitany_d.xml
rename to examples/s4u/async-waitany/s4u-async-waitany_d.xml

diff --git a/examples/s4u/dht-chord/node.cpp b/examples/s4u/dht-chord/node.cpp
index d97b6b1..de23d95 100644 (file)
--- a/examples/s4u/dht-chord/node.cpp
+++ b/examples/s4u/dht-chord/node.cpp
@@ -3,7 +3,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 

-#include "s4u_dht-chord.hpp"
+#include "s4u-dht-chord.hpp"

 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(s4u_chord);
 
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(s4u_chord);
 

diff --git a/examples/s4u/dht-chord/s4u_dht-chord.cpp b/examples/s4u/dht-chord/s4u-dht-chord.cpp
similarity index 98%
rename from examples/s4u/dht-chord/s4u_dht-chord.cpp
rename to examples/s4u/dht-chord/s4u-dht-chord.cpp
index 6bd3cc8..96bae87 100644 (file)
--- a/examples/s4u/dht-chord/s4u_dht-chord.cpp
+++ b/examples/s4u/dht-chord/s4u-dht-chord.cpp
@@ -3,7 +3,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 

-#include "s4u_dht-chord.hpp"
+#include "s4u-dht-chord.hpp"

 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_chord, "Messages specific for this s4u example");
 simgrid::xbt::Extension<simgrid::s4u::Host, HostChord> HostChord::EXTENSION_ID;
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_chord, "Messages specific for this s4u example");
 simgrid::xbt::Extension<simgrid::s4u::Host, HostChord> HostChord::EXTENSION_ID;

diff --git a/examples/s4u/dht-chord/s4u_dht-chord.hpp b/examples/s4u/dht-chord/s4u-dht-chord.hpp
similarity index 100%
rename from examples/s4u/dht-chord/s4u_dht-chord.hpp
rename to examples/s4u/dht-chord/s4u-dht-chord.hpp

diff --git a/examples/s4u/dht-chord/s4u_dht-chord.tesh b/examples/s4u/dht-chord/s4u-dht-chord.tesh
similarity index 99%
rename from examples/s4u/dht-chord/s4u_dht-chord.tesh
rename to examples/s4u/dht-chord/s4u-dht-chord.tesh
index f620d5a..7c8349f 100644 (file)
--- a/examples/s4u/dht-chord/s4u_dht-chord.tesh
+++ b/examples/s4u/dht-chord/s4u-dht-chord.tesh
@@ -3,7 +3,7 @@
 p Testing the Chord implementation with MSG
 
 ! output sort 19
 p Testing the Chord implementation with MSG
 
 ! output sort 19

-$ $SG_TEST_EXENV ${bindir:=.}/s4u_dht-chord$EXEEXT -nb_bits=3 ${srcdir:=.}/cluster.xml ${srcdir:=.}/../s4u/dht-chord/s4u_dht-chord_d.xml --log=s4u_chord.thres:verbose "--log=root.fmt:[%10.5r]%e(%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-dht-chord$EXEEXT -nb_bits=3 ${srcdir:=.}/cluster.xml ${srcdir:=.}/../s4u/dht-chord/s4u-dht-chord_d.xml --log=s4u_chord.thres:verbose "--log=root.fmt:[%10.5r]%e(%P@%h)%e%m%n"

 > [   0.00000] (node@node-0.acme.org) My finger table:
 > [   0.00000] (node@node-0.acme.org) Start | Succ
 > [   0.00000] (node@node-0.acme.org)    3  |  42
 > [   0.00000] (node@node-0.acme.org) My finger table:
 > [   0.00000] (node@node-0.acme.org) Start | Succ
 > [   0.00000] (node@node-0.acme.org)    3  |  42

diff --git a/examples/s4u/dht-chord/s4u_dht-chord_d.xml b/examples/s4u/dht-chord/s4u-dht-chord_d.xml
similarity index 100%
rename from examples/s4u/dht-chord/s4u_dht-chord_d.xml
rename to examples/s4u/dht-chord/s4u-dht-chord_d.xml

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

diff --git a/examples/s4u/io/s4u_io.tesh b/examples/s4u/io/s4u-io.tesh
similarity index 97%
rename from examples/s4u/io/s4u_io.tesh
rename to examples/s4u/io/s4u-io.tesh
index 4e21628..29188d7 100644 (file)
--- a/examples/s4u/io/s4u_io.tesh
+++ b/examples/s4u/io/s4u-io.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
 #! ./tesh
 

-$ $SG_TEST_EXENV ${bindir:=.}/s4u_io
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-io

 > [denise:host:(1) 0.000000] [s4u_test/INFO] Storage info on denise:
 > [denise:host:(1) 0.000000] [s4u_test/INFO]     Disk2 (c:) Used: 2391537133; Free: 534479374867; Total: 536870912000.
 > [denise:host:(1) 0.000000] [s4u_test/INFO]     Disk4 (/home) Used: 13221994; Free: 536857690006; Total: 536870912000.
 > [denise:host:(1) 0.000000] [s4u_test/INFO] Storage info on denise:
 > [denise:host:(1) 0.000000] [s4u_test/INFO]     Disk2 (c:) Used: 2391537133; Free: 534479374867; Total: 536870912000.
 > [denise:host:(1) 0.000000] [s4u_test/INFO]     Disk4 (/home) Used: 13221994; Free: 536857690006; Total: 536870912000.

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

diff --git a/examples/s4u/mutex/s4u_mutex.tesh b/examples/s4u/mutex/s4u-mutex.tesh
similarity index 98%
rename from examples/s4u/mutex/s4u_mutex.tesh
rename to examples/s4u/mutex/s4u-mutex.tesh
index 8d64d17..42ef210 100644 (file)
--- a/examples/s4u/mutex/s4u_mutex.tesh
+++ b/examples/s4u/mutex/s4u-mutex.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
 #! ./tesh
 

-$ $SG_TEST_EXENV ${bindir:=.}/s4u_mutex
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-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
 > [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

diff --git a/examples/s4u/plugin-hostload/s4u_plugin-hostload.cpp b/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp
similarity index 100%
rename from examples/s4u/plugin-hostload/s4u_plugin-hostload.cpp
rename to examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp

diff --git a/examples/s4u/plugin-hostload/s4u_plugin-hostload.tesh b/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh
similarity index 96%
rename from examples/s4u/plugin-hostload/s4u_plugin-hostload.tesh
rename to examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh
index 5e9b67e..39aa4cc 100644 (file)
--- a/examples/s4u/plugin-hostload/s4u_plugin-hostload.tesh
+++ b/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh
@@ -2,7 +2,7 @@
 
 p This tests the HostLoad plugin (this allows the user to get the current load of a host and the computed flops)
 
 
 p This tests the HostLoad plugin (this allows the user to get the current load of a host and the computed flops)
 

-$ ${bindir:=.}/s4u_plugin-hostload$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/s4u-plugin-hostload$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (1:load_test@MyHost1) Initial peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (should be 0)
 > [  0.000000] (1:load_test@MyHost1) Sleep for 10 seconds
 > [ 10.000000] (1:load_test@MyHost1) Done sleeping 10.00s; peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (nothing should have changed)
 > [  0.000000] (1:load_test@MyHost1) Initial peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (should be 0)
 > [  0.000000] (1:load_test@MyHost1) Sleep for 10 seconds
 > [ 10.000000] (1:load_test@MyHost1) Done sleeping 10.00s; peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (nothing should have changed)