Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Cosmetics
authornavarro <navarro@caraja.(none)>
Tue, 3 Apr 2012 13:09:22 +0000 (15:09 +0200)
committernavarro <navarro@caraja.(none)>
Tue, 3 Apr 2012 13:16:25 +0000 (15:16 +0200)
examples/platforms/storage.xml
src/surf/storage.c

index db881dc..54aeb22 100644 (file)
                <storage_type id="samsung" model="RAID5" content="content/storage_content.txt">
                        <prop id="Bwrite" value="30000000" /> <!-- 30Mo/s -->
                        <prop id="Bread" value="100000000" /> <!-- 100Mo/s -->
-                       <prop id="Bconnexion" value="6000000000" /> <!-- 6Go/s -->
+                       <prop id="Bconnection" value="6000000000" /> <!-- 6Go/s -->
                </storage_type>
 
                <storage_type id="crucial" model="SSD" content="content/storage_content.txt">
                        <prop id="Bwrite" value="30000000" />
                        <prop id="Bread" value="100000000" />
-                       <prop id="Bconnexion" value="6000000000" />
+                       <prop id="Bconnection" value="6000000000" />
                </storage_type>
 
                <storage_type id="wdigital" model="RAID0" content="content/storage_content.txt">
                        <prop id="Bwrite" value="30000000" />
                        <prop id="Bread" value="100000000" />
-                       <prop id="Bconnexion" value="6000000000" />
+                       <prop id="Bconnection" value="6000000000" />
                </storage_type>
 
                <storage id="Disk1" typeId="crucial"/>
index a0c00cc..640cf93 100644 (file)
@@ -180,9 +180,9 @@ static void* storage_create_resource(const char* id, const char* model,const cha
   storage_type_t storage_type = xbt_lib_get_or_null(storage_type_lib, type_id,ROUTING_STORAGE_TYPE_LEVEL);
   size_t Bread  = atof(xbt_dict_get(storage_type->properties,"Bread"));
   size_t Bwrite = atof(xbt_dict_get(storage_type->properties,"Bwrite"));
-  size_t Bconnexion   = atof(xbt_dict_get(storage_type->properties,"Bconnexion"));
-  XBT_INFO("Create resource with Bconnexion '%Zu' Bread '%Zu' Bwrite '%Zu'",Bconnexion,Bread,Bwrite);
-  storage->constraint       = lmm_constraint_new(storage_maxmin_system, storage, Bconnexion);
+  size_t Bconnection   = atof(xbt_dict_get(storage_type->properties,"Bconnection"));
+  XBT_INFO("Create resource with Bconnection '%Zu' Bread '%Zu' Bwrite '%Zu'",Bconnection,Bread,Bwrite);
+  storage->constraint       = lmm_constraint_new(storage_maxmin_system, storage, Bconnection);
   storage->constraint_read  = lmm_constraint_new(storage_maxmin_system, storage, Bread);
   storage->constraint_write = lmm_constraint_new(storage_maxmin_system, storage, Bwrite);