X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4676d5e57abd98702608661750274226eb48e20e..1587ca593968128116000190ab81d47f3ed2eecf:/src/surf/network_constant.c diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c index 4d2fd380e3..fc5580ddc6 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, +static surf_action_t netcste_communicate(void *src, + void *dst, double size, double rate) { surf_action_network_Constant_t action = NULL; + char *src_name = ((network_element_t)src)->name; + char *dst_name = ((network_element_t)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); }