static void routing_parse_Econfig(void); /* config Tag */
static char* replace_random_parameter(char * chaine);
-static void clean_dict_random(void);
+static void clean_routing_after_parse(void);
/* this lines are only for replace use like index in the model table */
typedef enum {
&routing_parse_Speer);
surfxml_add_callback(ETag_surfxml_platform_cb_list,
- &clean_dict_random);
+ &clean_routing_after_parse);
#ifdef HAVE_TRACING
instr_routing_define_callbacks();
surfxml_add_callback(STag_surfxml_config_cb_list, &routing_parse_Sconfig);
surfxml_add_callback(ETag_surfxml_config_cb_list, &routing_parse_Econfig);
surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties_XML);
- surfxml_add_callback(STag_surfxml_AS_cb_list, &surf_parse_models_setup);
surfxml_add_callback(STag_surfxml_random_cb_list, &routing_parse_Srandom);
}
+static int surf_parse_models_setup_already_called=0;
+/* Call the last initialization functions, that must be called after the
+ * <config> tag, if any, and before the first of cluster|peer|AS|trace|trace_connect
+ */
void surf_parse_models_setup()
{
+ if (surf_parse_models_setup_already_called)
+ return;
+ surf_parse_models_setup_already_called=1;
routing_parse_Erandom();
- surfxml_del_callback(STag_surfxml_AS_cb_list, surf_parse_models_setup);
- surf_config_models_setup(platform_filename);
- free(platform_filename);
+ surf_config_models_setup();
}
/* ************************************************** */
if(xbt_cfg_is_default_value(_surf_cfg_set, key))
xbt_cfg_set_parse(_surf_cfg_set, cfg);
else
- XBT_INFO("The custom configuration '%s' is already define by user!",key);
+ XBT_INFO("The custom configuration '%s' is already defined by user!",key);
free(cfg);
}
XBT_DEBUG("End configuration name = %s",A_surfxml_config_id);
return string;
}
-static void clean_dict_random(void)
+static void clean_routing_after_parse(void)
{
xbt_dict_free(&random_value);
xbt_dict_free(&patterns);
+ surf_parse_models_setup_already_called = 0; /* make sure that this function will be called again when reloading a platf */
}
static void routing_parse_Speer(void)
static void routing_parse_Erandom(void)
{
- xbt_dict_cursor_t cursor = NULL;
+ /*xbt_dict_cursor_t cursor = NULL;
char *key;
char *elem;
xbt_dict_foreach(random_value, cursor, key, elem) {
XBT_DEBUG("%s = %s",key,elem);
}
-
+*/
}
-
/*
* New methods to init the routing model component from the lua script
*/