Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
These "properties" are actually bandwidths: allow users to declare units
authorsuter <frederic.suter@cc.in2p3.fr>
Tue, 25 Jun 2013 10:44:40 +0000 (12:44 +0200)
committersuter <frederic.suter@cc.in2p3.fr>
Tue, 25 Jun 2013 10:44:40 +0000 (12:44 +0200)
in the XML file

src/surf/storage.c

index 227c717..4684a82 100644 (file)
@@ -208,9 +208,13 @@ static void* storage_create_resource(const char* id, const char* model,const cha
   storage->write_actions = xbt_dynar_new(sizeof(char *),NULL);
 
   storage_type_t storage_type = xbt_lib_get_or_null(storage_type_lib, type_id,ROUTING_STORAGE_TYPE_LEVEL);
-  double Bread  = atof(xbt_dict_get(storage_type->properties,"Bread"));
-  double Bwrite = atof(xbt_dict_get(storage_type->properties,"Bwrite"));
-  double Bconnection   = atof(xbt_dict_get(storage_type->properties,"Bconnection"));
+  double Bread =
+      surf_parse_get_bandwidth(xbt_dict_get(storage_type->properties,"Bread"));
+  double Bwrite =
+      surf_parse_get_bandwidth(xbt_dict_get(storage_type->properties,"Bwrite"));
+  double Bconnection =
+      surf_parse_get_bandwidth(xbt_dict_get(storage_type->properties,
+                                            "Bconnection"));
   XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%lu'",Bconnection,Bread,Bwrite,(unsigned long)storage_type->size);
   storage->constraint       = lmm_constraint_new(storage_maxmin_system, storage, Bconnection);
   storage->constraint_read  = lmm_constraint_new(storage_maxmin_system, storage, Bread);