X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/83b6eb642c9777ecc8f947d1a645cbec1874173b..7dc4bb85bd3aac877dc0b80199606d66951cb374:/src/surf/network_im.c

diff --git a/src/surf/network_im.c b/src/surf/network_im.c
index fc12e428d8..d3816379e2 100644
--- a/src/surf/network_im.c
+++ b/src/surf/network_im.c
@@ -90,7 +90,6 @@ static int im_net_get_link_latency_limited(surf_action_t action);
 static int im_net_action_is_suspended(surf_action_t action);
 static double im_net_action_get_remains(surf_action_t action);
 static void im_net_action_set_max_duration(surf_action_t action, double duration);
-static void surf_network_model_init_CM02_im(const char *filename);
 static void im_net_update_actions_state(double now, double delta);
 static void update_action_remaining(double now);
 
@@ -295,8 +294,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;
@@ -315,19 +313,19 @@ static void im_net_action_cancel(surf_action_t action)
   heap_remove((surf_action_network_CM02_im_t) action);
 }
 
-void im_net_action_recycle(surf_action_t action)
+static void im_net_action_recycle(surf_action_t action)
 {
   return;
 }
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING
-int im_net_get_link_latency_limited(surf_action_t action)
+static int im_net_get_link_latency_limited(surf_action_t action)
 {
   return action->latency_limited;
 }
 #endif
 
-double im_net_action_get_remains(surf_action_t action)
+static double im_net_action_get_remains(surf_action_t action)
 {
   /* update remains before return it */
   update_action_remaining(surf_get_clock());
@@ -799,7 +797,7 @@ static int im_net_action_is_suspended(surf_action_t action)
   return ((surf_action_network_CM02_im_t) action)->suspended;
 }
 
-void im_net_action_set_max_duration(surf_action_t action, double duration)
+static void im_net_action_set_max_duration(surf_action_t action, double duration)
 {
   action->max_duration = duration;
   // remove action from the heap
@@ -874,8 +872,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));
 }
@@ -899,9 +896,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);
 }