updating tracing tesh'es to follow updates on category naming convention

[simgrid.git] / examples / msg / tracing / volume.tesh

diff --git a/examples/msg/tracing/volume.tesh b/examples/msg/tracing/volume.tesh
index 1c2117e..72dde29 100644 (file)
--- a/examples/msg/tracing/volume.tesh
+++ b/examples/msg/tracing/volume.tesh
@@ -6,7 +6,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/tracing/volume$EXEEXT --cfg=tracing:1 --cfg=tracin
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/volume.trace'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/volume' to '1'
-> [206.703278] [msg_test/INFO] Simulation time 206.703
+> [206.701532] [msg_test/INFO] Simulation time 206.702
 
 $ cat tracing/volume.trace
 > %EventDef PajeDefineContainerType 0 
@@ -38,54 +38,60 @@ $ cat tracing/volume.trace
 > %       DestContainerType string 
 > %       Name string 
 > %EndEventDef 
-> %EventDef PajeCreateContainer 5 
+> %EventDef PajeDefineEntityValue 5 
+> %       Alias string 
+> %       EntityType string 
+> %       Name string 
+> %       Color color 
+> %EndEventDef 
+> %EventDef PajeCreateContainer 6 
 > %       Time date 
 > %       Alias string 
 > %       Type string 
 > %       Container string 
 > %       Name string 
 > %EndEventDef 
-> %EventDef PajeDestroyContainer 6 
+> %EventDef PajeDestroyContainer 7 
 > %       Time date 
 > %       Type string 
 > %       Container string 
 > %EndEventDef 
-> %EventDef PajeSetVariable 7 
+> %EventDef PajeSetVariable 8 
 > %       Time date 
 > %       EntityType string 
 > %       Container string 
 > %       Value string 
 > %EndEventDef
-> %EventDef PajeAddVariable 8 
+> %EventDef PajeAddVariable 9 
 > %       Time date 
 > %       EntityType string 
 > %       Container string 
 > %       Value string 
 > %EndEventDef
-> %EventDef PajeSubVariable 9 
+> %EventDef PajeSubVariable 10 
 > %       Time date 
 > %       EntityType string 
 > %       Container string 
 > %       Value string 
 > %EndEventDef
-> %EventDef PajeSetState 10 
+> %EventDef PajeSetState 11 
 > %       Time date 
 > %       EntityType string 
 > %       Container string 
 > %       Value string 
 > %EndEventDef
-> %EventDef PajePushState 11 
+> %EventDef PajePushState 12 
 > %       Time date 
 > %       EntityType string 
 > %       Container string 
 > %       Value string 
 > %EndEventDef
-> %EventDef PajePopState 12 
+> %EventDef PajePopState 13 
 > %       Time date 
 > %       EntityType string 
 > %       Container string 
 > %EndEventDef
-> %EventDef PajeStartLink 13 
+> %EventDef PajeStartLink 14 
 > %       Time date 
 > %       EntityType string 
 > %       Container string 
@@ -93,7 +99,7 @@ $ cat tracing/volume.trace
 > %       SourceContainer string 
 > %       Key string 
 > %EndEventDef
-> %EventDef PajeEndLink 14 
+> %EventDef PajeEndLink 15 
 > %       Time date 
 > %       EntityType string 
 > %       Container string 
@@ -101,285 +107,155 @@ $ cat tracing/volume.trace
 > %       DestContainer string 
 > %       Key string 
 > %EndEventDef
-> %EventDef PajeNewEvent 15 
+> %EventDef PajeNewEvent 16 
 > %       Time date 
 > %       EntityType string 
 > %       Container string 
 > %       Value string 
 > %EndEventDef
 > 0 1 0 L1
-> 5 0 1 1 0 AS0
+> 6 0 1 1 0 AS0
 > 0 2 1 HOST
-> 5 0 2 2 1 Tremblay
+> 6 0 2 2 1 Tremblay
 > 1 3 2 power "1 1 1"
-> 5 0 3 2 1 Jupiter
-> 5 0 4 2 1 Fafard
-> 5 0 5 2 1 Ginette
-> 5 0 6 2 1 Bourassa
+> 6 0 3 2 1 Jupiter
+> 6 0 4 2 1 Fafard
+> 6 0 5 2 1 Ginette
+> 6 0 6 2 1 Bourassa
 > 0 4 1 ROUTER
