From d500056e6dcd1e406d42db6add9c322be533d451 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Mon, 16 May 2016 07:27:03 +0200 Subject: [PATCH] rename tracing example --- examples/msg/CMakeLists.txt | 4 ++-- examples/msg/README.doc | 12 +++++------- .../trace-host-user-variables.tesh} | 6 +++--- .../trace-hots-user-variables.c} | 0 4 files changed, 10 insertions(+), 12 deletions(-) rename examples/msg/{trace-user-variables/trace-user-variables.tesh => trace-host-user-variables/trace-host-user-variables.tesh} (64%) rename examples/msg/{trace-user-variables/trace-user-variables.c => trace-host-user-variables/trace-hots-user-variables.c} (100%) diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt index d821cd083a..6791887e87 100644 --- a/examples/msg/CMakeLists.txt +++ b/examples/msg/CMakeLists.txt @@ -4,7 +4,7 @@ foreach(x actions-comm actions-storage app-masterworker app-pingpong app-pmm app io-file io-remote io-storage task-priority 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-simple trace-user-variables) + trace-process-migration trace-simple 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 link-srcdst-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 1ee4a2e5da..2ee5df2765 100644 --- a/examples/msg/README.doc +++ b/examples/msg/README.doc @@ -132,7 +132,7 @@ are illustrated in these example. See also the @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. @@ -143,23 +143,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 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 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-user-variables/trace-user-variables.c b/examples/msg/trace-host-user-variables/trace-hots-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-hots-user-variables.c -- 2.20.1