what is that pimple, for god's sake??

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

diff --git a/src/surf/network_im.c b/src/surf/network_im.c
index bc94690..1e29a61 100644 (file)
--- a/src/surf/network_im.c
+++ b/src/surf/network_im.c
@@ -17,6 +17,8 @@
 #include "surf_private.h"
 #include "xbt/dict.h"
 #include "maxmin_private.h"
+#include "surf/surf_resource_lmm.h"
+
 
 #undef GENERIC_ACTION
 #define GENERIC_ACTION(action) action->generic_action
@@ -293,8 +295,7 @@ static int im_net_action_unref(surf_action_t action)
 #ifdef HAVE_TRACING
     xbt_free(((surf_action_network_CM02_im_t) action)->src_name);
     xbt_free(((surf_action_network_CM02_im_t) action)->dst_name);
-    if (action->category)
-      xbt_free(action->category);
+    xbt_free(action->category);
 #endif
     surf_action_free(&action);
     return 1;
@@ -872,8 +873,7 @@ static void im_surf_network_model_init_internal(void)
       im_net_create_resource(xbt_strdup("__loopback__"),
           498000000, NULL, 0.000015, NULL,
           SURF_RESOURCE_ON, NULL,
-          SURF_LINK_FATPIPE, NULL),
-          im_net_get_link_latency);
+          SURF_LINK_FATPIPE, NULL));
   im_net_modified_set =
       xbt_swag_new(xbt_swag_offset(comm, action_list_hookup));
 }
@@ -897,9 +897,6 @@ void im_surf_network_model_init_LegrandVelho(void)
   xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor",
                             0.92);
   xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 8775);
-
-  update_model_description(surf_network_model_description,
-                           "LV08", surf_network_model);
 }