X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae943ce975f323351c52acbfa5045ff064fae451..6094020a03f9c10b954e3e1d32e1a3ffc75a8d7f:/src/surf/surfxml_parse.c diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 250ee7e448..49414140e6 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -573,9 +573,8 @@ double get_cpu_power(const char *power) generator = xbt_malloc(q - (p + 6) + 1); memcpy(generator, p + 6, q - (p + 6)); generator[q - (p + 6)] = '\0'; - xbt_assert1((random = - xbt_dict_get_or_null(random_data_list, generator)), - "Random generator %s undefined", generator); + random = xbt_dict_get_or_null(random_data_list, generator); + xbt_assert1(random, "Random generator %s undefined", generator); power_scale = random_generate(random); } } else { @@ -694,6 +693,46 @@ void surf_wsL07_link_create_resource(char *name, properties); } +/** + * + *init new routing model component + */ + +void surf_AS_new(const char *AS_id, const char *AS_mode) +{ + routing_AS_init(AS_id, AS_mode); +} + +void surf_AS_finalize(const char *AS_id) +{ + routing_AS_end(AS_id); +} + +/* + * add host to the network element list + */ +void surf_route_add_host(const char *host_id) +{ + routing_add_host(host_id); +} + +/** + * set route + */ +void surf_routing_add_route(const char *src_id, const char *dst_id, + xbt_dynar_t links_id) +{ + unsigned int i; + const char *link_id; + routing_set_route(src_id, dst_id); + xbt_dynar_foreach(links_id, i, link_id) { + routing_add_link(link_id); + } + + //store the route + routing_store_route(); +} + /** * Add Traces */