X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/08828145338ec04f6847cf15df5841b56ddc0270..104c3ca5da690c2296039f8e59dd47f1b496621e:/src/surf/surfxml_parse.cpp?ds=sidebyside diff --git a/src/surf/surfxml_parse.cpp b/src/surf/surfxml_parse.cpp index da1c63d40b..59e99e8bc8 100644 --- a/src/surf/surfxml_parse.cpp +++ b/src/surf/surfxml_parse.cpp @@ -15,7 +15,6 @@ #include "xbt/dict.h" #include "src/surf/surf_private.h" #include "simgrid/sg_config.h" -#include "surfxml_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module"); @@ -55,7 +54,6 @@ double surf_parse_get_double(const char *string) { int ret = sscanf(string, "%lg", &res); if (ret != 1) surf_parse_error("%s is not a double", string); - //printf("Parsed double [%g] %s\n", res, string); return res; } @@ -508,7 +506,7 @@ void STag_surfxml_host___link(void){ host_link.id = A_surfxml_host___link_id; host_link.link_up = A_surfxml_host___link_up; host_link.link_down = A_surfxml_host___link_down; - sg_platf_new_netcard(&host_link); + sg_platf_new_hostlink(&host_link); } void STag_surfxml_router(void){ @@ -813,7 +811,7 @@ void ETag_surfxml_ASroute(void){ break; } - sg_platf_new_ASroute(&ASroute); + sg_platf_new_route(&ASroute); parsed_link_list = NULL; } @@ -844,7 +842,7 @@ void ETag_surfxml_bypassASroute(void){ ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___src); ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___dst); - sg_platf_new_bypassASroute(&ASroute); + sg_platf_new_bypassRoute(&ASroute); parsed_link_list = NULL; }