X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a4f777f30924d7890b9e1da29f9d1a637035531b..4f1b870c89a0d6481e0f0b8252db600e80dfe2ca:/src/surf/network_constant.c diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c index 4c9db111f3..4d2fd380e3 100644 --- a/src/surf/network_constant.c +++ b/src/surf/network_constant.c @@ -21,14 +21,12 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); static random_data_t random_latency = NULL; static int host_number_int = 0; -static void netcste_count_hosts(void) -{ +static void netcste_count_hosts(sg_platf_host_cbarg_t h) { host_number_int++; } -static void netcste_define_callbacks(void) -{ - surfxml_add_callback(STag_surfxml_host_cb_list, &netcste_count_hosts); +static void netcste_define_callbacks(void) { + sg_platf_host_add_cb(netcste_count_hosts); } static int netcste_resource_used(void *resource_id) @@ -146,12 +144,6 @@ static void netcste_action_set_category(surf_action_t action, const char *catego } #endif -/* returns an array of link_Constant_t */ -static xbt_dynar_t netcste_get_route(void *src, void *dst) -{ - xbt_die("Calling this function does not make any sense"); -} - static double netcste_get_link_bandwidth(const void *link) { DIE_IMPOSSIBLE; @@ -236,9 +228,6 @@ void surf_network_model_init_Constant() netcste_define_callbacks(); xbt_dynar_push(model_list, &surf_network_model); - update_model_description(surf_network_model_description, - "Constant", surf_network_model); - xbt_cfg_set_string(_surf_cfg_set, "routing", "none"); - routing_model_create(sizeof(double), NULL, netcste_get_link_latency); + routing_model_create(sizeof(double), NULL); }