-> 5 0 7 4 1 R.4-3
-> 5 0 8 4 1 R.3-2-5
-> 5 0 9 4 1 R.2-0
-> 5 0 10 4 1 R.1-0
-> 5 0 11 4 1 R.1-8-6
-> 5 0 12 4 1 R.6-7
+> 6 0 7 4 1 R.4-3
+> 6 0 8 4 1 R.3-2-5
+> 6 0 9 4 1 R.2-0
+> 6 0 10 4 1 R.1-0
+> 6 0 11 4 1 R.1-8-6
+> 6 0 12 4 1 R.6-7
 > 0 5 1 LINK
-> 5 0 13 5 1 6
+> 6 0 13 5 1 6
 > 1 6 5 bandwidth "1 1 1"
 > 1 7 5 latency "1 1 1"
-> 5 0 14 5 1 11
-> 5 0 15 5 1 3
-> 5 0 16 5 1 7
-> 5 0 17 5 1 9
-> 5 0 18 5 1 12
-> 5 0 19 5 1 2
-> 5 0 20 5 1 8
-> 5 0 21 5 1 1
-> 5 0 22 5 1 4
-> 5 0 23 5 1 0
-> 5 0 24 5 1 10
-> 5 0 25 5 1 5
-> 5 0 26 5 1 loopback
+> 6 0 14 5 1 3
+> 6 0 15 5 1 7
+> 6 0 16 5 1 9
+> 6 0 17 5 1 2
+> 6 0 18 5 1 8
+> 6 0 19 5 1 1
+> 6 0 20 5 1 4
+> 6 0 21 5 1 0
+> 6 0 22 5 1 5
 > 4 8 1 2 5 HOST-LINK
-> 4 9 1 5 2 LINK-HOST
-> 4 10 1 5 4 LINK-ROUTER
-> 4 11 1 5 5 LINK-LINK
+> 4 9 1 5 4 LINK-ROUTER
+> 4 10 1 5 5 LINK-LINK
+> 4 11 1 5 2 LINK-HOST
 > 4 12 1 4 5 ROUTER-LINK
