Use the partial invalidation optimization by default for the network too

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

diff --git a/src/surf/network_im.c b/src/surf/network_im.c
index 82590fe..24b4942 100644 (file)
--- a/src/surf/network_im.c
+++ b/src/surf/network_im.c
@@ -170,7 +170,7 @@ static link_CM02_im_t im_net_link_new(char *name,
                             state_initial, state_trace,
                             bw_initial, bw_trace);
 
-  xbt_assert1(!xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL),
+  xbt_assert(!xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL),
               "Link '%s' declared several times in the platform file.",
               name);
 
@@ -205,7 +205,7 @@ static void im_net_parse_link_init(void)
   surf_parse_get_double(&lat_initial, A_surfxml_link_latency);
   lat_trace = tmgr_trace_new(A_surfxml_link_latency_file);
 
-  xbt_assert0((A_surfxml_link_state == A_surfxml_link_state_ON)
+  xbt_assert((A_surfxml_link_state == A_surfxml_link_state_ON)
               || (A_surfxml_link_state ==
                   A_surfxml_link_state_OFF), "Invalid state");
   if (A_surfxml_link_state == A_surfxml_link_state_ON)
@@ -275,9 +275,9 @@ static void im_net_add_traces(void)
     link_CM02_im_t link =
                xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
 
-    xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined",
+    xbt_assert(link, "Cannot connect trace %s to link %s: link undefined",
                 trace_name, elm);
-    xbt_assert2(trace,
+    xbt_assert(trace,
                 "Cannot connect trace %s to link %s: trace undefined",
                 trace_name, elm);
 
@@ -290,9 +290,9 @@ static void im_net_add_traces(void)
     link_CM02_im_t link =
                xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
 
-    xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined",
+    xbt_assert(link, "Cannot connect trace %s to link %s: link undefined",
                 trace_name, elm);
-    xbt_assert2(trace,
+    xbt_assert(trace,
                 "Cannot connect trace %s to link %s: trace undefined",
                 trace_name, elm);
 
@@ -305,9 +305,9 @@ static void im_net_add_traces(void)
     link_CM02_im_t link =
                xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
 
-    xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined",
+    xbt_assert(link, "Cannot connect trace %s to link %s: link undefined",
                 trace_name, elm);
-    xbt_assert2(trace,
+    xbt_assert(trace,
                 "Cannot connect trace %s to link %s: trace undefined",
                 trace_name, elm);
 
@@ -669,7 +669,7 @@ static surf_action_t im_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 */
-  xbt_assert2(xbt_dynar_length(route),
+  xbt_assert(xbt_dynar_length(route),
               "You're trying to send data from %s to %s but there is no connection between these two hosts.",
               src_name, dst_name);
 
@@ -781,9 +781,12 @@ static surf_action_t im_net_communicate(const char *src_name,
   /* LARGE PLATFORMS HACK:
      expand also with src->link and dst->link */
 #ifdef HAVE_TRACING
-  action->src_name = xbt_strdup(src_name);
-
-  action->dst_name = xbt_strdup(dst_name);
+  if (TRACE_is_enabled()) {
+    action->src_name = xbt_strdup(src_name);
+    action->dst_name = xbt_strdup(dst_name);
+  } else {
+    action->src_name = action->dst_name = NULL;
+  }
 #endif
 
   xbt_dynar_free(&route);
@@ -870,8 +873,6 @@ static void im_net_finalize(void)
 static void im_surf_network_model_init_internal(void)
 {
   s_surf_action_network_CM02_im_t comm;
-  XBT_INFO("You are using the UNSAFE lazy management optimization, I hope you know what you are doing.");
-  XBT_INFO("====> For now this optimization is only available for LV08_im network model.");
 
   surf_network_model = surf_model_init();
 
@@ -948,7 +949,7 @@ void im_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_im", surf_network_model);
+                           "LV08", surf_network_model);
 }