#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");
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){
break;
}
- sg_platf_new_ASroute(&ASroute);
+ sg_platf_new_route(&ASroute);
parsed_link_list = NULL;
}
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;
}
xbt_dynar_free(&surf_parsed_filename_stack);
if (surf_parsed_filename) {
char *dir = NULL;
- xbt_dynar_pop(surf_path, dir);
+ xbt_dynar_pop(surf_path, &dir);
free(dir);
}