X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/62bf48b13cea7b6b63f3d3e70b2a857cef442994..d9e664e60bd7fab62db0f1d838efd1d7bfd4d367:/src/surf/storage.c

diff --git a/src/surf/storage.c b/src/surf/storage.c
index 90fd83fcba..14da9abd48 100644
--- a/src/surf/storage.c
+++ b/src/surf/storage.c
@@ -93,7 +93,6 @@ static surf_action_t storage_action_open(void *storage, const char* mount,
     XBT_DEBUG("File '%s' was not found, file created.",path);
   }
   surf_file_t file = xbt_new0(s_surf_file_t,1);
-  file->info = xbt_malloc0(sizeof(s_file_info_t));
   file->name = xbt_strdup(path);
   file->size = size;
   file->mount = xbt_strdup(mount);
@@ -193,17 +192,37 @@ 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 xbt_dict_t storage_get_content(void *storage)
+{
+  /* For the moment this action has no cost, but in the future we could take in account access latency of the disk */
+  /*surf_action_t action = storage_action_execute(storage,0, LS);*/
+
+  void *st = surf_storage_resource_priv(storage);
+  xbt_dict_t content_dict = xbt_dict_new();
+  xbt_dict_cursor_t cursor = NULL;
+  char *file;
+  size_t size;
+  xbt_dict_foreach(((storage_t)st)->content, cursor, file, size){
+    xbt_dict_set(content_dict,file,&size,NULL);
+  }
+  return content_dict;
+}
+
 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;
   storage->used_size = 0;
   storage->size = 0;
@@ -224,6 +243,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 = xbt_strdup(type_id);
 
   xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage);
 
@@ -439,7 +459,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)
@@ -497,6 +518,8 @@ static void surf_storage_model_init_internal(void)
   surf_storage_model->extension.storage.read = storage_action_read;
   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;
+  surf_storage_model->extension.storage.get_content = storage_get_content;
 
   if (!storage_maxmin_system) {
     storage_maxmin_system = lmm_system_new(storage_selective_update);
@@ -657,6 +680,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 +704,4 @@ void storage_register_callbacks() {
   sg_platf_storage_type_add_cb(storage_parse_storage_type);
   sg_platf_mount_add_cb(storage_parse_mount);
 }
+