[mc] Fix cleanup of info->types

[simgrid.git] / src / surf / storage_n11.cpp

diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp
index 63a8d0a..4e07fe5 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)
@@ -313,8 +313,8 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta)
       /* Hack to avoid rounding differences between x86 and x86_64
        * (note that the next sizes are of type sg_size_t). */
       long incr = delta * rate + MAXMIN_PRECISION;
-      action->p_storage->m_usedSize += (incr - action->p_file->size); // disk usage
-      action->p_file->size = incr; // file size
+      action->p_storage->m_usedSize += incr; // disk usage
+      action->p_file->size += incr; // file size
 
       sg_size_t *psize = xbt_new(sg_size_t,1);
       *psize = action->p_file->size;
@@ -345,7 +345,6 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta)
       action->setState(SURF_ACTION_DONE);
     }
   }
-
   return;
 }