Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --combined src/msg/msg_io.c
index cafcd12,08601f3..dc6cae3
--- 1/src/msg/msg_io.c
--- 2/src/msg/msg_io.c
+++ b/src/msg/msg_io.c
@@@ -21,12 -21,15 +21,15 @@@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io
  /********************************* File **************************************/
  void __MSG_file_get_info(msg_file_t fd){
    xbt_dynar_t info = simcall_file_get_info(fd->simdata->smx_file);
+   sg_storage_size_t *psize;
+ 
    fd->info->content_type = xbt_dynar_pop_as(info, char *);
    fd->info->storage_type = xbt_dynar_pop_as(info, char *);
    fd->info->storageId = xbt_dynar_pop_as(info, char *);
    fd->info->mount_point = xbt_dynar_pop_as(info, char *);
-   fd->info->size = xbt_dynar_pop_as(info, sg_storage_size_t);
- 
+   psize = xbt_dynar_pop_as(info, sg_storage_size_t*);
+   fd->info->size = *psize;
+   xbt_free(psize);
    xbt_dynar_free_container(&info);
  }
  
@@@ -331,9 -334,5 +334,9 @@@ void *MSG_storage_get_data(msg_storage_
  xbt_dict_t MSG_storage_get_content(msg_storage_t storage)
  {
    return SIMIX_storage_get_content(storage);
 -  //return (simcall_storage_get_properties(storage));
 +}
 +
 +sg_storage_size_t MSG_storage_get_size(msg_storage_t storage)
 +{
 +  return SIMIX_storage_get_size(storage);
  }

diff --combined src/simix/smx_io.c
index 519ce6d,438d87d..d8477ae
--- 1/src/simix/smx_io.c
--- 2/src/simix/smx_io.c
+++ b/src/simix/smx_io.c
@@@ -221,7 -221,7 +221,7 @@@ int SIMIX_file_unlink(smx_process_t pro
    }
  
    if (surf_workstation_model->extension.workstation.unlink(host, fd->surf_file)){
-     fd->surf_file = NULL;
+     xbt_free(fd);
      return 1;
    } else
      return 0;
@@@ -352,11 -352,6 +352,11 @@@ xbt_dict_t SIMIX_storage_get_content(sm
    return surf_storage_model->extension.storage.get_content(storage);
  }
  
 +sg_storage_size_t SIMIX_storage_get_size(smx_storage_t storage){
 +  xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
 +  return surf_storage_model->extension.storage.get_size(storage);
 +}
 +
  void SIMIX_post_io(smx_action_t action)
  {
    xbt_fifo_item_t i;

diff --combined src/surf/storage.c
index 6d3e23e,8e549ad..0f28e4f
--- 1/src/surf/storage.c
--- 2/src/surf/storage.c
+++ b/src/surf/storage.c
@@@ -44,7 -44,7 +44,7 @@@ static surf_action_t storage_action_ls(
  {
    surf_action_t action = storage_action_execute(storage,0, LS);
    action->ls_dict = NULL;
-   xbt_dict_t ls_dict = xbt_dict_new_homogeneous(NULL);
+   xbt_dict_t ls_dict = xbt_dict_new_homogeneous(xbt_free);
  
    char* key;
    sg_storage_size_t size = 0;
@@@ -65,7 -65,9 +65,9 @@@
  
        // file
        if(xbt_dynar_length(dyn) == 1){
-         xbt_dict_set(ls_dict,file,&size,NULL);
+         sg_storage_size_t *psize = xbt_new(sg_storage_size_t,1);
+         *psize=size;
+         xbt_dict_set(ls_dict,file,psize,NULL);
        }
        // Directory
        else
@@@ -87,12 -89,16 +89,16 @@@ static surf_action_t storage_action_ope
  {
    XBT_DEBUG("\tOpen file '%s'",path);
    xbt_dict_t content_dict = ((storage_t)storage)->content;
-   sg_storage_size_t size = (sg_storage_size_t) xbt_dict_get_or_null(content_dict,path);
- 
+   sg_storage_size_t size, *psize;
+   psize = (sg_storage_size_t*) xbt_dict_get_or_null(content_dict, path);
+   if (psize)
+     size = *psize;
+   else {
    // if file does not exist create an empty file
-   if(!size){
-       size = 0;
-     xbt_dict_set(content_dict,path,&size,NULL);
+     psize = xbt_new(sg_storage_size_t,1);
+     size = 0;
+     *psize = size;
+     xbt_dict_set(content_dict,path,psize,NULL);
      XBT_DEBUG("File '%s' was not found, file created.",path);
    }
    surf_file_t file = xbt_new0(s_surf_file_t,1);
@@@ -203,22 -209,18 +209,23 @@@ static xbt_dict_t storage_get_content(v
    /* 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);
 +  void *storage_resource = surf_storage_resource_priv(storage);
    xbt_dict_t content_dict = xbt_dict_new_homogeneous(NULL);
    xbt_dict_cursor_t cursor = NULL;
    char *file;
-   sg_storage_size_t *size;
-   xbt_dict_foreach(((storage_t)st)->content, cursor, file, size){
-     xbt_dict_set(content_dict,file,(void*)size,NULL);
+   sg_storage_size_t *psize;
+ 
+   xbt_dict_foreach(((storage_t)st)->content, cursor, file, psize){
+     xbt_dict_set(content_dict,file,psize,NULL);
    }
    return content_dict;
  }
  
 +static sg_storage_size_t storage_get_size(void *storage){
 +  void *storage_resource = surf_storage_resource_priv(storage);
 +  return ((storage_t)storage_resource)->size;
 +}
 +
  static void* storage_create_resource(const char* id, const char* model,
      const char* type_id, const char* content_name, const char* content_type, xbt_dict_t properties){
    storage_t storage = NULL;
@@@ -302,8 -304,11 +309,11 @@@ static void storage_update_actions_stat
        ((storage_t)(action->storage))->used_size += incr; // disk usage
        ((surf_action_t)action)->file->size += incr; // file size
  
+       sg_storage_size_t *psize = xbt_new(sg_storage_size_t,1);
+       *psize = ((surf_action_t)action)->file->size;
+ 
        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);
+       xbt_dict_set(content_dict,((surf_action_t)action)->file->name,psize,NULL);
      }
  
      double_update(&(GENERIC_ACTION(action).remains),
@@@ -527,10 -532,11 +537,10 @@@ static void surf_storage_model_init_int
    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;
 -
 +  surf_storage_model->extension.storage.get_size = storage_get_size;
    if (!storage_maxmin_system) {
      storage_maxmin_system = lmm_system_new(storage_selective_update);
    }
 -
  }
  
  void surf_storage_model_init_default(void)
@@@ -569,7 -575,7 +579,7 @@@ static xbt_dict_t parse_storage_content
    if ((!filename) || (strcmp(filename, "") == 0))
      return NULL;
  
-   xbt_dict_t parse_content = xbt_dict_new_homogeneous(NULL);
+   xbt_dict_t parse_content = xbt_dict_new_homogeneous(xbt_free);
    FILE *file = NULL;
  
    file = surf_fopen(filename, "r");
@@@ -586,7 -592,9 +596,9 @@@
      if (read){
      if (sscanf(line,"%s %" SCNu64, path, &size) == 2) {
          *used_size += size;
-         xbt_dict_set(parse_content,path,(void*) size,NULL);
+         sg_storage_size_t *psize = xbt_new(sg_storage_size_t, 1);
+         *psize = size;
+         xbt_dict_set(parse_content,path,psize,NULL);
        } else {
          xbt_die("Be sure of passing a good format for content file.\n");
        }