X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d510dd9844ff0da71e3856a38fe067973d03e04..967421ad9a8dcd567206f2c398a30c08c9507a81:/src/surf/network_constant.c diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c index 3279f4d97c..e1be0fe41a 100644 --- a/src/surf/network_constant.c +++ b/src/surf/network_constant.c @@ -109,8 +109,8 @@ static void netcste_update_resource_state(void *id, DIE_IMPOSSIBLE; } -static surf_action_t netcste_communicate(network_element_t src, - network_element_t dst, +static surf_action_t netcste_communicate(sg_routing_edge_t src, + sg_routing_edge_t dst, double size, double rate) { surf_action_network_Constant_t action = NULL; @@ -200,7 +200,7 @@ void surf_network_model_init_Constant() surf_network_model->action_unref = netcste_action_unref; surf_network_model->action_cancel = netcste_action_cancel; surf_network_model->action_recycle = net_action_recycle; - surf_network_model->get_remains = net_action_get_remains; + surf_network_model->get_remains = surf_action_get_remains; #ifdef HAVE_LATENCY_BOUND_TRACKING surf_network_model->get_latency_limited = net_get_link_latency_limited; #endif @@ -217,7 +217,7 @@ void surf_network_model_init_Constant() surf_network_model->suspend = netcste_action_suspend; surf_network_model->resume = netcste_action_resume; surf_network_model->is_suspended = netcste_action_is_suspended; - surf_cpu_model->set_max_duration = net_action_set_max_duration; + surf_cpu_model->set_max_duration = surf_action_set_max_duration; surf_network_model->extension.network.communicate = netcste_communicate; surf_network_model->extension.network.get_link_bandwidth = @@ -234,5 +234,5 @@ void surf_network_model_init_Constant() netcste_define_callbacks(); xbt_dynar_push(model_list, &surf_network_model); - routing_model_create(sizeof(double), NULL); + routing_model_create(NULL); }