X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/228ee811b8c37d6632474eb69781f99857ad9c6f..1619b56e8f7f377298f37c4004406c0aab78a151:/examples/msg/tracing/ms.tesh

diff --git a/examples/msg/tracing/ms.tesh b/examples/msg/tracing/ms.tesh
index 30d894f104..8a054ecd1d 100644
--- a/examples/msg/tracing/ms.tesh
+++ b/examples/msg/tracing/ms.tesh
@@ -1,9 +1,71 @@
 #! ./tesh
 
 p Tracing master/slave application
+$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/buffer:1 --cfg=tracing/filename:tracing/ms.trace --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=viva/categorized:tracing/ms.cat.plist --cfg=viva/uncategorized:tracing/ms.uncat.plist ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to '1'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/ms.trace'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to '1'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'tracing/ms.cat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'tracing/ms.uncat.plist'
+> [4.485137] [msg_test/INFO] Declared tracing categories:
+> [4.485137] [msg_test/INFO] request
+> [4.485137] [msg_test/INFO] finalize
+> [4.485137] [msg_test/INFO] report
+> [4.485137] [msg_test/INFO] compute
+> [4.485137] [msg_test/INFO] Declared marks:
+> [4.485137] [msg_test/INFO] msmark
+
+p Not tracing master/slave application
+$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml
 
-$ $SG_TEST_EXENV tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:ms.trace --cfg=tracing/platform:1 ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml
+p Testing tracing by process
+$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/msg/process:1 --cfg=tracing/buffer:1 --cfg=tracing/filename:tracing/ms.trace --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=viva/categorized:tracing/ms.cat.plist --cfg=viva/uncategorized:tracing/ms.uncat.plist ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'ms.trace'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to '1'
-> [4.441598] [msg_test/INFO] Simulation time 4.4416
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to '1'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to '1'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/ms.trace'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to '1'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'tracing/ms.cat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'tracing/ms.uncat.plist'
+> [4.485137] [msg_test/INFO] Declared tracing categories:
+> [4.485137] [msg_test/INFO] request
+> [4.485137] [msg_test/INFO] finalize
+> [4.485137] [msg_test/INFO] report
+> [4.485137] [msg_test/INFO] compute
+> [4.485137] [msg_test/INFO] Declared marks:
+> [4.485137] [msg_test/INFO] msmark
+
+$ $SG_TEST_EXENV cat tracing/ms.uncat.plist
+>   node = ("HOST","LINK");
+>   edge = ("0-LINK13-LINK13","0-LINK13-HOST1","0-HOST1-LINK13");
+> 
+>   host = {
+>     type = "square";
+>     size = "power";
+>     values = ("power_used");
+>   };
+>   link = {
+>     type = "rhombus";
+>     size = "bandwidth";
+>     values = ("bandwidth_used");
+>   };
+
+$ $SG_TEST_EXENV cat tracing/ms.cat.plist
+>   node = ("HOST","LINK");
+>   edge = ("0-LINK13-LINK13","0-LINK13-HOST1","0-HOST1-LINK13");
+> 
+>   host = {
+>     type = "square";
+>     size = "power";
+>     values = ("pcompute","preport","pfinalize","prequest");
+>   };
+>   link = {
+>     type = "rhombus";
+>     size = "bandwidth";
+>     values = ("bcompute","breport","bfinalize","brequest");
+>   };
+
+$ rm -rf tracing/ms.trace tracing/ms.cat.plist tracing/ms.uncat.plist