Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / surf / xml / surfxml_sax_cb.cpp

diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp
index 43a7a95..9899cfa 100644 (file)
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -410,7 +410,7 @@ void STag_surfxml_host(void){
 
 void STag_surfxml_prop(void)
 {
-  if(AS_TAG){
+  if(AS_TAG){ // We need a stack here to retrieve the most recently opened AS
     if (!as_current_property_set){
       xbt_assert(as_prop_nb < 1024, "Number of AS property reach the limit!!!");
       as_current_property_set = xbt_dict_new_homogeneous(xbt_free_f); // Maybe, it should raise an error
@@ -882,13 +882,10 @@ void ETag_surfxml_AS(void){
     xbt_dict_t dict = (xbt_dict_t) as_dict_tab[as_prop_nb-1];
     as_prop_nb--;
     XBT_DEBUG("POP prop %p for AS '%s'",dict,name);
-    xbt_lib_set(as_router_lib,
-        name,
-      ROUTING_PROP_ASR_LEVEL,
-      dict);
+    xbt_lib_set(as_router_lib, name, ROUTING_PROP_ASR_LEVEL, dict);
     xbt_free(name);
   }
-  sg_platf_new_AS_end();
+  sg_platf_new_AS_seal();
 }
 
 void STag_surfxml_config(void){
@@ -906,8 +903,8 @@ void ETag_surfxml_config(void){
   char *cfg;
   xbt_dict_foreach(current_property_set, cursor, key, elem) {
     cfg = bprintf("%s:%s",key,elem);
-    if(xbt_cfg_is_default_value(_sg_cfg_set, key))
-      xbt_cfg_set_parse(_sg_cfg_set, cfg);
+    if(xbt_cfg_is_default_value(key))
+      xbt_cfg_set_parse(cfg);
     else
       XBT_INFO("The custom configuration '%s' is already defined by user!",key);
     free(cfg);