-> 7 0 3 2 98095000.000000
-> 7 0 3 3 76296000.000000
-> 7 0 3 4 76296000.000000
-> 7 0 3 5 48492000.000000
-> 7 0 3 6 48492000.000000
-> 7 0 6 13 41279125.000000
-> 7 0 7 13 0.000060
-> 7 0 6 14 252750.000000
-> 7 0 7 14 0.005705
-> 7 0 6 15 34285622.000000
-> 7 0 7 15 0.000514
-> 7 0 6 16 11618875.000000
-> 7 0 7 16 0.000190
-> 7 0 6 17 7209750.000000
-> 7 0 7 17 0.001462
-> 7 0 6 18 1792625.000000
-> 7 0 7 18 0.007878
-> 7 0 6 19 22222222.000000
-> 7 0 7 19 0.000137
-> 7 0 6 20 8158000.000000
-> 7 0 7 20 0.000271
-> 7 0 6 21 34285625.000000
-> 7 0 7 21 0.000514
-> 7 0 6 22 10099625.000000
-> 7 0 7 22 0.000480
-> 7 0 6 23 41279125.000000
-> 7 0 7 23 0.000060
-> 7 0 6 24 4679750.000000
-> 7 0 7 24 0.000849
-> 7 0 6 25 27946250.000000
-> 7 0 7 25 0.000278
-> 7 0 6 26 498000000.000000
-> 7 0 7 26 0.000015
-> 13 0 8 1 G 4 0
-> 14 0 8 1 G 26 0
-> 13 0 9 1 G 26 1
-> 14 0 9 1 G 4 1
-> 13 0 8 1 G 4 2
-> 14 0 8 1 G 20 2
-> 13 0 10 1 G 20 3
-> 14 0 10 1 G 11 3
-> 13 0 8 1 G 4 4
-> 14 0 8 1 G 20 4
-> 13 0 11 1 G 20 5
-> 14 0 11 1 G 21 5
-> 13 0 11 1 G 21 6
-> 14 0 11 1 G 23 6
-> 13 0 11 1 G 23 7
-> 14 0 11 1 G 19 7
-> 13 0 11 1 G 19 8
-> 14 0 11 1 G 15 8
-> 13 0 11 1 G 15 9
-> 14 0 11 1 G 22 9
-> 13 0 9 1 G 22 10
-> 14 0 9 1 G 2 10
-> 13 0 8 1 G 4 11
-> 14 0 8 1 G 20 11
-> 13 0 11 1 G 20 12
-> 14 0 11 1 G 13 12
-> 13 0 11 1 G 13 13
-> 14 0 11 1 G 16 13
-> 13 0 9 1 G 16 14
-> 14 0 9 1 G 6 14
-> 13 0 8 1 G 4 15
-> 14 0 8 1 G 20 15
-> 13 0 11 1 G 20 16
-> 14 0 11 1 G 21 16
-> 13 0 11 1 G 21 17
-> 14 0 11 1 G 23 17
-> 13 0 11 1 G 23 18
-> 14 0 11 1 G 19 18
-> 13 0 11 1 G 19 19
-> 14 0 11 1 G 15 19
-> 13 0 11 1 G 15 20
-> 14 0 11 1 G 22 20
-> 13 0 11 1 G 22 21
-> 14 0 11 1 G 17 21
-> 13 0 9 1 G 17 22
-> 14 0 9 1 G 3 22
-> 13 0 8 1 G 4 23
-> 14 0 8 1 G 20 23
-> 13 0 11 1 G 20 24
-> 14 0 11 1 G 21 24
-> 13 0 11 1 G 21 25
-> 14 0 11 1 G 23 25
-> 13 0 11 1 G 23 26
-> 14 0 11 1 G 19 26
-> 13 0 11 1 G 19 27
-> 14 0 11 1 G 25 27
-> 13 0 9 1 G 25 28
-> 14 0 9 1 G 5 28
-> 13 0 12 1 G 9 29
-> 14 0 12 1 G 19 29
-> 13 0 10 1 G 19 30
-> 14 0 10 1 G 8 30
-> 13 0 12 1 G 9 31
-> 14 0 12 1 G 23 31
-> 13 0 10 1 G 23 32
-> 14 0 10 1 G 10 32
-> 13 0 12 1 G 7 33
-> 14 0 12 1 G 15 33
-> 13 0 10 1 G 15 34
-> 14 0 10 1 G 8 34
-> 13 0 12 1 G 7 35
-> 14 0 12 1 G 22 35
-> 13 0 9 1 G 22 36
-> 14 0 9 1 G 2 36
-> 13 0 12 1 G 8 37
-> 14 0 12 1 G 25 37
-> 13 0 9 1 G 25 38
-> 14 0 9 1 G 5 38
-> 13 0 12 1 G 11 39
-> 14 0 12 1 G 13 39
-> 13 0 10 1 G 13 40
-> 14 0 10 1 G 12 40
-> 13 0 12 1 G 11 41
-> 14 0 12 1 G 21 41
-> 13 0 10 1 G 21 42
-> 14 0 10 1 G 10 42
-> 13 0 12 1 G 12 43
-> 14 0 12 1 G 16 43
-> 13 0 9 1 G 16 44
-> 14 0 9 1 G 6 44
-> 13 0 8 1 G 2 45
-> 14 0 8 1 G 26 45
-> 13 0 9 1 G 26 46
-> 14 0 9 1 G 2 46
-> 13 0 8 1 G 2 47
-> 14 0 8 1 G 22 47
-> 13 0 11 1 G 22 48
-> 14 0 11 1 G 15 48
-> 13 0 11 1 G 15 49
-> 14 0 11 1 G 19 49
-> 13 0 11 1 G 19 50
-> 14 0 11 1 G 23 50
-> 13 0 11 1 G 23 51
-> 14 0 11 1 G 21 51
-> 13 0 11 1 G 21 52
-> 14 0 11 1 G 13 52
-> 13 0 11 1 G 13 53
-> 14 0 11 1 G 16 53
-> 13 0 9 1 G 16 54
-> 14 0 9 1 G 6 54
-> 13 0 8 1 G 2 55
-> 14 0 8 1 G 17 55
-> 13 0 9 1 G 17 56
-> 14 0 9 1 G 3 56
-> 13 0 8 1 G 2 57
-> 14 0 8 1 G 22 57
-> 13 0 11 1 G 22 58
-> 14 0 11 1 G 15 58
-> 13 0 11 1 G 15 59
-> 14 0 11 1 G 25 59
-> 13 0 9 1 G 25 60
-> 14 0 9 1 G 5 60
-> 13 0 8 1 G 6 61
-> 14 0 8 1 G 26 61
-> 13 0 9 1 G 26 62
-> 14 0 9 1 G 6 62
-> 13 0 8 1 G 6 63
-> 14 0 8 1 G 16 63
-> 13 0 11 1 G 16 64
-> 14 0 11 1 G 13 64
-> 13 0 11 1 G 13 65
-> 14 0 11 1 G 21 65
-> 13 0 11 1 G 21 66
-> 14 0 11 1 G 23 66
-> 13 0 11 1 G 23 67
-> 14 0 11 1 G 19 67
-> 13 0 11 1 G 19 68
-> 14 0 11 1 G 15 68
-> 13 0 11 1 G 15 69
-> 14 0 11 1 G 22 69
-> 13 0 11 1 G 22 70
-> 14 0 11 1 G 17 70
-> 13 0 9 1 G 17 71
-> 14 0 9 1 G 3 71
-> 13 0 8 1 G 6 72
-> 14 0 8 1 G 16 72
-> 13 0 11 1 G 16 73
-> 14 0 11 1 G 13 73
-> 13 0 11 1 G 13 74
-> 14 0 11 1 G 21 74
-> 13 0 11 1 G 21 75
-> 14 0 11 1 G 23 75
-> 13 0 11 1 G 23 76
-> 14 0 11 1 G 19 76
-> 13 0 11 1 G 19 77
-> 14 0 11 1 G 25 77
-> 13 0 9 1 G 25 78
-> 14 0 9 1 G 5 78
-> 13 0 8 1 G 3 79
-> 14 0 8 1 G 26 79
-> 13 0 9 1 G 26 80
-> 14 0 9 1 G 3 80
-> 13 0 8 1 G 3 81
-> 14 0 8 1 G 17 81
-> 13 0 11 1 G 17 82
-> 14 0 11 1 G 22 82
-> 13 0 11 1 G 22 83
-> 14 0 11 1 G 15 83
-> 13 0 11 1 G 15 84
-> 14 0 11 1 G 25 84
-> 13 0 9 1 G 25 85
-> 14 0 9 1 G 5 85
-> 13 0 8 1 G 5 86
-> 14 0 8 1 G 26 86
-> 13 0 9 1 G 26 87
-> 14 0 9 1 G 5 87
-> 6 206.703278 2 4
-> 6 206.703278 4 9
-> 6 206.703278 4 7
-> 6 206.703278 4 8
-> 6 206.703278 4 11
-> 6 206.703278 4 12
-> 6 206.703278 2 2
-> 6 206.703278 5 24
-> 6 206.703278 5 14
-> 6 206.703278 5 18
-> 6 206.703278 5 26
-> 6 206.703278 4 10
-> 6 206.703278 5 23
-> 6 206.703278 5 21
-> 6 206.703278 5 19
-> 6 206.703278 5 15
-> 6 206.703278 5 22
-> 6 206.703278 5 25
-> 6 206.703278 5 13
-> 6 206.703278 5 16
-> 6 206.703278 5 20
-> 6 206.703278 5 17
-> 6 206.703278 2 6
-> 6 206.703278 2 3
-> 6 206.703278 2 5
-> 6 206.703278 1 1
-> 6 206.703278 0 0
+> 8 0 3 2 98095000.000000
+> 8 0 3 3 76296000.000000
+> 8 0 3 4 76296000.000000
+> 8 0 3 5 48492000.000000
+> 8 0 3 6 48492000.000000
+> 8 0 6 13 41279125.000000
+> 8 0 7 13 0.000060
+> 8 0 6 14 34285622.000000
+> 8 0 7 14 0.000514
+> 8 0 6 15 11618875.000000
+> 8 0 7 15 0.000190
+> 8 0 6 16 7209750.000000
+> 8 0 7 16 0.001462
+> 8 0 6 17 22222222.000000
+> 8 0 7 17 0.000137
+> 8 0 6 18 8158000.000000
+> 8 0 7 18 0.000271
+> 8 0 6 19 34285625.000000
+> 8 0 7 19 0.000514
+> 8 0 6 20 10099625.000000
+> 8 0 7 20 0.000480
+> 8 0 6 21 41279125.000000
+> 8 0 7 21 0.000060
+> 8 0 6 22 27946250.000000
+> 8 0 7 22 0.000278
+> 14 0 8 1 G 4 0
+> 15 0 8 1 G 18 0
+> 14 0 9 1 G 18 1
+> 15 0 9 1 G 11 1
+> 14 0 10 1 G 18 2
+> 15 0 10 1 G 19 2
+> 14 0 10 1 G 19 3
+> 15 0 10 1 G 21 3
+> 14 0 10 1 G 21 4
+> 15 0 10 1 G 17 4
+> 14 0 10 1 G 17 5
+> 15 0 10 1 G 14 5
+> 14 0 10 1 G 14 6
+> 15 0 10 1 G 20 6
+> 14 0 11 1 G 20 7
+> 15 0 11 1 G 2 7
+> 14 0 10 1 G 18 8
+> 15 0 10 1 G 13 8
+> 14 0 10 1 G 13 9
+> 15 0 10 1 G 15 9
+> 14 0 11 1 G 15 10
+> 15 0 11 1 G 6 10
+> 14 0 10 1 G 20 11
+> 15 0 10 1 G 16 11
+> 14 0 11 1 G 16 12
+> 15 0 11 1 G 3 12
+> 14 0 10 1 G 17 13
+> 15 0 10 1 G 22 13
+> 14 0 11 1 G 22 14
+> 15 0 11 1 G 5 14
+> 14 0 12 1 G 9 15
+> 15 0 12 1 G 17 15
+> 14 0 9 1 G 17 16
+> 15 0 9 1 G 8 16
+> 14 0 12 1 G 9 17
+> 15 0 12 1 G 21 17
+> 14 0 9 1 G 21 18
+> 15 0 9 1 G 10 18
+> 14 0 12 1 G 7 19
+> 15 0 12 1 G 14 19
+> 14 0 9 1 G 14 20
+> 15 0 9 1 G 8 20
+> 14 0 12 1 G 7 21
+> 15 0 12 1 G 20 21
+> 14 0 12 1 G 8 22
+> 15 0 12 1 G 22 22
+> 14 0 12 1 G 11 23
+> 15 0 12 1 G 13 23
+> 14 0 9 1 G 13 24
+> 15 0 9 1 G 12 24
+> 14 0 12 1 G 11 25
+> 15 0 12 1 G 19 25
+> 14 0 9 1 G 19 26
+> 15 0 9 1 G 10 26
+> 14 0 12 1 G 12 27
+> 15 0 12 1 G 15 27
+> 14 0 10 1 G 19 28
+> 15 0 10 1 G 13 28
+> 14 0 8 1 G 2 29
+> 15 0 8 1 G 16 29
+> 14 0 10 1 G 14 30
+> 15 0 10 1 G 22 30
+> 7 206.701532 2 4
+> 7 206.701532 4 9
+> 7 206.701532 4 7
+> 7 206.701532 4 8
+> 7 206.701532 4 11
+> 7 206.701532 4 12
+> 7 206.701532 2 2
+> 7 206.701532 4 10
+> 7 206.701532 5 21
+> 7 206.701532 5 19
+> 7 206.701532 5 17
+> 7 206.701532 5 14
+> 7 206.701532 5 20
+> 7 206.701532 5 22
+> 7 206.701532 5 13
+> 7 206.701532 5 15
+> 7 206.701532 5 18
+> 7 206.701532 5 16
+> 7 206.701532 2 6
+> 7 206.701532 2 3
+> 7 206.701532 2 5
+> 7 206.701532 1 1
+> 7 206.701532 0 0
 
 $ rm -rf tracing/volume.trace