xbt_dict_t route_table = NULL;
xbt_dict_t route_multi_table = NULL;
xbt_dynar_t route_multi_elements = NULL;
-xbt_dynar_t route_link_list = NULL;
+static xbt_dynar_t route_link_list = NULL;
xbt_dynar_t links = NULL;
xbt_dynar_t keys = NULL;
FILE *surf_file_to_parse = NULL;
static void convert_route_multi_to_routes(void);
+static void parse_route_elem(void);
void surf_parse_free_callbacks(void)
{
surfxml_call_cb_functions(ETag_surfxml_platform_cb_list);
- xbt_dynar_free(&route_link_list);
xbt_dict_free(&random_data_list);
xbt_dict_free(&set_list);
-
}
void STag_surfxml_host(void)
}
}
-void init_data(void)
+static void parse_route_set_endpoints(void) {
+ route_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
+}
+
+static void init_data(void)
{
xbt_dict_free(&route_table);
xbt_dynar_free(&route_link_list);
trace_connect_list_latency = xbt_dict_new();
random_data_list = xbt_dict_new();
+ surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem);
+ surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
+}
+
+static void free_data(void)
+{
+ char *key,*data;
+ xbt_dict_cursor_t cursor = NULL;
+
+ xbt_dict_foreach(route_table, cursor, key, data) {
+ xbt_dynar_t links = (xbt_dynar_t)data;
+ xbt_dynar_free(&links);
+ }
+ xbt_dict_free(&route_table);
+ route_link_list = NULL;
+
+ xbt_dict_free(&trace_connect_list_host_avail);
+ xbt_dict_free(&trace_connect_list_power);
+ xbt_dict_free(&trace_connect_list_link_avail);
+ xbt_dict_free(&trace_connect_list_bandwidth);
+ xbt_dict_free(&trace_connect_list_latency);
+ xbt_dict_free(&traces_set_list);
}
void parse_platform_file(const char* file)
{
surf_parse_open(file);
+ init_data();
xbt_assert1((!(*surf_parse)()), "Parse error in %s", file);
+ free_data();
surf_parse_close();
}
static char* src_name, *dst_name;
static int is_symmetric_route;
-void parse_route_elem(void)
+static void parse_route_elem(void)
{
char *val;
xbt_dynar_foreach(route_link_list, cpt, value) {
xbt_dynar_push(links,&value);
}
+ xbt_dynar_free(&route_link_list);
route_link_list = links;
break;
case A_surfxml_route_action_OVERRIDE: