privatize this function that must be called at some point of the parsing process...

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 4ef507c..52d11f3 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -648,15 +648,6 @@ XBT_PUBLIC_DATA(xbt_cfg_t) _surf_cfg_set;
  */
 XBT_PUBLIC(void) surf_init(int *argc, char **argv);     /* initialize common structures */
 
-/** \brief Initialize the used models.
- *
- * Must be called after the surf_init so that configuration infrastructure is created
- * Must be called before parsing/creating the environment
- * Must not be called within the initialization process so that the use get a chance to change the settings from
- * its code between, say, MSG_init and MSG_create_environment using MSG_config
- */
-XBT_PUBLIC(void) surf_config_models_setup(void);
-
 /** \brief create the elements of the models
  *
  * Must be called after parsing the platform file and before using any elements

diff --git a/src/include/surf/surfxml_parse_private.h b/src/include/surf/surfxml_parse_private.h
index 019c175..be4eece 100644 (file)
--- a/src/include/surf/surfxml_parse_private.h
+++ b/src/include/surf/surfxml_parse_private.h
@@ -12,5 +12,10 @@
 #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);
 
 #endif

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 7d3862f..0de998f 100644 (file)
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -475,6 +475,7 @@ void surf_config_finalize(void)
   _surf_init_status = 0;
 }
 
+/* Pick the right models for CPU, net and workstation, and call their model_init_preparse */
 void surf_config_models_setup()
 {
   char *workstation_model_name;