X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2dba2db9e7afc3db8eb181ae8f85e09a6399d1d5..f4e1c8752e7100a06bec488f150eff25d928ca34:/src/surf/network_im.c

diff --git a/src/surf/network_im.c b/src/surf/network_im.c
index 1e29a61b10..48447e1104 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);
 
@@ -314,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());
@@ -611,7 +610,7 @@ static surf_action_t im_net_communicate(const char *src_name,
 
 
   if (sg_network_fullduplex == 1) {
-    back_route = global_routing->get_route(dst_name, src_name);
+    back_route = routing_get_route(dst_name, src_name);
   }
 
   /* LARGE PLATFORMS HACK:
@@ -655,21 +654,21 @@ static surf_action_t im_net_communicate(const char *src_name,
         (link->lmm_resource.power.peak * link->lmm_resource.power.scale);
     if (bandwidth_bound < 0.0)
       bandwidth_bound =
-          (*im_bandwidth_factor_callback) (size) *
+          im_bandwidth_factor_callback(size) *
           (link->lmm_resource.power.peak * link->lmm_resource.power.scale);
     else
       bandwidth_bound =
           min(bandwidth_bound,
-              (*im_bandwidth_factor_callback) (size) *
+              im_bandwidth_factor_callback(size) *
               (link->lmm_resource.power.peak *
                link->lmm_resource.power.scale));
   }
   /* LARGE PLATFORMS HACK:
      Add src->link and dst->link latencies */
   action->lat_current = action->latency;
-  action->latency *= (*im_latency_factor_callback) (size);
+  action->latency *= im_latency_factor_callback(size);
   action->rate =
-      (*im_bandwidth_constraint_callback) (action->rate, bandwidth_bound,
+      im_bandwidth_constraint_callback(action->rate, bandwidth_bound,
                                         size);
 
   /* LARGE PLATFORMS HACK:
@@ -748,7 +747,7 @@ static surf_action_t im_net_communicate(const char *src_name,
 
 static xbt_dynar_t im_net_get_route(const char *src, const char *dst)
 {
-  return global_routing->get_route(src, dst);
+  return routing_get_route(src, dst);
 }
 
 static double im_net_get_link_bandwidth(const void *link)
@@ -798,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
@@ -811,8 +810,6 @@ static void im_net_finalize(void)
   surf_model_exit(surf_network_model);
   surf_network_model = NULL;
 
-  global_routing->finalize();
-
   lmm_system_free(network_im_maxmin_system);
   network_im_maxmin_system = NULL;