Revalidate output due to:

  1) recent parsings modification and maybe xbt_dict modifications:
     the first two hosts of the list are not the same ones as they
     used to.
  2) improvements in the surf model (latency is taken into account in
     the bandwidth bound)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5286 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/simdag/sd_test.c b/examples/simdag/sd_test.c
index e2f174f..120c1d8 100644 (file)
--- a/examples/simdag/sd_test.c
+++ b/examples/simdag/sd_test.c
@@ -64,7 +64,7 @@ int main(int argc, char **argv) {
   route = SD_route_get_list(w1, w2);
   route_size = SD_route_get_size(w1, w2);
   for (i = 0; i < route_size; i++) {
-    INFO3("\tLink %s: latency = %f, bandwidth = %f", SD_link_get_name(route[i]),
+    INFO3("   Link %s: latency = %f, bandwidth = %f", SD_link_get_name(route[i]),
          SD_link_get_current_latency(route[i]), SD_link_get_current_bandwidth(route[i]));
   }
   INFO2("Route latency = %f, route bandwidth = %f", SD_route_get_current_latency(w1, w2),

diff --git a/examples/simdag/test_simdag.tesh b/examples/simdag/test_simdag.tesh
index 2dd883c..d482d21 100644 (file)
--- a/examples/simdag/test_simdag.tesh
+++ b/examples/simdag/test_simdag.tesh
@@ -3,33 +3,25 @@
 p Simple test of simdag
 
 $ $SG_TEST_EXENV ./sd_test ${srcdir:=.}/../msg/msg_platform.xml
-> [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] [sd_test/INFO]    Link 109: latency = 0.000821, bandwidth = 1858000.000000
-> [0.000000] [sd_test/INFO]    Link 33: latency = 0.000514, bandwidth = 34285625.000000
-> [0.000000] [sd_test/INFO]    Link 32: latency = 0.000190, bandwidth = 11618875.000000
-> [0.000000] [sd_test/INFO]    Link 30: latency = 0.000480, bandwidth = 10099625.000000
-> [0.000000] [sd_test/INFO]    Link 27: latency = 0.035077, bandwidth = 8015125.000000
-> [0.000000] [sd_test/INFO]    Link 28: latency = 0.035083, bandwidth = 15376875.000000
-> [0.000000] [sd_test/INFO]    Link 19: latency = 0.000514, bandwidth = 34285625.000000
-> [0.000000] [sd_test/INFO]    Link 7: latency = 0.000514, bandwidth = 34285625.000000
-> [0.000000] [sd_test/INFO]    Link 6: latency = 0.000514, bandwidth = 34285625.000000
-> [0.000000] [sd_test/INFO]    Link 11: latency = 0.000137, bandwidth = 118682500.000000
-> [0.000000] [sd_test/INFO]    Link 44: latency = 0.006933, bandwidth = 10314625.000000
-> [0.000000] [sd_test/INFO]    Link 47: latency = 0.006933, bandwidth = 10314625.000000
-> [0.000000] [sd_test/INFO]    Link 118: latency = 0.000870, bandwidth = 1467625.000000
-> [0.000000] [sd_test/INFO] Route latency = 0.088580, route bandwidth = 1467625.000000
-> [0.000000] [sd_test/INFO] Communication time for 2000000.000000 bytes between Fernand and Ethernet: 1.451326
-> [0.000000] [sd_test/INFO] Communication time for 3000000.000000 bytes between Ethernet and Fernand: 2.132699
-> [0.000000] [sd_test/INFO] Estimated time for 'Task D': 128.573571
+> [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.500470] [sd_kernel/INFO] Task 'Task D' done
-> [204.500470] [sd_kernel/INFO] Executing task 'Task B'
-> [204.500470] [sd_kernel/INFO] Executing task 'Task C'
-> [340.863643] [sd_kernel/INFO] Task 'Task B' done
-> [340.863643] [sd_task/INFO] Watch point reached with task 'Task B'!
-> [340.863643] [sd_kernel/INFO] Simulation finished
-> [340.863643] [sd_test/INFO] Task 'Task D' start time: 0.000000, finish time: 204.500470
-> [340.863643] [sd_test/INFO] Task 'Task B' start time: 204.500470, finish time: 340.863643
+> [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