Ensure that the mallocator are really inactive when running MC

[simgrid.git] / src / surf / surfxml_parse.c

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index b9fc03b..cbe0e16 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -694,10 +694,15 @@ void ETag_surfxml_AS(void){
   sg_platf_new_AS_end();
 }
 
   sg_platf_new_AS_end();
 }
 

+extern int _surf_init_status; /* FIXME: find a proper way to export this at some point */
+

 void STag_surfxml_config(void){
   AS_TAG = 0;
   xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
   XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
 void STag_surfxml_config(void){
   AS_TAG = 0;
   xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
   XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);

+  if (_surf_init_status == 2) {
+    surf_parse_error("All <config> tags must be given before any platform elements (such as <AS>, <host>, <cluster>, <link>, etc).");
+  }

 }
 void ETag_surfxml_config(void){
   xbt_dict_cursor_t cursor = NULL;
 }
 void ETag_surfxml_config(void){
   xbt_dict_cursor_t cursor = NULL;