X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/642bd255bc2ae9195c956807f6061246f6cb0f65..8cf96323cdfd440e8a1ec397816be6d7df95452a:/examples/msg/tracing/categories.tesh

diff --git a/examples/msg/tracing/categories.tesh b/examples/msg/tracing/categories.tesh
index 3af2888164..736ed84700 100644
--- a/examples/msg/tracing/categories.tesh
+++ b/examples/msg/tracing/categories.tesh
@@ -2,8 +2,9 @@
 
 p Tracing multiple categories master/slave application
 
-$ $SG_TEST_EXENV ${bindir:=.}/tracing/categories$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:tracing/categories.trace --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=triva/categorized:tracing/categories.cat.plist --cfg=triva/uncategorized:tracing/categories.uncat.plist ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml
+$ $SG_TEST_EXENV ${bindir:=.}/tracing/categories$EXEEXT --cfg=tracing:1 --cfg=tracing/buffer:1 --cfg=tracing/filename:tracing/categories.trace --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=triva/categorized:tracing/categories.cat.plist --cfg=triva/uncategorized:tracing/categories.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/categories.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'
@@ -30,7 +31,7 @@ $ cat tracing/categories.trace
 > %EndEventDef 
 > %EventDef PajeDefineEventType 3 
 > %       Alias string 
-> %       EntityType string 
+> %       ContainerType string 
 > %       Name string 
 > %       Color color 
 > %EndEventDef 
@@ -57,46 +58,46 @@ $ cat tracing/categories.trace
 > %EventDef PajeDestroyContainer 7 
 > %       Time date 
 > %       Type string 
-> %       Container string 
+> %       Name string 
 > %EndEventDef 
 > %EventDef PajeSetVariable 8 
 > %       Time date 
-> %       EntityType string 
+> %       Type string 
 > %       Container string 
 > %       Value string 
 > %EndEventDef
 > %EventDef PajeAddVariable 9 
 > %       Time date 
-> %       EntityType string 
+> %       Type string 
 > %       Container string 
 > %       Value string 
 > %EndEventDef
 > %EventDef PajeSubVariable 10 
 > %       Time date 
-> %       EntityType string 
+> %       Type string 
 > %       Container string 
 > %       Value string 
 > %EndEventDef
 > %EventDef PajeSetState 11 
 > %       Time date 
-> %       EntityType string 
+> %       Type string 
 > %       Container string 
 > %       Value string 
 > %EndEventDef
 > %EventDef PajePushState 12 
 > %       Time date 
-> %       EntityType string 
+> %       Type string 
 > %       Container string 
 > %       Value string 
 > %EndEventDef
 > %EventDef PajePopState 13 
 > %       Time date 
-> %       EntityType string 
+> %       Type string 
 > %       Container string 
 > %EndEventDef
 > %EventDef PajeStartLink 14 
 > %       Time date 
-> %       EntityType string 
+> %       Type string 
 > %       Container string 
 > %       Value string 
 > %       SourceContainer string 
@@ -104,7 +105,7 @@ $ cat tracing/categories.trace
 > %EndEventDef
 > %EventDef PajeEndLink 15 
 > %       Time date 
-> %       EntityType string 
+> %       Type string 
 > %       Container string 
 > %       Value string 
 > %       DestContainer string 
@@ -112,32 +113,32 @@ $ cat tracing/categories.trace
 > %EndEventDef
 > %EventDef PajeNewEvent 16 
 > %       Time date 
-> %       EntityType string 
+> %       Type string 
 > %       Container string 
 > %       Value string 
 > %EndEventDef
 > 0 1 0 HOST
-> 6 0 1 1 0 Tremblay
+> 6 0 1 1 0 "Tremblay"
 > 1 2 1 power "1 1 1"
 > 1 3 1 power_used "0.5 0.5 0.5"
-> 6 0 2 1 0 Jupiter
-> 6 0 3 1 0 Fafard
-> 6 0 4 1 0 Ginette
-> 6 0 5 1 0 Bourassa
+> 6 0 2 1 0 "Jupiter"
+> 6 0 3 1 0 "Fafard"
+> 6 0 4 1 0 "Ginette"
+> 6 0 5 1 0 "Bourassa"
 > 0 4 0 LINK
-> 6 0 6 4 0 6
+> 6 0 6 4 0 "6"
 > 1 5 4 bandwidth "1 1 1"
 > 1 6 4 latency "1 1 1"
 > 1 7 4 bandwidth_used "0.5 0.5 0.5"
-> 6 0 7 4 0 3
-> 6 0 8 4 0 7
-> 6 0 9 4 0 9
-> 6 0 10 4 0 2
-> 6 0 11 4 0 8
-> 6 0 12 4 0 1
-> 6 0 13 4 0 4
-> 6 0 14 4 0 0
-> 6 0 15 4 0 5
+> 6 0 7 4 0 "3"
+> 6 0 8 4 0 "7"
+> 6 0 9 4 0 "9"
+> 6 0 10 4 0 "2"
+> 6 0 11 4 0 "8"
+> 6 0 12 4 0 "1"
+> 6 0 13 4 0 "4"
+> 6 0 14 4 0 "0"
+> 6 0 15 4 0 "5"
 > 4 8 0 1 4 HOST-LINK
 > 4 9 0 4 4 LINK-LINK
 > 4 10 0 4 1 LINK-HOST