X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0602bfd9602a814fdee14bc2ac52688506d1dd6c..ac249310feeadb1a189810085f12127fcd2793d8:/examples/simdag/test_simdag_tracing.tesh

diff --git a/examples/simdag/test_simdag_tracing.tesh b/examples/simdag/test_simdag_tracing.tesh
index 62be58e9e8..b41312661a 100644
--- a/examples/simdag/test_simdag_tracing.tesh
+++ b/examples/simdag/test_simdag_tracing.tesh
@@ -1,5 +1,6 @@
 #! ./tesh
 
+
 p Simple test of simdag
 
 $ $SG_TEST_EXENV ./simdag_tracing --cfg=tracing:1 --cfg=tracing/categorized:1 ${srcdir:=.}/2clusters.xml
@@ -12,120 +13,119 @@ $ $SG_TEST_EXENV ./simdag_tracing --cfg=tracing:1 --cfg=tracing/categorized:1 ${
 > [0.000000] [sd_seq_access/INFO] There is no task running on C2-06
 > [0.400000] [sd_seq_access/INFO] Task B is currently running on C2-05 (SD_TASK_COMM_E2E)
 > [0.400000] [sd_seq_access/INFO] Task B is currently running on C2-06 (SD_TASK_COMM_E2E)
-> [30.400300] [sd_seq_access/INFO] Task C is currently running on C2-05 (SD_TASK_COMP_SEQ)
-> [30.400300] [sd_seq_access/INFO] There is no task running on C2-06
-> [30.800300] [sd_seq_access/INFO] There is no task running on C2-05
-> [30.800300] [sd_seq_access/INFO] There is no task running on C2-06
+> [8.400300] [sd_seq_access/INFO] Task C is currently running on C2-05 (SD_TASK_COMP_SEQ)
+> [8.400300] [sd_seq_access/INFO] There is no task running on C2-06
+> [8.800300] [sd_seq_access/INFO] There is no task running on C2-05
+> [8.800300] [sd_seq_access/INFO] There is no task running on C2-06
 
-$ cat ./simgrid.trace
-> %EventDef PajeDefineContainerType 0 
-> %       Alias string 
-> %       Type string 
-> %       Name string 
-> %EndEventDef 
-> %EventDef PajeDefineVariableType 1 
-> %       Alias string 
-> %       Type string 
-> %       Name string 
-> %       Color color 
-> %EndEventDef 
-> %EventDef PajeDefineStateType 2 
-> %       Alias string 
-> %       Type string 
-> %       Name string 
-> %EndEventDef 
-> %EventDef PajeDefineEventType 3 
-> %       Alias string 
-> %       Type string 
-> %       Name string 
-> %       Color color 
-> %EndEventDef 
-> %EventDef PajeDefineLinkType 4 
-> %       Alias string 
-> %       Type string 
-> %       StartContainerType string 
-> %       EndContainerType string 
-> %       Name string 
-> %EndEventDef 
-> %EventDef PajeDefineEntityValue 5 
-> %       Alias string 
-> %       Type string 
-> %       Name string 
-> %       Color color 
-> %EndEventDef 
-> %EventDef PajeCreateContainer 6 
-> %       Time date 
-> %       Alias string 
-> %       Type string 
-> %       Container string 
-> %       Name string 
-> %EndEventDef 
-> %EventDef PajeDestroyContainer 7 
-> %       Time date 
-> %       Type string 
-> %       Name string 
-> %EndEventDef 
-> %EventDef PajeSetVariable 8 
-> %       Time date 
-> %       Type string 
-> %       Container string 
-> %       Value double 
+$ tail -n +3 ./simgrid.trace
+> %EventDef PajeDefineContainerType 0
+> %       Alias string
+> %       Type string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDefineVariableType 1
+> %       Alias string
+> %       Type string
+> %       Name string
+> %       Color color
+> %EndEventDef
+> %EventDef PajeDefineStateType 2
+> %       Alias string
+> %       Type string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDefineEventType 3
+> %       Alias string
+> %       Type string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDefineLinkType 4
+> %       Alias string
+> %       Type string
+> %       StartContainerType string
+> %       EndContainerType string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDefineEntityValue 5
+> %       Alias string
+> %       Type string
+> %       Name string
+> %       Color color
+> %EndEventDef
+> %EventDef PajeCreateContainer 6
+> %       Time date
+> %       Alias string
+> %       Type string
+> %       Container string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDestroyContainer 7
+> %       Time date
+> %       Type string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeSetVariable 8
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value double
 > %EndEventDef
-> %EventDef PajeAddVariable 9 
-> %       Time date 
-> %       Type string 
-> %       Container string 
-> %       Value double 
+> %EventDef PajeAddVariable 9
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value double
 > %EndEventDef
-> %EventDef PajeSubVariable 10 
-> %       Time date 
-> %       Type string 
-> %       Container string 
-> %       Value double 
+> %EventDef PajeSubVariable 10
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value double
 > %EndEventDef
-> %EventDef PajeSetState 11 
-> %       Time date 
-> %       Type string 
-> %       Container string 
-> %       Value string 
+> %EventDef PajeSetState 11
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
 > %EndEventDef
-> %EventDef PajePushState 12 
-> %       Time date 
-> %       Type string 
-> %       Container string 
-> %       Value string 
+> %EventDef PajePushState 12
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
 > %EndEventDef
-> %EventDef PajePopState 13 
-> %       Time date 
-> %       Type string 
-> %       Container string 
+> %EventDef PajePopState 13
+> %       Time date
+> %       Type string
+> %       Container string
 > %EndEventDef
-> %EventDef PajeResetState 14 
-> %       Time date 
-> %       Type string 
-> %       Container string 
+> %EventDef PajeResetState 14
+> %       Time date
+> %       Type string
+> %       Container string
 > %EndEventDef
-> %EventDef PajeStartLink 15 
-> %       Time date 
-> %       Type string 
-> %       Container string 
-> %       Value string 
-> %       StartContainer string 
-> %       Key string 
+> %EventDef PajeStartLink 15
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
+> %       StartContainer string
+> %       Key string
 > %EndEventDef
-> %EventDef PajeEndLink 16 
-> %       Time date 
-> %       Type string 
-> %       Container string 
-> %       Value string 
-> %       EndContainer string 
-> %       Key string 
+> %EventDef PajeEndLink 16
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
+> %       EndContainer string
+> %       Key string
 > %EndEventDef
-> %EventDef PajeNewEvent 17 
-> %       Time date 
-> %       Type string 
-> %       Container string 
-> %       Value string 
+> %EventDef PajeNewEvent 17
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
 > %EndEventDef
 > 0 1 0 HOST
 > 6 0 1 1 0 "C2-06"
@@ -200,84 +200,88 @@ $ cat ./simgrid.trace
 > 8 0 5 24 0.000100
 > 8 0 4 25 125000000.000000
 > 8 0 5 25 0.000100
-> 15 0 6 0 G 10 0
-> 16 0 6 0 G 25 0
-> 15 0 7 0 G 25 1
-> 16 0 7 0 G 12 1
-> 15 0 7 0 G 12 2
-> 16 0 7 0 G 11 2
-> 15 0 8 0 G 11 3
-> 16 0 8 0 G 1 3
-> 15 0 7 0 G 12 4
-> 16 0 7 0 G 14 4
-> 15 0 8 0 G 14 5
-> 16 0 8 0 G 3 5
-> 15 0 7 0 G 12 6
-> 16 0 7 0 G 19 6
-> 15 0 8 0 G 19 7
-> 16 0 8 0 G 6 7
-> 15 0 7 0 G 12 8
-> 16 0 7 0 G 15 8
-> 15 0 8 0 G 15 9
-> 16 0 8 0 G 4 9
-> 15 0 7 0 G 12 10
-> 16 0 7 0 G 23 10
-> 15 0 7 0 G 23 11
-> 16 0 7 0 G 18 11
-> 15 0 7 0 G 18 12
-> 16 0 7 0 G 16 12
-> 15 0 7 0 G 16 13
-> 16 0 7 0 G 24 13
-> 15 0 7 0 G 24 14
-> 16 0 7 0 G 22 14
-> 15 0 8 0 G 22 15
-> 16 0 8 0 G 9 15
-> 15 0 7 0 G 24 16
-> 16 0 7 0 G 20 16
-> 15 0 8 0 G 20 17
-> 16 0 8 0 G 7 17
-> 15 0 7 0 G 24 18
-> 16 0 7 0 G 17 18
-> 15 0 8 0 G 17 19
-> 16 0 8 0 G 5 19
-> 15 0 7 0 G 24 20
-> 16 0 7 0 G 13 20
-> 15 0 8 0 G 13 21
-> 16 0 8 0 G 2 21
-> 15 0 7 0 G 24 22
-> 16 0 7 0 G 21 22
-> 15 0 8 0 G 21 23
-> 16 0 8 0 G 8 23
-> 1 9 3 btaskA "0.000000 0.000985 0.041631"
-> 1 10 1 ptaskA "0.000000 0.000985 0.041631"
-> 1 11 3 btaskB "0.176643 0.364602 0.091331"
-> 1 12 1 ptaskB "0.176643 0.364602 0.091331"
-> 1 13 3 btaskC "0.092298 0.487217 0.526750"
-> 1 14 1 ptaskC "0.092298 0.487217 0.526750"
-> 7 30.800300 1 10
-> 7 30.800300 1 1
-> 7 30.800300 1 3
-> 7 30.800300 1 6
-> 7 30.800300 1 4
-> 7 30.800300 1 9
-> 7 30.800300 3 24
-> 7 30.800300 1 7
-> 7 30.800300 3 12
-> 7 30.800300 1 5
-> 7 30.800300 3 16
-> 7 30.800300 1 2
-> 7 30.800300 3 23
-> 7 30.800300 1 8
-> 7 30.800300 3 18
-> 7 30.800300 3 22
-> 7 30.800300 3 20
-> 7 30.800300 3 17
-> 7 30.800300 3 13
-> 7 30.800300 3 21
-> 7 30.800300 3 25
-> 7 30.800300 3 11
-> 7 30.800300 3 14
-> 7 30.800300 3 19
-> 7 30.800300 3 15
+> 15 0 6 0 topology 10 0
+> 16 0 6 0 topology 25 0
+> 15 0 7 0 topology 25 1
+> 16 0 7 0 topology 12 1
+> 15 0 7 0 topology 12 2
+> 16 0 7 0 topology 11 2
+> 15 0 8 0 topology 11 3
+> 16 0 8 0 topology 1 3
+> 15 0 7 0 topology 12 4
+> 16 0 7 0 topology 14 4
+> 15 0 8 0 topology 14 5
+> 16 0 8 0 topology 3 5
+> 15 0 7 0 topology 12 6
+> 16 0 7 0 topology 19 6
+> 15 0 8 0 topology 19 7
+> 16 0 8 0 topology 6 7
+> 15 0 7 0 topology 12 8
+> 16 0 7 0 topology 15 8
+> 15 0 8 0 topology 15 9
+> 16 0 8 0 topology 4 9
+> 15 0 7 0 topology 12 10
+> 16 0 7 0 topology 23 10
+> 15 0 7 0 topology 23 11
+> 16 0 7 0 topology 18 11
+> 15 0 7 0 topology 18 12
+> 16 0 7 0 topology 16 12
+> 15 0 7 0 topology 16 13
+> 16 0 7 0 topology 24 13
+> 15 0 7 0 topology 24 14
+> 16 0 7 0 topology 22 14
+> 15 0 8 0 topology 22 15
+> 16 0 8 0 topology 9 15
+> 15 0 7 0 topology 24 16
+> 16 0 7 0 topology 20 16
+> 15 0 8 0 topology 20 17
+> 16 0 8 0 topology 7 17
+> 15 0 7 0 topology 24 18
+> 16 0 7 0 topology 17 18
+> 15 0 8 0 topology 17 19
+> 16 0 8 0 topology 5 19
+> 15 0 7 0 topology 24 20
+> 16 0 7 0 topology 13 20
+> 15 0 8 0 topology 13 21
+> 16 0 8 0 topology 2 21
+> 15 0 7 0 topology 24 22
+> 16 0 7 0 topology 21 22
+> 15 0 8 0 topology 21 23
+> 16 0 8 0 topology 8 23
+> 1 9 3 bCOMP_SEQ "0.800026 0.545312 0.857926"
+> 1 10 1 pCOMP_SEQ "0.800026 0.545312 0.857926"
+> 1 11 3 bCOMM_E2E "0.904944 0.089118 0.069832"
+> 1 12 1 pCOMM_E2E "0.904944 0.089118 0.069832"
+> 1 13 3 btaskA "0.696799 0.247098 0.497311"
+> 1 14 1 ptaskA "0.696799 0.247098 0.497311"
+> 1 15 3 btaskB "0.623917 0.040883 0.634111"
+> 1 16 1 ptaskB "0.623917 0.040883 0.634111"
+> 1 17 3 btaskC "0.832485 0.956278 0.337734"
+> 1 18 1 ptaskC "0.832485 0.956278 0.337734"
+> 7 8.800300 1 10
+> 7 8.800300 1 1
+> 7 8.800300 1 3
+> 7 8.800300 1 6
+> 7 8.800300 1 4
+> 7 8.800300 1 9
+> 7 8.800300 3 24
+> 7 8.800300 1 7
+> 7 8.800300 3 12
+> 7 8.800300 1 5
+> 7 8.800300 3 16
+> 7 8.800300 1 2
+> 7 8.800300 3 23
+> 7 8.800300 1 8
+> 7 8.800300 3 18
+> 7 8.800300 3 22
+> 7 8.800300 3 20
+> 7 8.800300 3 17
+> 7 8.800300 3 13
+> 7 8.800300 3 21
+> 7 8.800300 3 25
+> 7 8.800300 3 11
+> 7 8.800300 3 14
+> 7 8.800300 3 19
+> 7 8.800300 3 15
 
 $ rm -f simgrid.trace