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

diff --git a/examples/msg/tracing/ms.tesh b/examples/msg/tracing/ms.tesh
index b3770d92c5..d99e42d6f1 100644
--- a/examples/msg/tracing/ms.tesh
+++ b/examples/msg/tracing/ms.tesh
@@ -1,60 +1,88 @@
 #! ./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=triva/categorized:tracing/ms.cat.plist --cfg=triva/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'
+$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:tracing/ms.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:tracing/ms.cat.plist --cfg=viva/uncategorized:tracing/ms.uncat.plist ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/tracing/deployment.xml
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'
 > [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 'triva/categorized' to 'tracing/ms.cat.plist'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'triva/uncategorized' to 'tracing/ms.uncat.plist'
-> [0.000000] [instr_config/INFO] Tracing resource utilization active, network/optim configuration now set to Full.
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'
+> [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.214821] [msg_test/INFO] Declared tracing categories:
+> [4.214821] [msg_test/INFO] request
+> [4.214821] [msg_test/INFO] finalize
+> [4.214821] [msg_test/INFO] report
+> [4.214821] [msg_test/INFO] compute
+> [4.214821] [msg_test/INFO] Declared marks:
+> [4.214821] [msg_test/INFO] msmark
 
-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=triva/categorized:tracing/ms.cat.plist --cfg=triva/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/msg/process' to '1'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to '1'
+p Tracing master/slave application with xml config
+$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT ${srcdir:=.}/../platforms/config_tracing.xml ${srcdir:=.}/tracing/deployment.xml
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'tracing/ms.cat.plist'
 > [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 'triva/categorized' to 'tracing/ms.cat.plist'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'triva/uncategorized' to 'tracing/ms.uncat.plist'
-> [0.000000] [instr_config/INFO] Tracing resource utilization active, network/optim configuration now set to Full.
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'tracing/ms.uncat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
+> [4.214821] [msg_test/INFO] Declared tracing categories:
+> [4.214821] [msg_test/INFO] request
+> [4.214821] [msg_test/INFO] finalize
+> [4.214821] [msg_test/INFO] report
+> [4.214821] [msg_test/INFO] compute
+> [4.214821] [msg_test/INFO] Declared marks:
+> [4.214821] [msg_test/INFO] msmark
+
+p Not tracing master/slave application
+$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/tracing/deployment.xml
+
+p Testing tracing by process
+$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:yes --cfg=tracing/msg/process:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:tracing/ms.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:tracing/ms.cat.plist --cfg=viva/uncategorized:tracing/ms.uncat.plist ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/tracing/deployment.xml
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to 'yes'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'
+> [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 'yes'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'
+> [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.214821] [msg_test/INFO] Declared tracing categories:
+> [4.214821] [msg_test/INFO] request
+> [4.214821] [msg_test/INFO] finalize
+> [4.214821] [msg_test/INFO] report
+> [4.214821] [msg_test/INFO] compute
+> [4.214821] [msg_test/INFO] Declared marks:
+> [4.214821] [msg_test/INFO] msmark
 
 $ $SG_TEST_EXENV cat tracing/ms.uncat.plist
-> {
->   node = (LINK, HOST, );
->   edge = (HOST-LINK, LINK-HOST, LINK-LINK, );
+>   node = ("HOST","LINK");
+>   edge = ("0-LINK13-LINK13","0-LINK13-HOST1","0-HOST1-LINK13");
 > 
 >   host = {
->     type = square;
->     size = power;
->     values = (power_used);
+>     type = "square";
+>     size = "power";
+>     values = ("power_used");
 >   };
 >   link = {
->     type = rhombus;
->     size = bandwidth;
->     values = (bandwidth_used);
+>     type = "rhombus";
+>     size = "bandwidth";
+>     values = ("bandwidth_used");
 >   };
-> }
 
 $ $SG_TEST_EXENV cat tracing/ms.cat.plist
-> {
->   node = (LINK, HOST, );
->   edge = (HOST-LINK, LINK-HOST, LINK-LINK, );
+>   node = ("HOST","LINK");
+>   edge = ("0-LINK13-LINK13","0-LINK13-HOST1","0-HOST1-LINK13");
 > 
 >   host = {
->     type = square;
->     size = power;
->     values = (prequest, pfinalize, preport, pcompute, );
+>     type = "square";
+>     size = "power";
+>     values = ("pcompute","preport","pfinalize","prequest");
 >   };
 >   link = {
->     type = rhombus;
->     size = bandwidth;
->     values = (brequest, bfinalize, breport, bcompute, );
+>     type = "rhombus";
+>     size = "bandwidth";
+>     values = ("bcompute","breport","bfinalize","brequest");
 >   };
-> }
 
 $ rm -rf tracing/ms.trace tracing/ms.cat.plist tracing/ms.uncat.plist