X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4319e0ba3dfa591b8629471fbf0ce09a24bb15b6..49edceb9509566727606fd091e79ef201d7a0863:/src/surf/storage.c diff --git a/src/surf/storage.c b/src/surf/storage.c index 079a799a58..9983513271 100644 --- a/src/surf/storage.c +++ b/src/surf/storage.c @@ -37,7 +37,7 @@ static xbt_dynar_t storage_list; static xbt_dict_t parse_storage_content(char *filename, unsigned long *used_size); 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, double size, e_surf_action_storage_type_t type); static surf_action_t storage_action_stat(void *storage, surf_file_t stream) { @@ -47,12 +47,42 @@ static surf_action_t storage_action_stat(void *storage, surf_file_t stream) return action; } +static surf_action_t storage_action_unlink(void *storage, surf_file_t stream) +{ + surf_action_t action = storage_action_execute(storage,0, UNLINK); + + // Add memory to storage + ((storage_t)storage)->used_size -= stream->content->stat.size; + + // Remove the file from storage + xbt_dict_t content_dict = ((storage_t)storage)->content; + xbt_dict_remove(content_dict,stream->name); + + free(stream->name); + stream->content = NULL; + xbt_free(stream); + + return action; +} + static surf_action_t storage_action_open(void *storage, const char* mount, const char* path, const char* mode) { XBT_DEBUG("\tOpen file '%s'",path); xbt_dict_t content_dict = ((storage_t)storage)->content; - surf_stat_t content = xbt_dict_get(content_dict,path); + surf_stat_t content = xbt_dict_get_or_null(content_dict,path); + // if file does not exist create an empty file + if(!content){ + content = xbt_new0(s_surf_stat_t,1); + content->stat.date = xbt_strdup(""); + content->stat.group = xbt_strdup(""); + content->stat.size = 0; + content->stat.time = xbt_strdup(""); + content->stat.user = xbt_strdup(""); + content->stat.user_rights = xbt_strdup(""); + xbt_dict_set(content_dict,path,content,NULL); + XBT_DEBUG("File '%s' was not found, file created.",path); + } surf_file_t file = xbt_new0(s_surf_file_t,1); file->name = xbt_strdup(path); file->content = content; @@ -74,11 +104,9 @@ static surf_action_t storage_action_close(void *storage, surf_file_t fp) return action; } -static surf_action_t storage_action_read(void *storage, void* ptr, size_t size, size_t nmemb, surf_file_t stream) +static surf_action_t storage_action_read(void *storage, void* ptr, double size, size_t nmemb, surf_file_t stream) { - char *filename = stream->name; surf_stat_t content = stream->content; - XBT_DEBUG("\tRead file '%s' size '%f/%zu'",filename,content->stat.size,size); if(size > content->stat.size) size = content->stat.size; surf_action_t action = storage_action_execute(storage,size,READ); @@ -101,12 +129,12 @@ static surf_action_t storage_action_write(void *storage, const void* ptr, size_t 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, double size, e_surf_action_storage_type_t type) { surf_action_storage_t action = NULL; storage_t STORAGE = storage; - XBT_IN("(%s,%zu)", surf_resource_name(STORAGE), size); + XBT_IN("(%s,%f)", surf_resource_name(STORAGE), size); action = surf_action_new(sizeof(s_surf_action_storage_t), size, surf_storage_model, STORAGE->state_current != SURF_RESOURCE_ON); @@ -127,6 +155,7 @@ static surf_action_t storage_action_execute (void *storage, size_t size, e_surf_ case OPEN: case CLOSE: case STAT: + case UNLINK: break; case READ: lmm_expand(storage_maxmin_system, STORAGE->constraint_read, @@ -136,7 +165,6 @@ static surf_action_t storage_action_execute (void *storage, size_t size, e_surf_ lmm_expand(storage_maxmin_system, STORAGE->constraint_write, GENERIC_LMM_ACTION(action).variable, 1.0); xbt_dynar_push(((storage_t)storage)->write_actions,&action); - break; } action->type = type; @@ -179,7 +207,7 @@ static void* storage_create_resource(const char* id, const char* model,const cha storage_type->properties, Bread); - if(!storage_list) storage_list=xbt_dynar_new(sizeof(char *),free); + if(!storage_list) storage_list=xbt_dynar_new(sizeof(char *),NULL); xbt_dynar_push(storage_list,&storage); return storage; @@ -193,6 +221,9 @@ static void storage_finalize(void) surf_model_exit(surf_storage_model); surf_storage_model = NULL; + if(storage_list) + xbt_dynar_free(&storage_list); + xbt_swag_free (storage_running_action_set_that_does_not_need_being_checked); storage_running_action_set_that_does_not_need_being_checked = NULL; @@ -211,7 +242,6 @@ static void storage_update_actions_state(double now, double delta) if(action->type == WRITE) { double rate = lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable); - XBT_INFO("Update %f + %f = %f",((surf_action_t)action)->file->content->stat.size,delta * rate,((surf_action_t)action)->file->content->stat.size+delta * rate); ((storage_t)(action->storage))->used_size += delta * rate; // disk usage ((surf_action_t)action)->file->content->stat.size += delta * rate; // file size } @@ -430,6 +460,7 @@ 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.stat = storage_action_stat; + surf_storage_model->extension.storage.unlink = storage_action_unlink; surf_storage_model->extension.storage.create_resource = storage_create_resource; if (!storage_maxmin_system) { @@ -611,6 +642,7 @@ static XBT_INLINE void surf_storage_resource_free(void *r) // specific to storage storage_t storage = r; xbt_dict_free(&storage->content); + xbt_dynar_free(&storage->write_actions); // generic resource surf_resource_free(r); }