X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/312ea85b08482b85d612f0f3707cab8b788c82af..95b11095f38bb2b508878eb860d1b52ca7e9d09c:/src/surf/network_constant.c diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c index 4d2fd380e3..3279f4d97c 100644 --- a/src/surf/network_constant.c +++ b/src/surf/network_constant.c @@ -109,12 +109,15 @@ static void netcste_update_resource_state(void *id, DIE_IMPOSSIBLE; } -static surf_action_t netcste_communicate(const char *src_name, - const char *dst_name, double size, - double rate) +static surf_action_t netcste_communicate(network_element_t src, + network_element_t dst, + double size, double rate) { surf_action_network_Constant_t action = NULL; + char *src_name = src->name; + char *dst_name = dst->name; + XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate); action = @@ -147,16 +150,19 @@ static void netcste_action_set_category(surf_action_t action, const char *catego static double netcste_get_link_bandwidth(const void *link) { DIE_IMPOSSIBLE; + return -1.0; } static double netcste_get_link_latency(const void *link) { DIE_IMPOSSIBLE; + return -1.0; } static int link_shared(const void *link) { DIE_IMPOSSIBLE; + return -1; } static void netcste_action_suspend(surf_action_t action) @@ -228,6 +234,5 @@ void surf_network_model_init_Constant() netcste_define_callbacks(); xbt_dynar_push(model_list, &surf_network_model); - xbt_cfg_set_string(_surf_cfg_set, "routing", "none"); routing_model_create(sizeof(double), NULL); }