From: Frederic Suter Date: Thu, 24 Mar 2016 10:27:09 +0000 (+0100) Subject: kill tracing-gtnets examples X-Git-Tag: v3_13~312 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/077d899a2c6627b30846e848b4a029da720b7ea0 kill tracing-gtnets examples GTNets is not (really) supported anymore as it has been replaced by the ns-3 plugin. these examples are maintained until they are converted to ns-3, but there is no need to keep the tracing variant. --- diff --git a/examples/msg/gtnets/CMakeLists.txt b/examples/msg/gtnets/CMakeLists.txt index 69e1992985..42be81390a 100644 --- a/examples/msg/gtnets/CMakeLists.txt +++ b/examples/msg/gtnets/CMakeLists.txt @@ -3,13 +3,9 @@ target_link_libraries(gtnets simgrid) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/gtnets-crosstraffic.tesh ${CMAKE_CURRENT_SOURCE_DIR}/gtnets-onelink-gtnets.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/tracing-gtnets-dogbone-gtnets.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/tracing-gtnets-onelink-lv08.tesh ${CMAKE_CURRENT_SOURCE_DIR}/gtnets-dogbone-gtnets.tesh ${CMAKE_CURRENT_SOURCE_DIR}/gtnets-onelink-lv08.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/tracing-gtnets-dogbone-lv08.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/gtnets-dogbone-lv08.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/tracing-gtnets-onelink-gtnets.tesh PARENT_SCOPE) + ${CMAKE_CURRENT_SOURCE_DIR}/gtnets-dogbone-lv08.tesh PARENT_SCOPE) set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/crosstraffic-d.xml ${CMAKE_CURRENT_SOURCE_DIR}/dogbone-d.xml ${CMAKE_CURRENT_SOURCE_DIR}/dogbone-p.xml @@ -23,8 +19,4 @@ IF(HAVE_GTNETS) ADD_TESH_FACTORIES(msg-gtnets-dogbone-lv08 "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-lv08.tesh) ADD_TESH_FACTORIES(msg-gtnets-onelink-lv08 "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-lv08.tesh) ADD_TESH_FACTORIES(msg-gtnets-crosstraffic "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh) - ADD_TESH(msg-tracing-gtnets-dogbone --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh) - ADD_TESH(msg-tracing-gtnets-onelink --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh) - ADD_TESH(msg-tracing-gtnets-dogbone-lv08 --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh) - ADD_TESH(msg-tracing-gtnets-onelink-lv08 --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-onelink-lv08.tesh) ENDIF() diff --git a/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh b/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh deleted file mode 100644 index 8cdcf4bbb2..0000000000 --- a/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh +++ /dev/null @@ -1,13 +0,0 @@ -#! ./tesh - -p Testing dogbone communication pattern with GTNets model - -$ gtnets/gtnets ${srcdir:=.}/gtnets/dogbone-p.xml ${srcdir:=.}/gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_gtnets.trace --cfg=tracing/categorized:yes --cfg=host/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'dogbone_gtnets.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'host/model' to 'compound' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets' -> [0.000000] [surf_network_gtnets_interface/INFO] TCP window maximum size : 20000 -> [C1:slave:(3) 0.300171] [msg_test/INFO] ===> Estimated Bw of FLOW[0] : 33314.335278 ; message from S1 to C1 with remaining : 0.000000 -> [C1:slave:(3) 0.300171] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 33314.335278 ; message from S2 to C2 with remaining : 0.000000 diff --git a/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh b/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh deleted file mode 100644 index 85784a7b5b..0000000000 --- a/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh +++ /dev/null @@ -1,14 +0,0 @@ -#! ./tesh - -p Testing dogbone communication pattern with LV08 model - -$ gtnets/gtnets ${srcdir:=.}/gtnets/dogbone-p.xml ${srcdir:=.}/gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_lv08.trace --cfg=tracing/categorized:yes --cfg=host/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'dogbone_lv08.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'host/model' to 'compound' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'LV08' -> [C1:slave:(3) 0.342000] [msg_test/INFO] WARNING FLOW[0] is limited by latency!! -> [C1:slave:(3) 0.342000] [msg_test/INFO] ===> Estimated Bw of FLOW[0] : 29239.766082 ; message from S1 to C1 with remaining : 0.000000 -> [C1:slave:(3) 0.342000] [msg_test/INFO] WARNING FLOW[1] is limited by latency!! -> [C1:slave:(3) 0.342000] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 29239.766082 ; message from S2 to C2 with remaining : 0.000000 diff --git a/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh b/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh deleted file mode 100644 index a4a4abf583..0000000000 --- a/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh +++ /dev/null @@ -1,12 +0,0 @@ -#! ./tesh - -p Testing onelink communication pattern with GTNets model - -$ gtnets/gtnets ${srcdir:=.}/gtnets/onelink-p.xml ${srcdir:=.}/gtnets/onelink-d.xml --cfg=tracing/filename:onelink_gtnets.trace --cfg=tracing/categorized:yes --cfg=host/model:compound --cfg=cpu/model:Cas01 --cfg=host/model:GTNets -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'onelink_gtnets.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'host/model' to 'compound' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets' -> [0.000000] [surf_network_gtnets_interface/INFO] TCP window maximum size : 20000 -> [C1:slave:(2) 106.291000] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 9408.134273 ; message from S1 to C1 with remaining : 0.000000 diff --git a/examples/msg/gtnets/tracing-gtnets-onelink-lv08.tesh b/examples/msg/gtnets/tracing-gtnets-onelink-lv08.tesh deleted file mode 100644 index 259f6e0fa1..0000000000 --- a/examples/msg/gtnets/tracing-gtnets-onelink-lv08.tesh +++ /dev/null @@ -1,11 +0,0 @@ -#! ./tesh - -p Testing onelink communication pattern with LV08 model - -$ gtnets/gtnets ${srcdir:=.}/gtnets/onelink-p.xml ${srcdir:=.}/gtnets/onelink-d.xml --cfg=tracing/filename:onelink_lv08.trace --cfg=tracing/categorized:yes --cfg=host/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'onelink_lv08.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'host/model' to 'compound' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'LV08' -> [C1:slave:(2) 108.799652] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 9191.205854 ; message from S1 to C1 with remaining : 0.000000