X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa192f6d7ece3eefc304338f852824cc15be6909..3d845df082d79ab89649c1a8829eea201ae01085:/examples/simdag/test_simdag_tracing.tesh

diff --git a/examples/simdag/test_simdag_tracing.tesh b/examples/simdag/test_simdag_tracing.tesh
index 34b8439e71..8c50b9fe8d 100644
--- a/examples/simdag/test_simdag_tracing.tesh
+++ b/examples/simdag/test_simdag_tracing.tesh
@@ -3,10 +3,10 @@
 
 p Simple test of simdag
 
-$ $SG_TEST_EXENV ./simdag_tracing --cfg=tracing:1 --cfg=tracing/categorized:1 ${srcdir:=.}/2clusters.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1'
-> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
+$ $SG_TEST_EXENV ./simdag_tracing --cfg=tracing:yes --cfg=tracing/categorized:yes ${srcdir:=.}/2clusters.xml
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
+> [0.000000] [surf_host/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_seq_access/INFO] Access mode of C2-05 is sequential
 > [0.000000] [sd_seq_access/INFO] Access mode of C2-06 is sequential
 > [0.000000] [sd_seq_access/INFO] Task A is currently running on C2-05 (SD_TASK_COMP_SEQ)
@@ -157,9 +157,9 @@ $ tail -n +3 ./simgrid.trace
 > 6 0 23 3 0 "13"
 > 6 0 24 3 0 "10"
 > 6 0 25 3 0 "5"
-> 4 6 0 1 3 0-HOST1-LINK3
-> 4 7 0 3 3 0-LINK3-LINK3
-> 4 8 0 3 1 0-LINK3-HOST1
+> 4 6 0 3 3 0-LINK3-LINK3
+> 4 7 0 3 1 0-LINK3-HOST1
+> 4 8 0 1 3 0-HOST1-LINK3
 > 8 0 2 1 5000000000.000000
 > 8 0 2 2 1000000000.000000
 > 8 0 2 3 5000000000.000000
@@ -200,60 +200,64 @@ $ tail -n +3 ./simgrid.trace
 > 8 0 5 24 0.000100
 > 8 0 4 25 125000000.000000
 > 8 0 5 25 0.000100
-> 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 btaskA "0.800026 0.545312 0.857926"
-> 1 10 1 ptaskA "0.800026 0.545312 0.857926"
-> 1 11 3 btaskB "0.904944 0.089118 0.069832"
-> 1 12 1 ptaskB "0.904944 0.089118 0.069832"
-> 1 13 3 btaskC "0.696799 0.247098 0.497311"
-> 1 14 1 ptaskC "0.696799 0.247098 0.497311"
+> 15 0 6 0 topology 12 0
+> 16 0 6 0 topology 23 0
+> 15 0 6 0 topology 24 1
+> 16 0 6 0 topology 22 1
+> 15 0 6 0 topology 24 2
+> 16 0 6 0 topology 17 2
+> 15 0 6 0 topology 24 3
+> 16 0 6 0 topology 21 3
+> 15 0 7 0 topology 13 4
+> 16 0 7 0 topology 2 4
+> 15 0 6 0 topology 12 5
+> 16 0 6 0 topology 19 5
+> 15 0 7 0 topology 14 6
+> 16 0 7 0 topology 3 6
+> 15 0 7 0 topology 22 7
+> 16 0 7 0 topology 9 7
+> 15 0 7 0 topology 21 8
+> 16 0 7 0 topology 8 8
+> 15 0 8 0 topology 1 9
+> 16 0 8 0 topology 11 9
+> 15 0 7 0 topology 19 10
+> 16 0 7 0 topology 6 10
+> 15 0 6 0 topology 16 11
+> 16 0 6 0 topology 24 11
+> 15 0 6 0 topology 18 12
+> 16 0 6 0 topology 16 12
+> 15 0 6 0 topology 23 13
+> 16 0 6 0 topology 18 13
+> 15 0 6 0 topology 24 14
+> 16 0 6 0 topology 20 14
+> 15 0 7 0 topology 20 15
+> 16 0 7 0 topology 7 15
+> 15 0 6 0 topology 24 16
+> 16 0 6 0 topology 13 16
+> 15 0 6 0 topology 12 17
+> 16 0 6 0 topology 25 17
+> 15 0 6 0 topology 11 18
+> 16 0 6 0 topology 12 18
+> 15 0 6 0 topology 12 19
+> 16 0 6 0 topology 14 19
+> 15 0 6 0 topology 12 20
+> 16 0 6 0 topology 15 20
+> 15 0 7 0 topology 25 21
+> 16 0 7 0 topology 10 21
+> 15 0 7 0 topology 15 22
+> 16 0 7 0 topology 4 22
+> 15 0 7 0 topology 17 23
+> 16 0 7 0 topology 5 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