add a cleanup callback to surf_resource_t, useful to free data allocated in cpu models

[simgrid.git] / src / surf / storage.c

diff --git a/src/surf/storage.c b/src/surf/storage.c
index 0c00d18..e5d8d02 100644 (file)
--- a/src/surf/storage.c
+++ b/src/surf/storage.c
@@ -192,15 +192,20 @@ static surf_action_t storage_action_execute (void *storage, size_t size, e_surf_
   return (surf_action_t) action;
 }
 
+static xbt_dict_t storage_get_properties(const void *storage)
+{
+  return surf_resource_properties(surf_storage_resource_priv(storage));
+}
+
 static void* storage_create_resource(const char* id, const char* model,
-    const char* type_id, const char* content_name, const char* content_type){
+    const char* type_id, const char* content_name, const char* content_type, xbt_dict_t properties){
   storage_t storage = NULL;
 
   xbt_assert(!surf_storage_resource_priv(surf_storage_resource_by_name(id)),
               "Storage '%s' declared several times in the platform file",
               id);
   storage = (storage_t) surf_resource_new(sizeof(s_storage_t),
-          surf_storage_model, id,NULL);
+          surf_storage_model, id, properties, NULL);
 
   storage->generic_resource.name = xbt_strdup(id);
   storage->state_current = SURF_RESOURCE_ON;
@@ -223,7 +228,7 @@ static void* storage_create_resource(const char* id, const char* model,
   storage->content = parse_storage_content((char*)content_name,&(storage->used_size));
   storage->content_type = xbt_strdup(content_type);
   storage->size = storage_type->size;
-  storage->type_id = type_id;
+  storage->type_id = xbt_strdup(type_id);
 
   xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage);
 
@@ -439,7 +444,8 @@ static void parse_storage_init(sg_platf_storage_cbarg_t storage)
      ((storage_type_t) stype)->model,
      ((storage_type_t) stype)->type_id,
      storage->content,
-     storage->content_type);
+     storage->content_type,
+     storage->properties);
 }
 
 static void parse_mstorage_init(sg_platf_mstorage_cbarg_t mstorage)
@@ -498,6 +504,8 @@ static void surf_storage_model_init_internal(void)
   surf_storage_model->extension.storage.write = storage_action_write;
   surf_storage_model->extension.storage.ls = storage_action_ls;
 
+  surf_storage_model->extension.storage.get_properties = storage_get_properties;
+
   if (!storage_maxmin_system) {
     storage_maxmin_system = lmm_system_new(storage_selective_update);
   }
@@ -657,6 +665,8 @@ static XBT_INLINE void surf_storage_resource_free(void *r)
   storage_t storage = r;
   xbt_dict_free(&storage->content);
   xbt_dynar_free(&storage->write_actions);
+  free(storage->type_id);
+  free(storage->content_type);
   // generic resource
   surf_resource_free(r);
 }
@@ -679,3 +689,4 @@ void storage_register_callbacks() {
   sg_platf_storage_type_add_cb(storage_parse_storage_type);
   sg_platf_mount_add_cb(storage_parse_mount);
 }
+