X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/05ac94f042a0e8534114f7f31a40a36af730a680..c7bc969088ae0b8ad6444b11d81044fc7333490c:/src/surf/storage.c diff --git a/src/surf/storage.c b/src/surf/storage.c index ff53f1c41a..6c4e2ab446 100644 --- a/src/surf/storage.c +++ b/src/surf/storage.c @@ -36,8 +36,10 @@ static xbt_dynar_t storage_list; #define GENERIC_ACTION(action) GENERIC_LMM_ACTION(action).generic_action static xbt_dict_t parse_storage_content(char *filename, unsigned long *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, double size, e_surf_action_storage_type_t type); +static void free_storage_content(void *p); static surf_action_t storage_action_stat(void *storage, surf_file_t stream) { @@ -47,12 +49,84 @@ static surf_action_t storage_action_stat(void *storage, surf_file_t stream) return action; } +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(); + + char* key; + surf_stat_t data = NULL; + xbt_dict_cursor_t cursor = NULL; + + xbt_dynar_t dyn = NULL; + char* file = NULL; + + // foreach file int the storage + xbt_dict_foreach(((storage_t)storage)->content,cursor,key,data){ + // Search if file start with the prefix 'path' + if(xbt_str_start_with(key,path)){ + file = &key[strlen(path)]; + + // Split file with '/' + dyn = xbt_str_split(file,"/"); + file = xbt_dynar_get_as(dyn,0,char*); + + // file + if(xbt_dynar_length(dyn) == 1){ + xbt_dict_set(ls_dict,file,&(data->stat),NULL); + } + // Directory + else + { + // if directory does not exist yet in dict + if(!xbt_dict_get_or_null(ls_dict,file)) + xbt_dict_set(ls_dict,file,NULL,NULL); + } + xbt_dynar_free(&dyn); + } + } + + action->ls_dict = ls_dict; + 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; @@ -66,7 +140,17 @@ static surf_action_t storage_action_open(void *storage, const char* mount, const static surf_action_t storage_action_close(void *storage, surf_file_t fp) { char *filename = fp->name; - XBT_DEBUG("\tClose file '%s' size '%ld'",filename,fp->content->stat.size); + XBT_DEBUG("\tClose file '%s' size '%f'",filename,fp->content->stat.size); + // unref write actions from storage + surf_action_storage_t write_action; + unsigned int i; + xbt_dynar_foreach(((storage_t)storage)->write_actions,i,write_action) { + if ((write_action->generic_lmm_action.generic_action.file) == fp) { + xbt_dynar_cursor_rm(((storage_t)storage)->write_actions, &i); + storage_action_unref((surf_action_t) write_action); + } + } + free(fp->name); fp->content = NULL; xbt_free(fp); @@ -74,11 +158,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 '%zu/%zu'",filename,size,content->stat.size); if(size > content->stat.size) size = content->stat.size; surf_action_t action = storage_action_execute(storage,size,READ); @@ -89,7 +171,7 @@ static surf_action_t storage_action_write(void *storage, const void* ptr, size_t { char *filename = stream->name; surf_stat_t content = stream->content; - XBT_DEBUG("\tWrite file '%s' size '%zu/%zu'",filename,size,content->stat.size); + XBT_DEBUG("\tWrite file '%s' size '%zu/%f'",filename,size,content->stat.size); surf_action_t action = storage_action_execute(storage,size,WRITE); action->file = stream; @@ -101,12 +183,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 +209,8 @@ static surf_action_t storage_action_execute (void *storage, size_t size, e_surf_ case OPEN: case CLOSE: case STAT: + case UNLINK: + case LS: break; case READ: lmm_expand(storage_maxmin_system, STORAGE->constraint_read, @@ -136,7 +220,7 @@ 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); - + surf_action_ref((surf_action_t) action); break; } action->type = type; @@ -148,7 +232,7 @@ static void* storage_create_resource(const char* id, const char* model,const cha { storage_t storage = NULL; - xbt_assert(!surf_storage_resource_by_name(id), + 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), @@ -179,7 +263,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 +277,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; @@ -217,22 +304,27 @@ static void storage_update_actions_state(double now, double delta) } xbt_swag_foreach_safe(action, next_action, running_actions) { + double_update(&(GENERIC_ACTION(action).remains), lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable) * delta); + if (GENERIC_LMM_ACTION(action).generic_action.max_duration != NO_MAX_DURATION) double_update(&(GENERIC_ACTION(action).max_duration), delta); + if(GENERIC_ACTION(action).remains > 0 && lmm_get_variable_weight(GENERIC_LMM_ACTION(action).variable) > 0 && - ((storage_t)action->storage)->used_size == ((storage_t)action->storage)->size) { + ((storage_t)action->storage)->used_size == ((storage_t)action->storage)->size) + { GENERIC_ACTION(action).finish = surf_get_clock(); storage_action_state_set((surf_action_t) action, SURF_ACTION_FAILED); - } else - if ((GENERIC_ACTION(action).remains <= 0) && - (lmm_get_variable_weight(GENERIC_LMM_ACTION(action).variable) > 0)) { + } else if ((GENERIC_ACTION(action).remains <= 0) && + (lmm_get_variable_weight(GENERIC_LMM_ACTION(action).variable) > 0)) + { GENERIC_ACTION(action).finish = surf_get_clock(); storage_action_state_set((surf_action_t) action, SURF_ACTION_DONE); } else if ((GENERIC_ACTION(action).max_duration != NO_MAX_DURATION) && - (GENERIC_ACTION(action).max_duration <= 0)) { + (GENERIC_ACTION(action).max_duration <= 0)) + { GENERIC_ACTION(action).finish = surf_get_clock(); storage_action_state_set((surf_action_t) action, SURF_ACTION_DONE); } @@ -424,7 +516,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.stat = storage_action_stat; - surf_storage_model->extension.storage.create_resource = storage_create_resource; + surf_storage_model->extension.storage.unlink = storage_action_unlink; + surf_storage_model->extension.storage.ls = storage_action_ls; if (!storage_maxmin_system) { storage_maxmin_system = lmm_system_new(storage_selective_update); @@ -496,25 +589,27 @@ static xbt_dict_t parse_storage_content(char *filename, unsigned long *used_size char time[12]; char path[1024]; int nb; - long size; + unsigned long size; surf_stat_t content; while ((read = getline(&line, &len, file)) != -1) { + if (read){ content = xbt_new0(s_surf_stat_t,1); if(sscanf(line,"%s %d %s %s %ld %s %s %s",user_rights,&nb,user,group,&size,date,time,path)==8) { - content->stat.date = xbt_strdup(date); - content->stat.group = xbt_strdup(group); - content->stat.size = size; - content->stat.time = xbt_strdup(time); - content->stat.user = xbt_strdup(user); - content->stat.user_rights = xbt_strdup(user_rights); - *used_size += content->stat.size; - xbt_dict_set(parse_content,path,content,NULL); - } else { - xbt_die("Be sure of passing a good format for content file.\n"); - // You can generate this kind of file with command line: - // find /path/you/want -type f -exec ls -l {} \; 2>/dev/null > ./content.txt + content->stat.date = xbt_strdup(date); + content->stat.group = xbt_strdup(group); + content->stat.size = size; + content->stat.time = xbt_strdup(time); + content->stat.user = xbt_strdup(user); + content->stat.user_rights = xbt_strdup(user_rights); + *used_size += content->stat.size; + xbt_dict_set(parse_content,path,content,NULL); + } else { + xbt_die("Be sure of passing a good format for content file.\n"); + // You can generate this kind of file with command line: + // find /path/you/want -type f -exec ls -l {} \; 2>/dev/null > ./content.txt + } } } if (line) @@ -580,7 +675,7 @@ static void storage_parse_mount(sg_platf_mount_cbarg_t mount) XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->id, mount->name); s_mount_t mnt; - mnt.id = surf_storage_resource_by_name(mount->id); + mnt.id = surf_storage_resource_priv(surf_storage_resource_by_name(mount->id)); mnt.name = xbt_strdup(mount->name); if(!mount_list){ @@ -605,6 +700,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); }