rename the basic s4u example to 'launching'

diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt
index eb93952..1edddbe 100644 (file)
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@ -1,4 +1,4 @@
-foreach (example basic io mutex actions-comm)
+foreach (example io launching mutex actions-comm)
   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})
@@ -7,23 +7,23 @@ foreach (example basic io mutex actions-comm)
   set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/${example}/s4u_${example}.cpp)
 endforeach()
 
-add_executable       (s4u_basic_function  basic/s4u_basic_function.cpp)
-target_link_libraries(s4u_basic_function  simgrid)
-set_target_properties(s4u_basic_function  PROPERTIES RUNTIME_OUTPUT_DIRECTORY
- ${CMAKE_CURRENT_BINARY_DIR}/basic)
+add_executable       (s4u_launching_function  launching/s4u_launching_function.cpp)
+target_link_libraries(s4u_launching_function  simgrid)
+set_target_properties(s4u_launching_function  PROPERTIES RUNTIME_OUTPUT_DIRECTORY
+ ${CMAKE_CURRENT_BINARY_DIR}/launching)
 
-add_executable       (s4u_basic_deployment  basic/s4u_basic_deployment.cpp)
-target_link_libraries(s4u_basic_deployment  simgrid)
-set_target_properties(s4u_basic_deployment  PROPERTIES RUNTIME_OUTPUT_DIRECTORY
- ${CMAKE_CURRENT_BINARY_DIR}/basic)
+add_executable       (s4u_launching_deployment  launching/s4u_launching_deployment.cpp)
+target_link_libraries(s4u_launching_deployment  simgrid)
+set_target_properties(s4u_launching_deployment  PROPERTIES RUNTIME_OUTPUT_DIRECTORY
+ ${CMAKE_CURRENT_BINARY_DIR}/launching)
 
-set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/basic/s4u_basic_function.cpp
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/basic/s4u_basic_deployment.cpp
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/basic/s4u_basic.h)
+set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/launching/s4u_launching_function.cpp
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/launching/s4u_launching_deployment.cpp
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/launching/s4u_launching.h)
 
 set(examples_src  ${examples_src}                                     PARENT_SCOPE)
 set(tesh_files    ${tesh_files}                                       PARENT_SCOPE)
