From 2ce25930bd88498435aac99343b2333169d2e4bb Mon Sep 17 00:00:00 2001 From: suter Date: Tue, 25 Jun 2013 12:44:40 +0200 Subject: [PATCH 1/1] These "properties" are actually bandwidths: allow users to declare units in the XML file --- src/surf/storage.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/surf/storage.c b/src/surf/storage.c index 227c71776d..4684a82189 100644 --- a/src/surf/storage.c +++ b/src/surf/storage.c @@ -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); -- 2.20.1