X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/89df6a48741330160c27b692f6fbfc213db31cbe..967421ad9a8dcd567206f2c398a30c08c9507a81:/src/surf/storage.c diff --git a/src/surf/storage.c b/src/surf/storage.c index acf02e6f9b..7aed75ee22 100644 --- a/src/surf/storage.c +++ b/src/surf/storage.c @@ -30,17 +30,14 @@ static int storage_selective_update = 0; static xbt_swag_t storage_running_action_set_that_does_not_need_being_checked = NULL; +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 -typedef struct surf_storage { - s_surf_resource_t generic_resource; - const char* type; - const char* content; /*should be a dict */ -} s_surf_storage_t, *surf_storage_t; - +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) { @@ -53,12 +50,7 @@ static surf_action_t storage_action_stat(void *storage, surf_file_t stream) static surf_action_t storage_action_open(void *storage, const char* mount, const char* path, const char* mode) { XBT_DEBUG("\tOpen file '%s'",path); - char *storage_type_id = xbt_lib_get_or_null( - storage_lib, - ((storage_t)storage)->generic_resource.name, - ROUTING_STORAGE_LEVEL); - storage_type_t storage_type = xbt_lib_get_or_null(storage_type_lib, storage_type_id,ROUTING_STORAGE_TYPE_LEVEL); - xbt_dict_t content_dict = storage_type->content; + xbt_dict_t content_dict = ((storage_t)storage)->content; surf_stat_t content = xbt_dict_get(content_dict,path); surf_file_t file = xbt_new0(s_surf_file_t,1); @@ -74,19 +66,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 '%f'",filename,fp->content->stat.size); free(fp->name); fp->content = NULL; xbt_free(fp); surf_action_t action = storage_action_execute(storage,0, CLOSE); - XBT_DEBUG("\tClose file '%s'",filename); 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); @@ -97,23 +87,30 @@ 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); - content->stat.size += size; + action->file = stream; + + // If the storage is full + if(((storage_t)storage)->used_size==((storage_t)storage)->size) { + storage_action_state_set((surf_action_t) action, SURF_ACTION_FAILED); + } 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); + // Save the storage on action + action->storage = storage; GENERIC_LMM_ACTION(action).suspended = 0; /* Should be useless because of the calloc but it seems to help valgrind... */ @@ -136,14 +133,16 @@ static surf_action_t storage_action_execute (void *storage, size_t size, e_surf_ case WRITE: 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; XBT_OUT(); return (surf_action_t) action; } -static void* storage_create_resource(const char* id, const char* model,const char* type_id) +static void* storage_create_resource(const char* id, const char* model,const char* type_id,const char* content_name) { storage_t storage = NULL; @@ -154,6 +153,9 @@ static void* storage_create_resource(const char* id, const char* model,const cha surf_storage_model, id,NULL); storage->state_current = SURF_RESOURCE_ON; + storage->used_size = 0; + storage->size = 0; + storage->write_actions = xbt_dynar_new(sizeof(char *),NULL); storage_type_t storage_type = xbt_lib_get_or_null(storage_type_lib, type_id,ROUTING_STORAGE_TYPE_LEVEL); double Bread = atof(xbt_dict_get(storage_type->properties,"Bread")); @@ -163,6 +165,8 @@ static void* storage_create_resource(const char* id, const char* model,const cha storage->constraint = lmm_constraint_new(storage_maxmin_system, storage, Bconnection); storage->constraint_read = lmm_constraint_new(storage_maxmin_system, storage, Bread); storage->constraint_write = lmm_constraint_new(storage_maxmin_system, storage, Bwrite); + storage->content = parse_storage_content((char*)content_name,&(storage->used_size)); + storage->size = storage_type->size; xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage); @@ -173,6 +177,9 @@ 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); + xbt_dynar_push(storage_list,&storage); + return storage; } @@ -195,17 +202,40 @@ 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 + // Foreach action of type write xbt_swag_foreach_safe(action, next_action, running_actions) { + if(action->type == WRITE) + { + double rate = lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable); + ((storage_t)(action->storage))->used_size += delta * rate; // disk usage + ((surf_action_t)action)->file->content->stat.size += delta * rate; // file size + } + } + + 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)) { + + 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) + { + 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)) + { 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); } @@ -218,9 +248,29 @@ static double storage_share_resources(double NOW) { XBT_DEBUG("storage_share_resources %f",NOW); s_surf_action_storage_t action; - return generic_maxmin_share_resources(surf_storage_model->states.running_action_set, + unsigned int i,j; + storage_t storage; + surf_action_storage_t write_action; + + double min_completion = generic_maxmin_share_resources(surf_storage_model->states.running_action_set, xbt_swag_offset(action, generic_lmm_action.variable), storage_maxmin_system, lmm_solve); + + double rate; + // Foreach disk + xbt_dynar_foreach(storage_list,i,storage) + { + rate = 0; + // Foreach write action on disk + xbt_dynar_foreach(storage->write_actions,j,write_action) + { + rate += lmm_variable_getvalue(write_action->generic_lmm_action.variable); + } + if(rate > 0) + min_completion = MIN(min_completion, (storage->size-storage->used_size)/rate); + } + + return min_completion; } static int storage_resource_used(void *resource_id) @@ -302,16 +352,24 @@ static void parse_storage_init(sg_platf_storage_cbarg_t storage) storage->type_id, ROUTING_STORAGE_TYPE_LEVEL); if(!stype) xbt_die("No storage type '%s'",storage->type_id); -// XBT_INFO("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' \n\t\tmodel '%s' \n\t\tcontent '%s'\n\t\tproperties '%p'\n", -// storage->id, -// ((storage_type_t) stype)->model, -// ((storage_type_t) stype)->type_id, -// ((storage_type_t) stype)->content, -// ((storage_type_t) stype)->properties); - - storage_create_resource(storage->id, + + // if storage content is not specified use the content of storage_type if exist + if(!strcmp(storage->content,"") && strcmp(((storage_type_t) stype)->content,"")){ + storage->content = ((storage_type_t) stype)->content; + XBT_DEBUG("For disk '%s' content is empty, use the content of storage type '%s'",storage->id,((storage_type_t) stype)->type_id); + } + + XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' \n\t\tmodel '%s' \n\t\tcontent '%s'\n\t\tproperties '%p'\n", + storage->id, + ((storage_type_t) stype)->model, + ((storage_type_t) stype)->type_id, + storage->content, + ((storage_type_t) stype)->properties); + + storage_create_resource(storage->id, ((storage_type_t) stype)->model, - ((storage_type_t) stype)->type_id); + ((storage_type_t) stype)->type_id, + storage->content); } static void parse_mstorage_init(sg_platf_mstorage_cbarg_t mstorage) @@ -396,9 +454,10 @@ static void storage_parse_storage(sg_platf_storage_cbarg_t storage) #endif xbt_assert(storage_type,"Reading a storage, type id \"%s\" does not exists", storage->type_id); - XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s'", + XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s' and content '%s'", storage->id, - storage->type_id); + storage->type_id, + storage->content); xbt_lib_set(storage_lib, storage->id, @@ -417,7 +476,7 @@ static void free_storage_content(void *p) free(content); } -static xbt_dict_t parse_storage_content(const char *filename, unsigned long *used_size) +static xbt_dict_t parse_storage_content(char *filename, unsigned long *used_size) { *used_size = 0; if ((!filename) || (strcmp(filename, "") == 0)) @@ -440,7 +499,7 @@ static xbt_dict_t parse_storage_content(const char *filename, unsigned long *use char time[12]; char path[1024]; int nb; - long size; + unsigned long size; surf_stat_t content; @@ -475,7 +534,7 @@ static void storage_parse_storage_type(sg_platf_storage_type_cbarg_t storage_typ storage_type_t stype = xbt_new0(s_storage_type_t, 1); stype->model = xbt_strdup(storage_type->model); stype->properties = storage_type->properties; - stype->content = parse_storage_content(storage_type->content,&(stype->used_size)); + stype->content = xbt_strdup(storage_type->content); stype->type_id = xbt_strdup(storage_type->id); stype->size = storage_type->size * 1000000000; /* storage_type->size is in Gbytes and stype->sizeis in bytes */ @@ -539,11 +598,20 @@ static XBT_INLINE void routing_storage_type_free(void *r) storage_type_t stype = r; free(stype->model); free(stype->type_id); + free(stype->content); xbt_dict_free(&(stype->properties)); - xbt_dict_free(&(stype->content)); free(stype); } +static XBT_INLINE void surf_storage_resource_free(void *r) +{ + // specific to storage + storage_t storage = r; + xbt_dict_free(&storage->content); + // generic resource + surf_resource_free(r); +} + static XBT_INLINE void routing_storage_host_free(void *r) { xbt_dynar_t dyn = r; @@ -555,7 +623,7 @@ void storage_register_callbacks() { ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,xbt_free); ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib,routing_storage_host_free); ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib,routing_storage_type_free); - SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_resource_free); + SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_resource_free); sg_platf_storage_add_cb(storage_parse_storage); sg_platf_mstorage_add_cb(storage_parse_mstorage);