Use homogeneous dicts which are more efficient.

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

diff --git a/src/surf/storage.c b/src/surf/storage.c
index 17ed2b1..a34bf83 100644 (file)
--- a/src/surf/storage.c
+++ b/src/surf/storage.c
@@ -34,19 +34,19 @@ static xbt_dynar_t storage_list;
 #define GENERIC_LMM_ACTION(action) action->generic_lmm_action
 #define GENERIC_ACTION(action) GENERIC_LMM_ACTION(action).generic_action
 
-static xbt_dict_t parse_storage_content(char *filename, size_t *used_size);
+static xbt_dict_t parse_storage_content(char *filename, sg_storage_size_t *used_size);
 static int storage_action_unref(surf_action_t action);
 static void storage_action_state_set(surf_action_t action, e_surf_action_state_t state);
-static surf_action_t storage_action_execute (void *storage, size_t size, e_surf_action_storage_type_t type);
+static surf_action_t storage_action_execute (void *storage, sg_storage_size_t size, e_surf_action_storage_type_t type);
 
 static surf_action_t storage_action_ls(void *storage, const char* path)
 {
   surf_action_t action = storage_action_execute(storage,0, LS);
   action->ls_dict = NULL;
-  xbt_dict_t ls_dict = xbt_dict_new();
+  xbt_dict_t ls_dict = xbt_dict_new_homogeneous(NULL);
 
   char* key;
-  size_t size = 0;
+  sg_storage_size_t size = 0;
   xbt_dict_cursor_t cursor = NULL;
 
   xbt_dynar_t dyn = NULL;
@@ -86,9 +86,11 @@ static surf_action_t storage_action_open(void *storage, const char* mount,
 {
   XBT_DEBUG("\tOpen file '%s'",path);
   xbt_dict_t content_dict = ((storage_t)storage)->content;
-  size_t size = (size_t) xbt_dict_get_or_null(content_dict,path);
+  sg_storage_size_t size = (sg_storage_size_t) xbt_dict_get_or_null(content_dict,path);
+
   // if file does not exist create an empty file
   if(!size){
+       size = 0;
     xbt_dict_set(content_dict,path,&size,NULL);
     XBT_DEBUG("File '%s' was not found, file created.",path);
   }
@@ -115,7 +117,6 @@ static surf_action_t storage_action_close(void *storage, surf_file_t fd)
       storage_action_unref((surf_action_t) write_action);
     }
   }
-
   free(fd->name);
   free(fd->mount);
   xbt_free(fd);
@@ -123,7 +124,7 @@ static surf_action_t storage_action_close(void *storage, surf_file_t fd)
   return action;
 }
 
-static surf_action_t storage_action_read(void *storage, size_t size,
+static surf_action_t storage_action_read(void *storage, sg_storage_size_t size,
                                          surf_file_t fd)
 {
   if(size > fd->size)
@@ -132,7 +133,7 @@ static surf_action_t storage_action_read(void *storage, size_t size,
   return action;
 }
 
-static surf_action_t storage_action_write(void *storage, size_t size, 
+static surf_action_t storage_action_write(void *storage, sg_storage_size_t size,
                                           surf_file_t fd)
 {
   char *filename = fd->name;
@@ -148,7 +149,7 @@ static surf_action_t storage_action_write(void *storage, size_t size,
   return action;
 }
 
-static surf_action_t storage_action_execute (void *storage, size_t size, e_surf_action_storage_type_t type)
+static surf_action_t storage_action_execute (void *storage, sg_storage_size_t size, e_surf_action_storage_type_t type)
 {
   surf_action_storage_t action = NULL;
   storage_t STORAGE = storage;
@@ -203,7 +204,7 @@ static xbt_dict_t storage_get_content(void *storage)
   /*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_t content_dict = xbt_dict_new_homogeneous(NULL);
   xbt_dict_cursor_t cursor = NULL;
   char *file;
   char *size;
@@ -282,22 +283,23 @@ static void storage_update_actions_state(double now, double delta)
   surf_action_storage_t next_action = NULL;
   xbt_swag_t running_actions = surf_storage_model->states.running_action_set;
 
-  // Update the disk usage
-  // Update the file size
-  // For each action of type write
+
   xbt_swag_foreach_safe(action, next_action, running_actions) {
     if(action->type == WRITE)
     {
+      // Update the disk usage
+      // Update the file size
+      // Update the storage content (with file size)
       double rate = lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable);
       /* Hack to avoid rounding differences between x86 and x86_64
-       * (note that the next sizes are of type size_t). */
+       * (note that the next sizes are of type sg_storage_size_t). */
       long incr = delta * rate + MAXMIN_PRECISION;
       ((storage_t)(action->storage))->used_size += incr; // disk usage
       ((surf_action_t)action)->file->size += incr; // file size
-    }
-  }
 
-  xbt_swag_foreach_safe(action, next_action, running_actions) {
+      xbt_dict_t content_dict = ((storage_t)(action->storage))->content;
+      xbt_dict_set(content_dict,((surf_action_t)action)->file->name,(void*)(((surf_action_t)action)->file->size),NULL);
+    }
 
     double_update(&(GENERIC_ACTION(action).remains),
                   lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable) * delta);
@@ -557,7 +559,7 @@ static void storage_parse_storage(sg_platf_storage_cbarg_t storage)
       (void *) xbt_strdup(storage->type_id));
 }
 
-static xbt_dict_t parse_storage_content(char *filename, size_t *used_size)
+static xbt_dict_t parse_storage_content(char *filename, sg_storage_size_t *used_size)
 {
   *used_size = 0;
   if ((!filename) || (strcmp(filename, "") == 0))
@@ -574,8 +576,7 @@ static xbt_dict_t parse_storage_content(char *filename, size_t *used_size)
   size_t len = 0;
   ssize_t read;
   char path[1024];
-  size_t size;
-
+  sg_storage_size_t size;
 
   while ((read = xbt_getline(&line, &len, file)) != -1) {
     if (read){