-set(xml_files     ${xml_files}    ${CMAKE_CURRENT_SOURCE_DIR}/basic/deployment.xml
+set(xml_files     ${xml_files}    ${CMAKE_CURRENT_SOURCE_DIR}/launching/deployment.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_actions-comm_split_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_actions-comm_d.xml         PARENT_SCOPE)
 set(txt_files     ${txt_files}    ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_actions-comm_split_p0.txt
@@ -31,6 +31,6 @@ set(txt_files     ${txt_files}    ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_a
                                   ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_actions-comm.txt
                                   ${CMAKE_CURRENT_SOURCE_DIR}/README.doc                                   PARENT_SCOPE)
 
-foreach(example basic io mutex actions-comm)
+foreach(example io launching mutex actions-comm)
   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()

diff --git a/examples/s4u/README.doc b/examples/s4u/README.doc
index 6aaef6a..e08626c 100644 (file)
--- a/examples/s4u/README.doc
+++ b/examples/s4u/README.doc
@@ -13,9 +13,10 @@ documentation, but it should remain readable directly.
  @ingroup s4u_api
  @brief Find the S4U example fitting your needs in the archive.
 
-  - @ref s4u_ex_basics
+  - @ref s4u_ex_launching
+  - @ref s4u_ex_synchro
                    
-@section s4u_ex_basics Basic examples and features
+@section s4u_ex_launching Launching actors to populate your simulation
 
 @section s4u_ex_synchro Inter-Actor Synchronization 
 

diff --git a/examples/s4u/basic/.gitignore b/examples/s4u/basic/.gitignore
deleted file mode 100644 (file)
index 71e440f..0000000
--- a/examples/s4u/basic/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-s4u_basic

diff --git a/examples/s4u/launching/.gitignore b/examples/s4u/launching/.gitignore
new file mode 100644 (file)
index 0000000..f110ab6
--- /dev/null
+++ b/examples/s4u/launching/.gitignore
@@ -0,0 +1,3 @@
+s4u_launching
+s4u_launching_deployment
+s4u_launching_function

diff --git a/examples/s4u/basic/deployment.xml b/examples/s4u/launching/deployment.xml
similarity index 100%
rename from examples/s4u/basic/deployment.xml
rename to examples/s4u/launching/deployment.xml

diff --git a/examples/s4u/basic/s4u_basic.cpp b/examples/s4u/launching/s4u_launching.cpp
similarity index 96%
rename from examples/s4u/basic/s4u_basic.cpp
rename to examples/s4u/launching/s4u_launching.cpp
index e5a0e21..85f512a 100644 (file)
--- a/examples/s4u/basic/s4u_basic.cpp
+++ b/examples/s4u/launching/s4u_launching.cpp
@@ -6,7 +6,7 @@
 #include <xbt/sysdep.h>
 #include <simgrid/s4u.hpp>
 
-#include "s4u_basic.h"
+#include "s4u_launching.h"
 
 int main(int argc, char **argv) {
   simgrid::s4u::Engine *e = new simgrid::s4u::Engine(&argc,argv);

diff --git a/examples/s4u/basic/s4u_basic.h b/examples/s4u/launching/s4u_launching.h
similarity index 100%
rename from examples/s4u/basic/s4u_basic.h
rename to examples/s4u/launching/s4u_launching.h

diff --git a/examples/s4u/basic/s4u_basic.tesh b/examples/s4u/launching/s4u_launching.tesh
similarity index 87%
rename from examples/s4u/basic/s4u_basic.tesh
rename to examples/s4u/launching/s4u_launching.tesh
index 9370b2e..214dbea 100644 (file)
--- a/examples/s4u/basic/s4u_basic.tesh
+++ b/examples/s4u/launching/s4u_launching.tesh
@@ -1,20 +1,20 @@
 #! ./tesh
 
-$ $SG_TEST_EXENV ${bindir:=.}/s4u_basic
+$ $SG_TEST_EXENV ${bindir:=.}/s4u_launching
 > [Tremblay:worker:(0) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to serve
 > [Jupiter:master:(0) 0.000000] [s4u_test/INFO] Hello s4u, I have something to send
 > [Tremblay:worker:(0) 0.001301] [s4u_test/INFO] I received 'GaBuZoMeu'
 > [Tremblay:worker:(0) 0.001301] [s4u_test/INFO] I'm done. See you.
 > [Jupiter:master:(0) 0.001301] [s4u_test/INFO] I'm done. See you.
 
-$ $SG_TEST_EXENV ${bindir:=.}/s4u_basic_function
+$ $SG_TEST_EXENV ${bindir:=.}/s4u_launching_function
 > [Tremblay:worker:(0) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to serve
 > [Jupiter:master:(0) 0.000000] [s4u_test/INFO] Hello s4u, I have something to send
 > [Tremblay:worker:(0) 0.001301] [s4u_test/INFO] I received 'GaBuZoMeu'
 > [Tremblay:worker:(0) 0.001301] [s4u_test/INFO] I'm done. See you.
 > [Jupiter:master:(0) 0.001301] [s4u_test/INFO] I'm done. See you.
 
-$ $SG_TEST_EXENV ${bindir:=.}/s4u_basic_deployment deployment.xml
+$ $SG_TEST_EXENV ${bindir:=.}/s4u_launching_deployment deployment.xml
 > [Tremblay:worker:(0) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to serve
 > [Jupiter:master:(0) 0.000000] [s4u_test/INFO] Hello s4u, I have something to send
 > [Tremblay:worker:(0) 0.001301] [s4u_test/INFO] I received 'GaBuZoMeu'

diff --git a/examples/s4u/basic/s4u_basic_deployment.cpp b/examples/s4u/launching/s4u_launching_deployment.cpp
similarity index 95%
rename from examples/s4u/basic/s4u_basic_deployment.cpp
rename to examples/s4u/launching/s4u_launching_deployment.cpp
index 7b68d2a..115cf4a 100644 (file)
--- a/examples/s4u/basic/s4u_basic_deployment.cpp
+++ b/examples/s4u/launching/s4u_launching_deployment.cpp
@@ -9,7 +9,7 @@
 #include <xbt/sysdep.h>
 #include <simgrid/s4u.hpp>
 
-#include "s4u_basic.h"
+#include "s4u_launching.h"
 
 int main(int argc, char **argv) {
   simgrid::s4u::Engine *e = new simgrid::s4u::Engine(&argc,argv);

diff --git a/examples/s4u/basic/s4u_basic_function.cpp b/examples/s4u/launching/s4u_launching_function.cpp
similarity index 96%
rename from examples/s4u/basic/s4u_basic_function.cpp
rename to examples/s4u/launching/s4u_launching_function.cpp
index c915ed7..713aa96 100644 (file)
--- a/examples/s4u/basic/s4u_basic_function.cpp
+++ b/examples/s4u/launching/s4u_launching_function.cpp
@@ -10,7 +10,7 @@
 
 #include <simgrid/s4u.hpp>
 
-#include "s4u_basic.h"
+#include "s4u_launching.h"
 
 int main(int argc, char **argv) {
   simgrid::s4u::Engine *e = new simgrid::s4u::Engine(&argc,argv);