Fix MSG_storage_get_proporties() bug

diff --git a/src/simix/smx_io.c b/src/simix/smx_io.c
index 38659fb..f504da4 100644 (file)
--- a/src/simix/smx_io.c
+++ b/src/simix/smx_io.c
@@ -349,7 +349,7 @@ xbt_dict_t SIMIX_pre_storage_get_properties(smx_simcall_t simcall, smx_storage_t
 }
 xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage){
   xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
-  return surf_resource_get_properties(surf_workstation_resource_priv(storage));
+  return surf_resource_get_properties(surf_storage_resource_priv(storage));
 }
 
 const char* SIMIX_pre_storage_get_name(smx_simcall_t simcall, smx_storage_t storage){

diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp
index 63a8d0a..0576c68 100644 (file)
--- a/src/surf/storage_n11.cpp
+++ b/src/surf/storage_n11.cpp
@@ -66,7 +66,7 @@ static void parse_storage_init(sg_platf_storage_cbarg_t storage)
       ((storage_type_t) stype)->type_id,
       storage->content,
       storage->content_type,
-      ((storage_type_t) stype)->properties);
+      storage->properties);
 
   surf_storage_model->createResource(storage->id,
                                      ((storage_type_t) stype)->type_id,
@@ -256,7 +256,7 @@ StoragePtr StorageN11Model::createResource(const char* id, const char* type_id,
   XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tproperties '%p'\n\t\tBread '%f'\n",
       id,
       type_id,
-      storage_type->properties,
+      properties,
       Bread);
 
   if(!p_storageList)