#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");
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;
}
xbt_dynar_push(surf_file_to_parse_stack, &surf_file_to_parse); //save old file descriptor
surf_file_to_parse = surf_fopen(A_surfxml_include_file, "r"); // read new file descriptor
- xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n",
- A_surfxml_include_file);
+ xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n", A_surfxml_include_file);
+
xbt_dynar_push(surf_input_buffer_stack,&surf_input_buffer);
surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE);
surf_parse_push_buffer_state(surf_input_buffer);
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){
void STag_surfxml_ASroute(void){
xbt_assert(strlen(A_surfxml_ASroute_src) > 0
- || strlen(A_surfxml_ASroute_dst) > 0
- || strlen(A_surfxml_ASroute_gw___src) > 0
- || strlen(A_surfxml_ASroute_gw___dst) > 0,
+ && strlen(A_surfxml_ASroute_dst) > 0
+ && strlen(A_surfxml_ASroute_gw___src) > 0
+ && strlen(A_surfxml_ASroute_gw___dst) > 0,
"Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)",
A_surfxml_ASroute_src, A_surfxml_ASroute_dst,
A_surfxml_ASroute_gw___src, A_surfxml_ASroute_gw___dst);
void STag_surfxml_bypassRoute(void){
xbt_assert(strlen(A_surfxml_bypassRoute_src) > 0
- || strlen(A_surfxml_bypassRoute_dst) > 0,
- "Missing end-points while defining bupass route \"%s\"->\"%s\"",
+ && strlen(A_surfxml_bypassRoute_dst) > 0,
+ "Missing end-points while defining bypass route \"%s\"->\"%s\"",
A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst);
parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
void STag_surfxml_bypassASroute(void){
xbt_assert(strlen(A_surfxml_bypassASroute_src) > 0
- || strlen(A_surfxml_bypassASroute_dst) > 0
- || strlen(A_surfxml_bypassASroute_gw___src) > 0
- || strlen(A_surfxml_bypassASroute_gw___dst) > 0,
+ && strlen(A_surfxml_bypassASroute_dst) > 0
+ && strlen(A_surfxml_bypassASroute_gw___src) > 0
+ && strlen(A_surfxml_bypassASroute_gw___dst) > 0,
"Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)",
A_surfxml_bypassASroute_src, A_surfxml_bypassASroute_dst,
A_surfxml_bypassASroute_gw___src,A_surfxml_bypassASroute_gw___dst);
break;
}
- sg_platf_new_ASroute(&ASroute);
+ sg_platf_new_route(&ASroute);
parsed_link_list = NULL;
}
route.symmetrical = FALSE;
sg_platf_new_bypassRoute(&route);
- parsed_link_list = NULL;
+ xbt_dynar_free(&parsed_link_list);
}
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);
- parsed_link_list = NULL;
+ sg_platf_new_bypassRoute(&ASroute);
+ xbt_dynar_free(&parsed_link_list);
}
void ETag_surfxml_trace(void){
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);
}