X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e52cdafc655354a1c98193c817fc205d5be353e..d435bdefd34324ed0b0c25d1b6eb6dd3b7344524:/src/surf/network_im.c diff --git a/src/surf/network_im.c b/src/surf/network_im.c index b15b936f43..48447e1104 100644 --- a/src/surf/network_im.c +++ b/src/surf/network_im.c @@ -610,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: @@ -654,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: @@ -747,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)