XBT_PUBLIC(void) surf_parse_error(const char *msg) _XBT_GNUC_NORETURN;
XBT_PUBLIC(double) surf_parse_get_double(const char *string);
XBT_PUBLIC(int) surf_parse_get_int(const char *string);
-XBT_PUBLIC(void) surf_parse_models_setup(void);
/* Prototypes of the functions offered by flex */
XBT_PUBLIC(int) surf_parse_lex(void);
XBT_PUBLIC(int) surf_parse_get_lineno(void);
void sg_platf_AS_begin_add_cb(sg_platf_AS_begin_cb_t fct);
void sg_platf_AS_end_add_cb(void_f_void_t fct);
+/** \brief Pick the right models for CPU, net and workstation, and call their model_init_preparse
+ *
+ * Must be called within parsing/creating the environment (after the <config>s, if any, and before <AS> or friends such as <cluster>)
+ */
+void surf_config_models_setup(void);
#include "surf/surfxml_parse.h"
#include "surf/trace_mgr.h"
-/** \brief Pick the right models for CPU, net and workstation, and call their model_init_preparse
- *
- * Must be called within parsing/creating the environment (after the <config>s, if any, and before <AS> or friends such as <cluster>)
- */
-void surf_config_models_setup(void);
+/* FIXME: kill that file */
#endif
xbt_dynar_t sg_platf_AS_end_cb_list = NULL; //of void_f_void_t
xbt_dynar_t sg_platf_postparse_cb_list = NULL; // of void_f_void_t
+static int surf_parse_models_setup_already_called;
+
+
/** Module management function: creates all internal data structures */
void sg_platf_init(void) {
sg_platf_host_cb_list = xbt_dynar_new(sizeof(sg_platf_host_cb_t), NULL);
xbt_dynar_free(&sg_platf_peer_cb_list);
xbt_dynar_free(&sg_platf_AS_begin_cb_list);
xbt_dynar_free(&sg_platf_AS_end_cb_list);
+
+ /* make sure that we will reinit the models while loading the platf once reinited */
+ surf_parse_models_setup_already_called = 0;
}
void sg_platf_new_host(sg_platf_host_cbarg_t h){
}
}
+static int surf_parse_models_setup_already_called = 0;
+
void sg_platf_new_AS_begin(const char *id, const char *routing) {
unsigned int iterator;
sg_platf_AS_begin_cb_t fun;
+
+ if (!surf_parse_models_setup_already_called && xbt_dynar_length(sg_platf_AS_begin_cb_list)) {
+ /* Initialize the surf models. That must be done after we got all config, and before we need the models.
+ * That is, after the last <config> tag, if any, and before the first of cluster|peer|AS|trace|trace_connect
+ *
+ * I'm not sure for <trace> and <trace_connect>, there may be a bug here
+ * (FIXME: check it out by creating a file beginning with one of these tags)
+ * but cluster and peer create ASes internally, so putting the code in there is ok.
+ *
+ * We are also guarding against xbt_dynar_length(sg_platf_AS_begin_cb_list) because we don't
+ * want to initialize the models if we are parsing the file to get the deployment. That could happen if
+ * the same file would be used for platf and deploy: it'd contain AS tags even during the deploy parsing.
+ * Removing that guard would result of the models to get re-inited when parsing for deploy.
+ */
+ surf_parse_models_setup_already_called = 1;
+ surf_config_models_setup();
+ }
+
xbt_dynar_foreach(sg_platf_AS_begin_cb_list, iterator, fun) {
(*fun) (id,routing);
}
model_type_t model = NULL;
int cpt;
- surf_parse_models_setup(); /* ensure that the models are created after the last <config> tag and before the first <AS>-like */
-
/* search the routing model */
for (cpt = 0; routing_models[cpt].name; cpt++)
if (!strcmp(wanted_routing_type, routing_models[cpt].name))
return latency;
}
-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;
- surf_config_models_setup();
-}
-
-
/**
* \brief Recursive function for finalize
*
* \brief Generic method: delete all the routing structures
*
* walk through the routing components tree and delete the structures
- * by calling the differents "finalize" functions in each routing component
+ * by calling the different "finalize" functions in each routing component
*/
static void finalize(void)
{
xbt_dynar_free(&(global_routing->last_route));
/* delete global routing structure */
xbt_free(global_routing);
- /* make sure that we will reinit the models while loading the platf once reinited -- HACK but there is no proper surf_routing_init() */
- surf_parse_models_setup_already_called = 0;
}
static xbt_dynar_t recursive_get_onelink_routes(routing_component_t rc)