X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/767a7a537b2ac742705d23b8dcb25d64cd36a2ee..3d489fd0ea1a24796b898737fdd6a67a8b7bedab:/examples/simdag/dag-dotload/sd_dag-dotload.tesh

diff --git a/examples/simdag/dag-dotload/sd_dag-dotload.tesh b/examples/simdag/dag-dotload/sd_dag-dotload.tesh
index 2af6b29032..687feb3697 100644
--- a/examples/simdag/dag-dotload/sd_dag-dotload.tesh
+++ b/examples/simdag/dag-dotload/sd_dag-dotload.tesh
@@ -1,7 +1,7 @@
 #! ./tesh
 p Test the loader of DAG written in the DOT format
 
-$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/dag-dotload/dag.dot
+$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../platforms/two_clusters.xml ${srcdir:=.}/dag-dotload/dag.dot
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG ---------------------------
 > [0.000000] [sd_task/INFO] Displaying task root
@@ -10,8 +10,8 @@ $ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=
 > [0.000000] [sd_task/INFO]   - amount: 0
 > [0.000000] [sd_task/INFO]   - Dependencies to satisfy: 0
 > [0.000000] [sd_task/INFO]   - post-dependencies:
-> [0.000000] [sd_task/INFO]     root->5
 > [0.000000] [sd_task/INFO]     0
+> [0.000000] [sd_task/INFO]     root->5
 > [0.000000] [sd_task/INFO] Displaying task 0
 > [0.000000] [sd_task/INFO]   - state: not scheduled not runnable
 > [0.000000] [sd_task/INFO]   - kind: sequential computation
@@ -182,39 +182,39 @@ $ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=
 > [0.000000] [sd_task/INFO]   - amount: 10000000129
 > [0.000000] [sd_task/INFO]   - Dependencies to satisfy: 2
 > [0.000000] [sd_task/INFO]   - pre-dependencies:
-> [0.000000] [sd_task/INFO]     7->end
 > [0.000000] [sd_task/INFO]     9
+> [0.000000] [sd_task/INFO]     7->end
 > [0.000000] [test/INFO] ------------------- Schedule tasks ---------------------------
 > [0.000000] [test/INFO] ------------------- Run the schedule ---------------------------
-> [62.002281] [test/INFO] ------------------- Produce the trace file---------------------------
-> [62.002281] [test/INFO] Producing the trace of the run into dag.trace
+> [110.006082] [test/INFO] ------------------- Produce the trace file---------------------------
+> [110.006082] [test/INFO] Producing the trace of the run into dag.trace
 
 $ cat ${srcdir:=.}/dag-dotload/dag.trace
-> [0.000000->0.000000] C2-05 compute 0.000000 flops # root
-> [0.000000->2.000000] C2-06 compute 10000000129.452715 flops # 0
-> [2.000380->4.000380] C2-07 compute 10000000131.133657 flops # 1
-> [4.000760->6.000760] C2-08 compute 10000000121.124870 flops # 2
-> [6.001140->8.001140] C2-09 compute 10000000230.608025 flops # 3
-> [8.001140->18.001140] C1-00 compute 10000000004.994019 flops # 4
-> [18.001520->28.001520] C1-01 compute 10000000046.016401 flops # 5
-> [28.001520->38.001521] C1-02 compute 10000000091.598791 flops # 6
-> [38.001901->48.001901] C1-03 compute 10000000040.679438 flops # 7
-> [48.002281->58.002281] C1-04 compute 10000000250.490017 flops # 8
-> [58.002281->60.002281] C2-05 compute 10000000079.267649 flops # 9
-> [2.000000 -> 2.000380] C2-06 -> C2-07 transfer of 10001 bytes # 0->1
-> [4.000380 -> 4.000760] C2-07 -> C2-08 transfer of 10004 bytes # 1->2
-> [6.000760 -> 6.001140] C2-08 -> C2-09 transfer of 10002 bytes # 2->3
-> [18.001140 -> 18.001520] C1-00 -> C1-01 transfer of 10029 bytes # 4->5
-> [38.001521 -> 38.001901] C1-02 -> C1-03 transfer of 10005 bytes # 6->7
-> [48.001901 -> 48.002281] C1-03 -> C1-04 transfer of 10000 bytes # 7->8
-> [48.001901 -> 48.294118] C1-03 -> C2-05 transfer of 10014000 bytes # 7->end
-> [0.000000 -> 0.292217] C2-05 -> C1-01 transfer of 10014000 bytes # root->5
-> [60.002281->62.002281] C2-05 compute 10000000129.452715 flops # end
+> [0.000000->0.000000] node-3.acme.org compute 0.000000 flops # root
+> [0.000000->10.000000] node-7.acme.org compute 10000000129.452715 flops # 0
+> [10.001680->20.001680] node-10.acme.org compute 10000000131.133657 flops # 1
+> [20.002360->30.002360] node-14.acme.org compute 10000000121.124870 flops # 2
+> [30.003040->40.003041] node-18.acme.org compute 10000000230.608025 flops # 3
+> [40.003041->50.003041] node-0.acme.org compute 10000000004.994019 flops # 4
+> [50.003721->60.003721] node-4.acme.org compute 10000000046.016401 flops # 5
+> [60.003721->70.003721] node-8.acme.org compute 10000000091.598791 flops # 6
+> [70.005401->80.005401] node-11.acme.org compute 10000000040.679438 flops # 7
+> [80.006081->90.006081] node-15.acme.org compute 10000000250.490017 flops # 8
+> [90.006081->100.006081] node-19.acme.org compute 10000000079.267649 flops # 9
+> [10.000000 -> 10.001680] node-7.acme.org -> node-10.acme.org transfer of 10001 bytes # 0->1
+> [20.001680 -> 20.002360] node-10.acme.org -> node-14.acme.org transfer of 10004 bytes # 1->2
+> [30.002360 -> 30.003040] node-14.acme.org -> node-18.acme.org transfer of 10002 bytes # 2->3
+> [50.003041 -> 50.003721] node-0.acme.org -> node-4.acme.org transfer of 10029 bytes # 4->5
+> [70.003721 -> 70.005401] node-8.acme.org -> node-11.acme.org transfer of 10005 bytes # 6->7
+> [80.005401 -> 80.006081] node-11.acme.org -> node-15.acme.org transfer of 10000 bytes # 7->8
+> [80.005401 -> 80.087113] node-11.acme.org -> node-3.acme.org transfer of 10014000 bytes # 7->end
+> [0.000000 -> 0.080712] node-3.acme.org -> node-4.acme.org transfer of 10014000 bytes # root->5
+> [100.006081->110.006082] node-3.acme.org compute 10000000129.452715 flops # end
 
 $ rm -f ${srcdir:=.}/dag-dotload/dag.trace ${srcdir:=.}/dot.dot
 
 ! expect return 2
-$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/dag-dotload/dag_with_cycle.dot
+$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../platforms/two_clusters.xml ${srcdir:=.}/dag-dotload/dag_with_cycle.dot
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_daxparse/WARNING] the task root is not marked
 > [0.000000] [sd_daxparse/WARNING] the task 0 is in a cycle