Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
authorMartin Quinson <martin.quinson@loria.fr>
Mon, 16 May 2016 05:55:59 +0000 (07:55 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Mon, 16 May 2016 05:55:59 +0000 (07:55 +0200)
1  2 
.gitignore
examples/msg/CMakeLists.txt
examples/msg/README.doc

diff --combined .gitignore
@@@ -170,17 -170,17 +170,17 @@@ examples/msg/synchro-semaphore/synchro-
  examples/msg/app-pingpong/app-pingpong
  examples/msg/maestro-set/maestro-set
  examples/msg/simulation.trace
 +examples/msg/process-create/process-create
  examples/msg/process-startkilltime/process-startkilltime
  examples/msg/process-suspend/process-suspend
  examples/msg/app-token-ring/app-token-ring
  examples/msg/trace-categories/trace-categories
- examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables
+ examples/msg/trace-route-user-variables/trace-route-user-variables
  examples/msg/trace-link-user-variables/trace-link-user-variables
  examples/msg/trace-masterworker/trace-masterworker
  examples/msg/trace-process-migration/trace-process-migration
 -examples/msg/trace-simple/trace-simple
  examples/msg/trace-platform/trace-platform
- examples/msg/trace-user-variables/trace-user-variables
+ examples/msg/trace-host-user-variables/trace-host-user-variables
  examples/s4u/basic/s4u_basic
  examples/s4u/io/s4u_io
  examples/simdag/daxload/sd_daxload
@@@ -1,10 -1,10 +1,10 @@@
  foreach(x actions-comm actions-storage app-masterworker app-pingpong app-pmm app-token-ring async-wait async-waitall 
            async-waitany cloud-capping cloud-masterworker cloud-migration cloud-multicore cloud-simple cloud-two-tasks
            dht-chord dht-pastry energy-consumption energy-onoff energy-pstate energy-ptask energy-vm platform-failures 
 -          io-file io-remote io-storage task-priority process-kill process-migration process-suspend 
 +          io-file io-remote io-storage task-priority process-create process-kill process-migration process-suspend 
            platform-properties maestro-set process-startkilltime synchro-semaphore trace-categories 
-           trace-link-srcdst-user-variables trace-link-user-variables trace-masterworker trace-platform 
-           trace-process-migration trace-user-variables)
+           trace-route-user-variables trace-link-user-variables trace-masterworker trace-platform 
 -          trace-process-migration trace-simple trace-host-user-variables)
++          trace-process-migration trace-host-user-variables)
    add_executable       (${x}     ${x}/${x}.c)
    target_link_libraries(${x}     simgrid)
    set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@@ -93,7 -93,7 +93,7 @@@ foreach (example consumption onoff psta
    ADD_TESH_FACTORIES(msg-energy-${example} "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-${example}/energy-${example}.tesh)
  endforeach()
  
- foreach (x categories link-srcdst-user-variables link-user-variables masterworker platform process-migration simple user-variables)
+ foreach (x categories route-user-variables link-user-variables masterworker platform process-migration simple host-user-variables)
    ADD_TESH(msg-trace-${x} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/trace-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/trace-${x} trace-${x}.tesh)
  endforeach()
  
diff --combined examples/msg/README.doc
@@@ -67,11 -67,6 +67,11 @@@ shipped in the archive
  
  @section msg_ex_process Acting on Processes
  
 +  - <b>Creating processes</b>. 
 +    @ref examples/msg/process-create/process-create.c \n
 +    Most processes are started from the deployment XML file, but they
 +    can also be used with the @ref MSG_process_create() function.
 +
    - <b>Suspend and Resume processes</b>.
      @ref examples/msg/process-suspend/process-suspend.c \n
      Processes can be suspended and resumed during their executions
      You can specify a start time and a kill time in the deployment
      file. See all *_d.xml files in this directory.
  
 -TODO: add an example using @ref MSG_process_create()
 -
  @section msg_ex_tracing Tracing and visualization features
  
  Tracing can be activated by various configuration options which
  are illustrated in these example. See also the 
  @ref tracing_tracing_options "full list of options related to tracing".
  
 -  - <b>Basic example</b>. @ref examples/msg/trace-simple/trace-simple.c \n
 -    In this very simple program, each process creates, executes,
 -    and destroy a task. Recommanded options:
 -    @verbatim --cfg=tracing:yes --cfg=tracing/uncategorized:yes @endverbatim
 +It is interesting to run the process-create example with the following
 +options to see the task executions:
  
    - <b>Platform tracing</b>.
      @ref examples/msg/trace-platform/trace-platform.c \n
      @endverbatim     
  
  TODO: These tracing examples should be integrated in the examples to
- not dupplicate the C files. A full command line to see the result in
+ 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
  screenshots.
  
@@@ -144,25 -143,21 +144,21 @@@ the platform file. The following exampl
  They have to be run with the following options:
  @verbatim --cfg=tracing:yes --cfg=tracing/platform:yes
  @endverbatim
-  
    - <b>Attaching variables to Hosts</b>.
-     @ref examples/msg/trace-user-variables/trace-user-variables.c 
-   
+     @ref examples/msg/trace-host-user-variables/trace-host-user-variables.c 
    - <b>Attaching variables to Links</b>.
      @ref examples/msg/trace-link-user-variables/trace-link-user-variables.c \n
      The tricky part is that you have to know the name of the link you
      want to enhance with a variable.
-     
    - <b>Attaching variables to network Routes</b>
-     @ref examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables.c \n
+     @ref examples/msg/trace-route-user-variables/trace-route-user-variables.c \n
      It is often easier to update a given variable for all links of a
      given network path (identified by its source and destination
      hosts) instead of knowing the name of each specific link.
  
- TODO: rename trace-user-variables to trace-host-user-variables
- TODO: rename trace-link-srcdst-user-variables to trace-route-user-variables
  @section msg_ex_models Models-related examples
  
  @subsection msg_ex_ns3 NS3 as a SimGrid Network Model
@@@ -282,12 -277,12 +278,12 @@@ top of the example file)
  @example examples/msg/async-waitall/async-waitall.c
  @example examples/msg/async-waitall/async-waitany.c
  
 +@example examples/msg/process-create/process-create.c
  @example examples/msg/process-suspend/process-suspend.c
  @example examples/msg/process-kill/process-kill.c
  @example examples/msg/process-migration/process-migration.c
  @example examples/msg/process-startkilltime/process-startkilltime.c
  
 -@example examples/msg/trace-simple/trace-simple.c
  @example examples/msg/trace-platform/trace-platform.c
  @example examples/msg/trace-categories/trace-categories.c
  @example examples/msg/trace-masterworker/trace-masterworker.c