Merge branch 'master' into energy-pstate

diff --cc examples/msg/README.doc
index 66e557c,42597dd..eb2d0c5
--- 1/examples/msg/README.doc
--- 2/examples/msg/README.doc
+++ b/examples/msg/README.doc
@@@ -141,11 -129,11 +135,11 @@@ options to see the task executions
      displayed as arrows in a Gantt-chart visualization. Recommanded
      options to that extend:
      @verbatim -cfg=tracing:yes --cfg=tracing/msg/process:yes
 -    @endverbatim     
 -
 +    @endverbatim 
 +    
  TODO: These tracing examples should be integrated in the examples to
  not duplicate the C files. A full command line to see the result in
- the right tool (viva/vite/FrameSoc) should be given along with some
+ the right tool (vite/FrameSoc) should be given along with some
  screenshots.
  
  @subsection msg_ex_tracing_user_variables Tracing user variables

diff --cc examples/s4u/CMakeLists.txt
index f1495d1,38866d4..2cd0fba
--- 1/examples/s4u/CMakeLists.txt
--- 2/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@@ -1,7 -1,8 +1,8 @@@
  foreach (example actions-comm actions-storage 
-                  actor-create actor-daemon actor-execute actor-kill actor-lifetime actor-migration actor-suspend actor-priority
+                  actor-create actor-daemon actor-execute actor-kill actor-lifetime actor-migration actor-suspend actor-priority actor-yield
 -                 app-masterworker app-pingpong app-token-ring
 +                 app-masterworker app-pingpong app-token-ring energy-pstate
                 async-wait async-waitany async-waitall
+                energy-link
                 plugin-hostload io mutex)
    add_executable       (s4u-${example}  ${example}/s4u-${example}.cpp)
    target_link_libraries(s4u-${example}  simgrid)
@@@ -32,9 -33,9 +33,11 @@@ 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}/energy-pstate/s4u-energy-pstate.tesh
 +                                  ${CMAKE_CURRENT_SOURCE_DIR}/actor-priority/s4u-actor-priority.tesh
                                    ${CMAKE_CURRENT_SOURCE_DIR}/actor-lifetime/s4u-actor-lifetime.tesh
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/actor-priority/s4u-actor-priority.tesh
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/actor-yield/s4u-actor-yield.tesh
                                    ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/s4u-async-wait.tesh
                                    ${CMAKE_CURRENT_SOURCE_DIR}/async-waitany/s4u-async-waitany.tesh
                                    ${CMAKE_CURRENT_SOURCE_DIR}/async-waitall/s4u-async-waitall.tesh
@@@ -60,9 -62,11 +64,11 @@@ set(txt_files     ${txt_files}    ${CMA
                                    ${CMAKE_CURRENT_SOURCE_DIR}/README.doc                                   PARENT_SCOPE)
  
  foreach(example actions-comm actions-storage 
-                 actor-create actor-daemon actor-execute actor-kill actor-lifetime actor-migration actor-suspend
+                 actor-create actor-daemon actor-execute actor-kill actor-lifetime actor-migration actor-suspend actor-priority actor-yield
 -                app-bittorrent app-masterworker app-pingpong app-token-ring 
 +                app-bittorrent app-masterworker app-pingpong app-token-ring energy-pstate
-               async-wait async-waitall async-waitany actor-priority
-               dht-chord plugin-hostload io mutex)
+               async-wait async-waitall async-waitany
+               dht-chord 
+               energy-link
+               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()

diff --cc examples/s4u/README.doc
index 20c2aa3,6c88294..42cf0f8
--- 1/examples/s4u/README.doc
--- 2/examples/s4u/README.doc
+++ b/examples/s4u/README.doc
@@@ -101,12 -101,12 +101,18 @@@ documentation, but it should remain rea
      @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.
  
 +  - <b>Using Pstates on a host</b>
 +    @ref examples/s4u/energy-pstate/s4u-energy-pstate.c\n
 +    Show how define a set of pstates for a host and how the current
 +    pstate can be accessed/changed with @ref getPstateSpeed and @ref  sg_host_set_pstate.
 +    See also the platform XML file for have a details on how to declare the CPU capacity for each pstate.
 +
+   - <b>Yielding to other actor</b>.
+     @ref examples/s4u/actor-yield/s4u-actor-yield.c\n
+     The simgrid::s4u::this_actor::yield() function interrupts the
+     execution of the current actor, leaving a chance to the other actors
+     that are ready to run at this timestamp.
+ 
  @section s4u_ex_synchro Inter-Actor Synchronization 
  
   - <b>Mutex: </b> @ref examples/s4u/mutex/s4u-mutex.cpp \n