X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/af0b5e9494ca8988c8dd7d3874c3c7a400a63172..850f95301f96109093c438def7238f07c6ae7d7e:/src/surf/storage.c diff --git a/src/surf/storage.c b/src/surf/storage.c index e59d0c76b3..85fdb6d126 100644 --- a/src/surf/storage.c +++ b/src/surf/storage.c @@ -6,6 +6,7 @@ #include "xbt/ex.h" #include "xbt/dict.h" +#include "xbt/file_stat.h" #include "portable.h" #include "surf_private.h" #include "storage_private.h" @@ -14,6 +15,15 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module"); +xbt_lib_t storage_lib; +int ROUTING_STORAGE_LEVEL; //Routing for storagelevel +int ROUTING_STORAGE_HOST_LEVEL; +int SURF_STORAGE_LEVEL; +xbt_lib_t storage_type_lib; +int ROUTING_STORAGE_TYPE_LEVEL; //Routing for storage_type level + +xbt_dynar_t mount_list = NULL; /* temporary store of current mount storage */ + surf_model_t surf_storage_model = NULL; lmm_system_t storage_maxmin_system = NULL; static int storage_selective_update = 0; @@ -23,38 +33,36 @@ static xbt_swag_t #define GENERIC_LMM_ACTION(action) action->generic_lmm_action #define GENERIC_ACTION(action) GENERIC_LMM_ACTION(action).generic_action -typedef enum { - READ = 0, - WRITE = 1, - DEFAULT = 2 -} STORAGE_execute_type_t; - 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_sleep (void *storage, double duration); -static surf_action_t storage_action_execute (void *storage, size_t size, STORAGE_execute_type_t type); +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_stat(void *storage, surf_file_t stream) +{ + surf_action_t action = storage_action_execute(storage,0, STAT); + action->file = stream; + action->stat = stream->content->stat; + return action; +} -static surf_action_t storage_action_open(void *storage, const char* path, const char* mode) +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; - content_t content = xbt_dict_get(content_dict,path); + 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); file->name = xbt_strdup(path); - file->simdata = content; + file->content = content; + file->storage = mount; - surf_action_t action = storage_action_execute(storage,0, DEFAULT); + surf_action_t action = storage_action_execute(storage,0, OPEN); action->file = (void *)file; return action; } @@ -63,9 +71,9 @@ static surf_action_t storage_action_close(void *storage, surf_file_t fp) { char *filename = fp->name; free(fp->name); - fp->simdata = NULL; + fp->content = NULL; xbt_free(fp); - surf_action_t action = storage_action_execute(storage,0, DEFAULT); + surf_action_t action = storage_action_execute(storage,0, CLOSE); XBT_DEBUG("\tClose file '%s'",filename); return action; } @@ -73,39 +81,38 @@ static surf_action_t storage_action_close(void *storage, surf_file_t fp) static surf_action_t storage_action_read(void *storage, void* ptr, size_t size, size_t nmemb, surf_file_t stream) { char *filename = stream->name; - content_t content = (content_t)(stream->simdata); - XBT_DEBUG("\tRead file '%s' size '%Zu/%Zu'",filename,size,content->size); - if(size > content->size) - size = content->size; + 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); - action->read_write = size; return action; } static surf_action_t storage_action_write(void *storage, const void* ptr, size_t size, size_t nmemb, surf_file_t stream) { char *filename = stream->name; - content_t content = (content_t)(stream->simdata); - XBT_DEBUG("\tWrite file '%s' size '%Zu/%Zu'",filename,size,content->size); + surf_stat_t content = stream->content; + XBT_DEBUG("\tWrite file '%s' size '%zu/%zu'",filename,size,content->stat.size); + + // update file size + content->stat.size += size; + // update disk space + ((storage_t)storage)->used_size =+ size; surf_action_t action = storage_action_execute(storage,size,WRITE); - action->read_write = size; - content->size += size; + // if(used_size==size) { + // storage_action_state_set((surf_action_t) action, SURF_ACTION_FAILED); + // } return action; } -static surf_action_t storage_action_stat(void *storage, int fd, void* buf) -{ - THROW_UNIMPLEMENTED; - return NULL; -} - -static surf_action_t storage_action_execute (void *storage, size_t size, STORAGE_execute_type_t type) +static surf_action_t storage_action_execute (void *storage, size_t 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,%zu)", 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); @@ -116,49 +123,30 @@ static surf_action_t storage_action_execute (void *storage, size_t size, STORAGE GENERIC_LMM_ACTION(action).variable = lmm_variable_new(storage_maxmin_system, action, 1.0, -1.0 , 3); - if(type == DEFAULT) + // Must be less than the max bandwidth for all actions lmm_expand(storage_maxmin_system, STORAGE->constraint, GENERIC_LMM_ACTION(action).variable, 1.0); - else if(type == READ) + + switch(type) { + case OPEN: + case CLOSE: + case STAT: + break; + case READ: lmm_expand(storage_maxmin_system, STORAGE->constraint_read, GENERIC_LMM_ACTION(action).variable, 1.0); - else if(type == WRITE) + break; + case WRITE: lmm_expand(storage_maxmin_system, STORAGE->constraint_write, GENERIC_LMM_ACTION(action).variable, 1.0); - else xbt_die("storage_action_execute with type '%d'",(int) type); - - XBT_OUT(); - return (surf_action_t) action; -} - -static surf_action_t storage_action_sleep (void *storage, double duration) -{ - surf_action_storage_t action = NULL; - - if (duration > 0) - duration = MAX(duration, MAXMIN_PRECISION); - - XBT_IN("(%s,%g)", surf_resource_name(storage), duration); - action = (surf_action_storage_t) storage_action_execute(storage, 1.0, DEFAULT); - GENERIC_ACTION(action).max_duration = duration; - GENERIC_LMM_ACTION(action).suspended = 2; - if (duration == NO_MAX_DURATION) { - /* Move to the *end* of the corresponding action set. This convention - is used to speed up update_resource_state */ - xbt_swag_remove(action, ((surf_action_t) action)->state_set); - ((surf_action_t) action)->state_set = - storage_running_action_set_that_does_not_need_being_checked; - xbt_swag_insert(action, ((surf_action_t) action)->state_set); + break; } - lmm_update_variable_weight(storage_maxmin_system, - GENERIC_LMM_ACTION(action).variable, 0.0); - 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; @@ -169,19 +157,23 @@ 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_type_t storage_type = xbt_lib_get_or_null(storage_type_lib, type_id,ROUTING_STORAGE_TYPE_LEVEL); - size_t Bread = atof(xbt_dict_get(storage_type->properties,"Bread")); - size_t Bwrite = atof(xbt_dict_get(storage_type->properties,"Bwrite")); - size_t Bconnexion = atof(xbt_dict_get(storage_type->properties,"Bconnexion")); - XBT_INFO("Create resource with Bconnexion '%Zu' Bread '%Zu' Bwrite '%Zu'",Bconnexion,Bread,Bwrite); - storage->constraint = lmm_constraint_new(storage_maxmin_system, storage, Bconnexion); + double Bread = atof(xbt_dict_get(storage_type->properties,"Bread")); + double Bwrite = atof(xbt_dict_get(storage_type->properties,"Bwrite")); + double Bconnection = atof(xbt_dict_get(storage_type->properties,"Bconnection")); + XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%ld'",Bconnection,Bread,Bwrite,storage_type->size); + 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); - XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' \n\t\tmodel '%s' \n\t\tproperties '%p'\n\t\tBread '%Zu'\n", + XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' \n\t\tmodel '%s' \n\t\tproperties '%p'\n\t\tBread '%f'\n", id, model, type_id, @@ -209,12 +201,24 @@ static void storage_update_actions_state(double now, double delta) surf_action_storage_t action = NULL; surf_action_storage_t next_action = NULL; xbt_swag_t running_actions = surf_storage_model->states.running_action_set; - xbt_swag_foreach_safe(action, next_action, running_actions) { + // Update the disk usage +// foreach disk { +// rate = 0 +// foreach write_action in disk { +// rate += value(variable(action)) +// } +// used_size += delta * rate +// } + 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(remains>0 and weight(variable(action))>0 && used_size == 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(); @@ -233,9 +237,21 @@ 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, + 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); + /* + foreach(disk) { + rate = 0 + foreach write_action in disk { + rate += value(variable(action)); + } + if(rate>0) { + min_completion = MIN(min_completion, (size-used_size)/rate); + } + }*/ + + return min_completion; } static int storage_resource_used(void *resource_id) @@ -317,16 +333,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) @@ -399,3 +423,191 @@ void surf_storage_model_init_default(void) xbt_dynar_push(model_list, &surf_storage_model); } + +static void storage_parse_storage(sg_platf_storage_cbarg_t storage) +{ + xbt_assert(!xbt_lib_get_or_null(storage_lib, storage->id,ROUTING_STORAGE_LEVEL), + "Reading a storage, processing unit \"%s\" already exists", storage->id); + + // Verification of an existing type_id +#ifndef NDEBUG + void* storage_type = xbt_lib_get_or_null(storage_type_lib, storage->type_id,ROUTING_STORAGE_TYPE_LEVEL); +#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' and content '%s'", + storage->id, + storage->type_id, + storage->content); + + xbt_lib_set(storage_lib, + storage->id, + ROUTING_STORAGE_LEVEL, + (void *) xbt_strdup(storage->type_id)); +} + +static void free_storage_content(void *p) +{ + surf_stat_t content = p; + free(content->stat.date); + free(content->stat.group); + free(content->stat.time); + free(content->stat.user); + free(content->stat.user_rights); + free(content); +} + +static xbt_dict_t parse_storage_content(char *filename, unsigned long *used_size) +{ + *used_size = 0; + if ((!filename) || (strcmp(filename, "") == 0)) + return NULL; + + xbt_dict_t parse_content = xbt_dict_new_homogeneous(free_storage_content); + FILE *file = NULL; + + file = surf_fopen(filename, "r"); + xbt_assert(file != NULL, "Cannot open file '%s' (path=%s)", filename, + xbt_str_join(surf_path, ":")); + + char *line = NULL; + size_t len = 0; + ssize_t read; + char user_rights[12]; + char user[100]; + char group[100]; + char date[12]; + char time[12]; + char path[1024]; + int nb; + long size; + + surf_stat_t content; + + while ((read = getline(&line, &len, file)) != -1) { + 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 + } + } + if (line) + free(line); + fclose(file); + return parse_content; +} + +static void storage_parse_storage_type(sg_platf_storage_type_cbarg_t storage_type) +{ + xbt_assert(!xbt_lib_get_or_null(storage_type_lib, storage_type->id,ROUTING_STORAGE_TYPE_LEVEL), + "Reading a storage type, processing unit \"%s\" already exists", storage_type->id); + + 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 = 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 */ + + XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s' content '%s'", + stype->type_id, + stype->model, + storage_type->content); + + xbt_lib_set(storage_type_lib, + stype->type_id, + ROUTING_STORAGE_TYPE_LEVEL, + (void *) stype); +} +static void storage_parse_mstorage(sg_platf_mstorage_cbarg_t mstorage) +{ + THROW_UNIMPLEMENTED; +// mount_t mnt = xbt_new0(s_mount_t, 1); +// mnt->id = xbt_strdup(mstorage->type_id); +// mnt->name = xbt_strdup(mstorage->name); +// +// if(!mount_list){ +// XBT_DEBUG("Creata a Mount list for %s",A_surfxml_host_id); +// mount_list = xbt_dynar_new(sizeof(char *), NULL); +// } +// xbt_dynar_push(mount_list,(void *) mnt); +// free(mnt->id); +// free(mnt->name); +// xbt_free(mnt); +// XBT_DEBUG("ROUTING Mount a storage name '%s' with type_id '%s'",mstorage->name, mstorage->id); +} + +static void mount_free(void *p) +{ + mount_t mnt = p; + xbt_free(mnt->name); +} + +static void storage_parse_mount(sg_platf_mount_cbarg_t mount) +{ + // Verification of an existing storage +#ifndef NDEBUG + void* storage = xbt_lib_get_or_null(storage_lib, mount->id,ROUTING_STORAGE_LEVEL); +#endif + xbt_assert(storage,"Disk id \"%s\" does not exists", mount->id); + + 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.name = xbt_strdup(mount->name); + + if(!mount_list){ + XBT_DEBUG("Create a Mount list for %s",A_surfxml_host_id); + mount_list = xbt_dynar_new(sizeof(s_mount_t), mount_free); + } + xbt_dynar_push(mount_list,&mnt); +} + +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)); + 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; + xbt_dynar_free(&dyn); +} + +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_storage_resource_free); + + sg_platf_storage_add_cb(storage_parse_storage); + sg_platf_mstorage_add_cb(storage_parse_mstorage); + sg_platf_storage_type_add_cb(storage_parse_storage_type); + sg_platf_mount_add_cb(storage_parse_mount); +}