add the exec-async example to the doc

diff --git a/.gitignore b/.gitignore
index de37207..b127530 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -183,7 +183,6 @@ 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/actions-storage/s4u-actions-storage
 examples/s4u/actor-create/s4u-actor-create
 examples/s4u/actor-daemon/s4u-actor-daemon

-examples/s4u/actor-execute/s4u-actor-execute

 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


@@ -206,6 +205,8 @@ examples/s4u/energy-link/s4u-energy-link
 examples/s4u/energy-ptask/s4u-energy-ptask
 examples/s4u/energy-pstate/s4u-energy-pstate
 examples/s4u/energy-vm/s4u-energy-vm
 examples/s4u/energy-ptask/s4u-energy-ptask
 examples/s4u/energy-pstate/s4u-energy-pstate
 examples/s4u/energy-vm/s4u-energy-vm

+examples/s4u/exec-async/s4u-exec-async
+examples/s4u/exec-basic/s4u-exec-basic

 examples/s4u/io-file-system/s4u-io-file-system
 examples/s4u/io-file-remote/s4u-io-file-remote
 examples/s4u/io-storage-raw/s4u-io-storage-raw
 examples/s4u/io-file-system/s4u-io-file-system
 examples/s4u/io-file-remote/s4u-io-file-remote
 examples/s4u/io-storage-raw/s4u-io-storage-raw

diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt
index 30c2570..7e8d1b3 100644 (file)
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@ -4,8 +4,7 @@ foreach (example actions-comm actions-storage
                  async-wait async-waitany async-waitall
                  cloud-progress-monitor
                  energy-link energy-pstate energy-ptask energy-vm
                  async-wait async-waitany async-waitall
                  cloud-progress-monitor
                  energy-link energy-pstate energy-ptask energy-vm

-                exec-basic
-                 execute-priority
+                 exec-async exec-basic

                  io-file-system io-file-remote io-storage-raw
                  platform-properties plugin-hostload mutex)
   add_executable       (s4u-${example}  ${example}/s4u-${example}.cpp)
                  io-file-system io-file-remote io-storage-raw
                  platform-properties plugin-hostload mutex)
   add_executable       (s4u-${example}  ${example}/s4u-${example}.cpp)


@@ -73,7 +72,7 @@ foreach(example actions-comm actions-storage
                 cloud-progress-monitor
                 dht-chord 
                 energy-link energy-pstate energy-ptask energy-vm
                 cloud-progress-monitor
                 dht-chord 
                 energy-link energy-pstate energy-ptask energy-vm

-                exec-basic execute-priority
+                exec-async exec-basic

                 platform-properties plugin-hostload mutex
                 io-file-system io-file-remote io-storage-raw)
   ADD_TESH_FACTORIES(s4u-${example} "thread;ucontext;raw;boost" 
                 platform-properties plugin-hostload mutex
                 io-file-system io-file-remote io-storage-raw)
   ADD_TESH_FACTORIES(s4u-${example} "thread;ucontext;raw;boost" 

diff --git a/examples/s4u/README.doc b/examples/s4u/README.doc
index 7b80891..17cc43f 100644 (file)
--- a/examples/s4u/README.doc
+++ b/examples/s4u/README.doc
@@ -76,6 +76,13 @@ TODO: document here the examples about plugins
     host. Some executions can be given an higher priority so that they
     get more resources.
 
     host. Some executions can be given an higher priority so that they
     get more resources.
 

+  - <b>Asynchronous execution</b>.
+    @ref examples/s4u/exec-async/s4u-exec-async.cpp \n
+    You can start asynchronous executions, in a way that is very
+    similar to asynchronous communications.
+    
+    TODO: add an example about parallel executions.
+

 @section s4u_ex_actors Acting on Actors
 
   - <b>Creating actors</b>. 
 @section s4u_ex_actors Acting on Actors
 
   - <b>Creating actors</b>. 

diff --git a/examples/s4u/execute-priority/s4u-execute-priority.cpp b/examples/s4u/exec-async/s4u-exec-async.cpp
similarity index 100%
rename from examples/s4u/execute-priority/s4u-execute-priority.cpp
rename to examples/s4u/exec-async/s4u-exec-async.cpp

diff --git a/examples/s4u/execute-priority/s4u-execute-priority.tesh b/examples/s4u/exec-async/s4u-exec-async.tesh
similarity index 70%
rename from examples/s4u/execute-priority/s4u-execute-priority.tesh
rename to examples/s4u/exec-async/s4u-exec-async.tesh
index a0e31be..86fcf85 100644 (file)
--- a/examples/s4u/execute-priority/s4u-execute-priority.tesh
+++ b/examples/s4u/exec-async/s4u-exec-async.tesh
@@ -1,7 +1,7 @@
 #! ./tesh
 
 ! output sort 19
 #! ./tesh
 
 ! output sort 19

-$ $SG_TEST_EXENV ${bindir:=.}/s4u-execute-priority$EXEEXT ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-exec-async$EXEEXT ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (1:test@Fafard) Hello! Execute 7.6296e+07 flops with priority 1
 > [  0.000000] (2:test@Fafard) Hello! Execute 7.6296e+07 flops with priority 2
 > [  1.500000] (2:test@Fafard) Goodbye now!
 > [  0.000000] (1:test@Fafard) Hello! Execute 7.6296e+07 flops with priority 1
 > [  0.000000] (2:test@Fafard) Hello! Execute 7.6296e+07 flops with priority 2
 > [  1.500000] (2:test@Fafard) Goodbye now!