merge branches

[simgrid.git] / src / surf / network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index bbdd940..e22c2b6 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -437,7 +437,7 @@ static void net_update_actions_state(double now, double delta)
                                    action->weight);
     }
 #ifdef HAVE_TRACING
-    if (TRACE_is_active()) {
+    if (TRACE_is_enabled()) {
       xbt_dynar_t route = global_routing->get_route(action->src_name,
                                                     action->dst_name);
       link_CM02_t link;
@@ -610,9 +610,9 @@ static surf_action_t net_communicate(const char *src_name,
 
   xbt_dynar_t back_route = NULL;
   int constraints_per_variable = 0;
-  // I will need this route for some time so let's call get_route_no_cleanup
-  xbt_dynar_t route = global_routing->get_route_no_cleanup(src_name, dst_name);
-
+  xbt_dynar_t route;
+  // I will need this route for some time so require for no cleanup
+  global_routing->get_route_latency(src_name, dst_name, &route, &latency, 0);
 
   if (sg_network_fullduplex == 1) {
     back_route = global_routing->get_route(dst_name, src_name);
@@ -624,7 +624,6 @@ static surf_action_t net_communicate(const char *src_name,
   XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
   /* LARGE PLATFORMS HACK:
      assert on total_route_size */
-  latency = global_routing->get_latency(src_name,dst_name);
   xbt_assert(xbt_dynar_length(route) || latency,
               "You're trying to send data from %s to %s but there is no connection at all between these two hosts.",
               src_name, dst_name);
@@ -733,7 +732,7 @@ static surf_action_t net_communicate(const char *src_name,
   /* LARGE PLATFORMS HACK:
      expand also with src->link and dst->link */
 #ifdef HAVE_TRACING
-  if (TRACE_is_active()) {
+  if (TRACE_is_enabled()) {
     action->src_name = xbt_strdup(src_name);
     action->dst_name = xbt_strdup(dst_name);
   } else {
@@ -912,7 +911,7 @@ void surf_network_model_init_LegrandVelho(const char *filename)
   xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 8775);
 
   update_model_description(surf_network_model_description,
-                           "LV08", surf_network_model);
+                           "LV08_fullupdate", surf_network_model);
 }
 
 /***************************************************************************/