X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/adfbfdd0c5a911371403647108561b36ac69b119..7d6302a1424685d59cbc1fee83dbe45dc7febccf:/examples/simdag/test_simdag.tesh

diff --git a/examples/simdag/test_simdag.tesh b/examples/simdag/test_simdag.tesh
index 07c954c007..d482d21c0b 100644
--- a/examples/simdag/test_simdag.tesh
+++ b/examples/simdag/test_simdag.tesh
@@ -3,35 +3,25 @@
 p Simple test of simdag
 
 $ $SG_TEST_EXENV ./sd_test ${srcdir:=.}/../msg/msg_platform.xml
-> [0.000000] surf/workstation_ptask_L07.c:917: [surf_workstation/WARNING] This model does not take latency into account.
-> [0.000000] [sd_test/INFO] Computation time for 2000000.000000 flops on Fernand: 0.090289
-> [0.000000] [sd_test/INFO] Computation time for 1000000.000000 flops on Ethernet: 0.010194
-> [0.000000] [sd_test/INFO] Route between Fernand and Ethernet:
-> [0.000000] surf/workstation_ptask_L07.c:553: [surf_workstation/WARNING] This model does not take latency into account.
-> [0.000000] [sd_test/INFO] 	Link 109: latency = 0.000000, bandwidth = 1858000.000000
-> [0.000000] [sd_test/INFO] 	Link 33: latency = 0.000000, bandwidth = 34285625.000000
-> [0.000000] [sd_test/INFO] 	Link 32: latency = 0.000000, bandwidth = 11618875.000000
-> [0.000000] [sd_test/INFO] 	Link 30: latency = 0.000000, bandwidth = 10099625.000000
-> [0.000000] [sd_test/INFO] 	Link 27: latency = 0.000000, bandwidth = 8015125.000000
-> [0.000000] [sd_test/INFO] 	Link 28: latency = 0.000000, bandwidth = 15376875.000000
-> [0.000000] [sd_test/INFO] 	Link 19: latency = 0.000000, bandwidth = 34285625.000000
-> [0.000000] [sd_test/INFO] 	Link 7: latency = 0.000000, bandwidth = 34285625.000000
-> [0.000000] [sd_test/INFO] 	Link 6: latency = 0.000000, bandwidth = 34285625.000000
-> [0.000000] [sd_test/INFO] 	Link 11: latency = 0.000000, bandwidth = 118682500.000000
-> [0.000000] [sd_test/INFO] 	Link 44: latency = 0.000000, bandwidth = 10314625.000000
-> [0.000000] [sd_test/INFO] 	Link 47: latency = 0.000000, bandwidth = 10314625.000000
-> [0.000000] [sd_test/INFO] 	Link 118: latency = 0.000000, bandwidth = 1467625.000000
-> [0.000000] [sd_test/INFO] Route latency = 0.000000, route bandwidth = 1467625.000000
-> [0.000000] [sd_test/INFO] Communication time for 2000000.000000 bytes between Fernand and Ethernet: 1.362746
-> [0.000000] [sd_test/INFO] Communication time for 3000000.000000 bytes between Ethernet and Fernand: 2.044119
-> [0.000000] [sd_test/INFO] Estimated time for 'Task D': 123.258786
+> [0.000000] [sd_test/INFO] Computation time for 2000000.000000 flops on Jacquelin: 0.014563
+> [0.000000] [sd_test/INFO] Computation time for 1000000.000000 flops on Intel: 0.007282
+> [0.000000] [sd_test/INFO] Route between Jacquelin and Intel:
+> [0.000000] [sd_test/INFO]    Link 145: latency = 0.000410, bandwidth = 2583375.000000
+> [0.000000] [sd_test/INFO]    Link 59: latency = 0.000371, bandwidth = 11845375.000000
+> [0.000000] [sd_test/INFO]    Link 56: latency = 0.029589, bandwidth = 21414750.000000
+> [0.000000] [sd_test/INFO]    Link 57: latency = 0.035083, bandwidth = 15376875.000000
+> [0.000000] [sd_test/INFO]    Link 141: latency = 0.005161, bandwidth = 472125.000000
+> [0.000000] [sd_test/INFO] Route latency = 0.070615, route bandwidth = 472125.000000
+> [0.000000] [sd_test/INFO] Communication time for 2000000.000000 bytes between Jacquelin and Intel: 4.306781
+> [0.000000] [sd_test/INFO] Communication time for 3000000.000000 bytes between Intel and Jacquelin: 6.424864
+> [0.000000] [sd_test/INFO] Estimated time for 'Task D': 385.928745
 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Task D'
-> [204.411890] [sd_kernel/INFO] Task 'Task D' done
-> [204.411890] [sd_kernel/INFO] Executing task 'Task B'
-> [204.411890] [sd_kernel/INFO] Executing task 'Task C'
-> [340.686483] [sd_kernel/INFO] Task 'Task B' done
-> [340.686483] [sd_task/INFO] Watch point reached with task 'Task B'!
-> [340.686483] [sd_kernel/INFO] Simulation finished
-> [340.686483] [sd_test/INFO] Task 'Task D' start time: -1.000000, finish time: 204.411890
-> [340.686483] [sd_test/INFO] Task 'Task B' start time: -1.000000, finish time: 340.686483
+> [1271.136703] [sd_kernel/INFO] Task 'Task D' done
+> [1271.136703] [sd_kernel/INFO] Executing task 'Task B'
+> [1271.136703] [sd_kernel/INFO] Executing task 'Task C'
+> [2118.584711] [sd_kernel/INFO] Task 'Task B' done
+> [2118.584711] [sd_task/INFO] Watch point reached with task 'Task B'!
+> [2118.584711] [sd_kernel/INFO] Simulation finished
+> [2118.584711] [sd_test/INFO] Task 'Task D' start time: 0.000000, finish time: 1271.136703
+> [2118.584711] [sd_test/INFO] Task 'Task B' start time: 1271.136703, finish time: 2118.584711