Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
change the dict in which parsed properties are stored from homogeneous
[simgrid.git] / src / surf / surfxml_parse.c
index c0c0476..ab38ab2 100644 (file)
@@ -420,8 +420,8 @@ void STag_surfxml_prop(void)
   }
   else{
     if (!current_property_set)
-      current_property_set = xbt_dict_new_homogeneous(xbt_free_f); // Maybe, it should raise an error
-    xbt_dict_set(current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), NULL);
+       current_property_set = xbt_dict_new(); // Maybe, it should raise an error
+    xbt_dict_set(current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), xbt_free);
   }
 }
 
@@ -530,6 +530,9 @@ void ETag_surfxml_cluster(void){
   case A_surfxml_cluster_topology_TORUS:
     cluster.topology= SURF_CLUSTER_TORUS ;
     break;
+  case A_surfxml_cluster_topology_FAT___TREE:
+    cluster.topology = SURF_CLUSTER_FAT_TREE;
+    break;
   default:
     surf_parse_error("Invalid cluster topology for cluster %s",
                      cluster.id);