fix one, rename another

diff --git a/.gitignore b/.gitignore
index 96971ad..219c49c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -174,13 +174,13 @@ 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

diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt
index 6791887..4a07977 100644 (file)
--- a/examples/msg/CMakeLists.txt
+++ b/examples/msg/CMakeLists.txt
@@ -3,7 +3,7 @@ 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-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-route-user-variables trace-link-user-variables trace-masterworker trace-platform 
           trace-process-migration trace-simple trace-host-user-variables)
   add_executable       (${x}     ${x}/${x}.c)
   target_link_libraries(${x}     simgrid)
@@ -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 host-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 2ee5df2..cdf812b 100644 (file)
--- a/examples/msg/README.doc
+++ b/examples/msg/README.doc
@@ -153,13 +153,11 @@ They have to be run with the following options:
     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-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-host-user-variables/trace-hots-user-variables.c b/examples/msg/trace-host-user-variables/trace-host-user-variables.c
similarity index 100%
rename from examples/msg/trace-host-user-variables/trace-hots-user-variables.c
rename to examples/msg/trace-host-user-variables/trace-host-user-variables.c

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 3a7a93f..bba795c 100644 (file)
--- 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'