Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'actor-startkilltime' of https://github.com/Takishipp/simgrid into Takis...
authorMartin Quinson <martin.quinson@loria.fr>
Sun, 15 Oct 2017 19:36:23 +0000 (21:36 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Sun, 15 Oct 2017 19:36:23 +0000 (21:36 +0200)
1  2 
examples/s4u/CMakeLists.txt
examples/s4u/README.doc

@@@ -1,7 -1,7 +1,7 @@@
  foreach (example actions-comm actions-storage 
 -                 actor-create actor-daemon actor-kill actor-migration actor-suspend 
 +                 actor-create actor-daemon actor-execute actor-kill actor-migration actor-suspend 
                   app-masterworker app-pingpong app-token-ring
-                async-wait async-waitany async-waitall
+                async-wait async-waitany async-waitall actor-startkilltime 
                 plugin-hostload io mutex)
    add_executable       (s4u-${example}  ${example}/s4u-${example}.cpp)
    target_link_libraries(s4u-${example}  simgrid)
@@@ -35,7 -35,7 +35,8 @@@ set(tesh_files    ${tesh_files}   ${CMA
                                    ${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
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/actor-execute/s4u-actor-execute.tesh         PARENT_SCOPE)
++                                  ${CMAKE_CURRENT_SOURCE_DIR}/actor-execute/s4u-actor-execute.tesh       
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/actor-startkilltime/s4u-actor-startkilltime.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}/async-waitany/s4u-async-waitany_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/async-waitall/s4u-async-waitall_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/s4u-async-wait_d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord_d.xml                PARENT_SCOPE)
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord_d.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/actor-startkilltime/s4u-actor-baseline_d.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/actor-startkilltime/s4u-actor-kill_d.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/actor-startkilltime/s4u-actor-start_d.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/actor-startkilltime/s4u-actor-star_kill_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
@@@ -53,9 -57,9 +58,9 @@@
                                    ${CMAKE_CURRENT_SOURCE_DIR}/README.doc                                   PARENT_SCOPE)
  
  foreach(example actions-comm actions-storage 
 -                actor-create actor-daemon actor-kill actor-migration actor-suspend
 +                actor-create actor-daemon actor-execute actor-kill actor-migration actor-suspend
                  app-bittorrent app-masterworker app-pingpong app-token-ring 
-               async-wait async-waitall async-waitany
+               async-wait async-waitall async-waitany actor-startkilltime
                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()
diff --combined examples/s4u/README.doc
@@@ -26,9 -26,9 +26,9 @@@ documentation, but it should remain rea
      Shows how to start your actors to populate your simulation.
  
    - <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). 
 +    This simple example just sends 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
      Shows how to implement a classical communication pattern, where a token is exchanged along a ring to reach every
@@@ -57,7 -57,7 +57,7 @@@
     @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.   
 +   first.    
  
  @section s4u_ex_actors Acting on Actors
  
      @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>Actors using CPU time</b>.
 +    @ref examples/s4u/actor-execute/s4u-actor-execute.cpp \n
 +    The computations done in your program are not reported to the
 +    simulated world, unless you explicitely request the simulator to pause
 +    the actor until a given amount of flops gets computed on its simulated
 +    host.
 +
    - <b>Daemonize actors</b>
      @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
      @ref examples/s4u/actor-kill/s4u-actor-kill.cpp \n
      Actors can forcefully stop other actors with the @ref kill method.
  
+   - <b>Controling the actor life cycle</b>.
+     @ref examples/s4u/actor-startkilltime/s4u-actor-startkilltime.cpp \n
+     You can specify a start time and a kill time in the deployment
+     file. See all *_d.xml files in this directory.    
    - <b>Migrating Actors</b>.
      @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.
@@@ -131,7 -129,6 +136,7 @@@ also the tesh files in the example dire
  @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-execute/s4u-actor-execute.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