Use the get_latency function from the routing mechanism in network model

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

diff --git a/src/surf/network.c b/src/surf/network.c
index 3d448f5..2675db1 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -576,10 +576,10 @@ static surf_action_t net_communicate(const char *src_name,
   action->latency = 0.0;
   action->weight = 0.0;
   bandwidth_bound = -1.0;
+  action->weight = action->latency = global_routing->get_latency(src,dst);
+
   xbt_dynar_foreach(route, i, link) {
-    action->latency += link->lat_current;
     action->weight +=
-        link->lat_current +
         sg_weight_S_parameter /
         (link->lmm_resource.power.peak * link->lmm_resource.power.scale);
     if (bandwidth_bound < 0.0)