From: Martin Quinson Date: Mon, 16 May 2016 05:55:59 +0000 (+0200) Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid X-Git-Tag: v3_14~1218 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fa566f5efbd82018b1cf560e2453eb846c49c173?hp=e8175ac79e57c59b2cfbfa4c42c1af98e21c06aa Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid --- diff --git a/.gitignore b/.gitignore index 6093dcfd95..6c39838bd8 100644 --- a/.gitignore +++ b/.gitignore @@ -175,12 +175,12 @@ 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-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 diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt index b6e8d4a926..683fc99092 100644 --- a/examples/msg/CMakeLists.txt +++ b/examples/msg/CMakeLists.txt @@ -3,8 +3,8 @@ foreach(x actions-comm actions-storage app-masterworker app-pingpong app-pmm app 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-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-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 @@ foreach (example consumption onoff pstate vm) 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 --git a/examples/msg/README.doc b/examples/msg/README.doc index c2c9b0a08c..639f786334 100644 --- a/examples/msg/README.doc +++ b/examples/msg/README.doc @@ -133,7 +133,7 @@ options to see the task executions: @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 +144,21 @@ the platform file. The following examples illustrate this feature. They have to be run with the following options: @verbatim --cfg=tracing:yes --cfg=tracing/platform:yes @endverbatim - + - Attaching variables to Hosts. - @ref examples/msg/trace-user-variables/trace-user-variables.c - + @ref examples/msg/trace-host-user-variables/trace-host-user-variables.c + - Attaching variables to Links. @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. - + - Attaching variables to network Routes - @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 diff --git a/examples/msg/trace-user-variables/trace-user-variables.c b/examples/msg/trace-host-user-variables/trace-host-user-variables.c similarity index 100% rename from examples/msg/trace-user-variables/trace-user-variables.c rename to examples/msg/trace-host-user-variables/trace-host-user-variables.c diff --git a/examples/msg/trace-user-variables/trace-user-variables.tesh b/examples/msg/trace-host-user-variables/trace-host-user-variables.tesh similarity index 64% rename from examples/msg/trace-user-variables/trace-user-variables.tesh rename to examples/msg/trace-host-user-variables/trace-host-user-variables.tesh index d0d291aa95..d537d35fe4 100644 --- a/examples/msg/trace-user-variables/trace-user-variables.tesh +++ b/examples/msg/trace-host-user-variables/trace-host-user-variables.tesh @@ -1,7 +1,7 @@ #! ./tesh -p Tracing user variables -$ $SG_TEST_EXENV ${bindir:=.}/trace-user-variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/app-masterworker/app-masterworker_d.xml +p Tracing user variables for hosts +$ $SG_TEST_EXENV ${bindir:=.}/trace-host-user-variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/app-masterworker/app-masterworker_d.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes' > [0.004078] [msg_test/INFO] Declared host variables: @@ -19,4 +19,4 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace-user-variables$EXEEXT --cfg=tracing:yes --c $ rm -f viva_graph.plist p Not tracing user variables -$ $SG_TEST_EXENV ${bindir:=.}/trace-user-variables$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/app-masterworker/app-masterworker_d.xml +$ $SG_TEST_EXENV ${bindir:=.}/trace-host-user-variables$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/app-masterworker/app-masterworker_d.xml diff --git a/examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables.c b/examples/msg/trace-route-user-variables/trace-route-user-variables.c similarity index 100% rename from examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables.c rename to examples/msg/trace-route-user-variables/trace-route-user-variables.c diff --git a/examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables.tesh b/examples/msg/trace-route-user-variables/trace-route-user-variables.tesh similarity index 99% rename from examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables.tesh rename to examples/msg/trace-route-user-variables/trace-route-user-variables.tesh index 3a7a93fc69..bba795c440 100644 --- a/examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables.tesh +++ b/examples/msg/trace-route-user-variables/trace-route-user-variables.tesh @@ -1,7 +1,7 @@ #! ./tesh p Trace user variables associated to links of the platform file -$ $SG_TEST_EXENV ${bindir:=.}/trace-link-srcdst-user-variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/app-masterworker/app-masterworker_d.xml +$ $SG_TEST_EXENV ${bindir:=.}/trace-route-user-variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/app-masterworker/app-masterworker_d.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes'