X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8b1bc235e2747a7705c534c0fdcb0bc1bb8fb499..6daf66cdee9baabe8732e3946758e9fe106c09b2:/src/surf/storage.c diff --git a/src/surf/storage.c b/src/surf/storage.c index 8d18f31d88..ce0528e164 100644 --- a/src/surf/storage.c +++ b/src/surf/storage.c @@ -34,10 +34,10 @@ 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 -static xbt_dict_t parse_storage_content(char *filename, unsigned long *used_size); +static xbt_dict_t parse_storage_content(char *filename, size_t *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, double size, e_surf_action_storage_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_ls(void *storage, const char* path) { @@ -46,7 +46,7 @@ static surf_action_t storage_action_ls(void *storage, const char* path) xbt_dict_t ls_dict = xbt_dict_new(); char* key; - unsigned long size = 0; + size_t size = 0; xbt_dict_cursor_t cursor = NULL; xbt_dynar_t dyn = NULL; @@ -81,23 +81,6 @@ static surf_action_t storage_action_ls(void *storage, const char* path) 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->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); - xbt_free(stream); - - return action; -} - static surf_action_t storage_action_open(void *storage, const char* mount, const char* path) { @@ -112,7 +95,7 @@ static surf_action_t storage_action_open(void *storage, const char* mount, surf_file_t file = xbt_new0(s_surf_file_t,1); file->name = xbt_strdup(path); file->size = size; - file->storage = mount; + file->mount = xbt_strdup(mount); surf_action_t action = storage_action_execute(storage,0, OPEN); action->file = (void *)file; @@ -134,26 +117,29 @@ static surf_action_t storage_action_close(void *storage, surf_file_t fd) } free(fd->name); + free(fd->mount); xbt_free(fd); surf_action_t action = storage_action_execute(storage,0, CLOSE); return action; } -static surf_action_t storage_action_read(void *storage, void* ptr, double size, size_t nmemb, surf_file_t stream) +static surf_action_t storage_action_read(void *storage, size_t size, + surf_file_t fd) { - if(size > stream->size) - size = stream->size; + if(size > fd->size) + size = fd->size; surf_action_t action = storage_action_execute(storage,size,READ); return action; } -static surf_action_t storage_action_write(void *storage, const void* ptr, size_t size, size_t nmemb, surf_file_t stream) +static surf_action_t storage_action_write(void *storage, size_t size, + surf_file_t fd) { - char *filename = stream->name; - XBT_DEBUG("\tWrite file '%s' size '%zu/%zu'",filename,size,stream->size); + char *filename = fd->name; + XBT_DEBUG("\tWrite file '%s' size '%zu/%zu'",filename,size,fd->size); surf_action_t action = storage_action_execute(storage,size,WRITE); - action->file = stream; + action->file = fd; // If the storage is full if(((storage_t)storage)->used_size==((storage_t)storage)->size) { @@ -162,12 +148,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, double size, e_surf_action_storage_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,%f", 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); @@ -188,7 +174,6 @@ static surf_action_t storage_action_execute (void *storage, double size, e_surf_ case OPEN: case CLOSE: case STAT: - case UNLINK: case LS: break; case READ: @@ -207,8 +192,8 @@ static surf_action_t storage_action_execute (void *storage, double size, e_surf_ return (surf_action_t) action; } -static void* storage_create_resource(const char* id, const char* model,const char* type_id,const char* content_name) -{ +static void* storage_create_resource(const char* id, const char* model, + const char* type_id, const char* content_name, const char* content_type){ storage_t storage = NULL; xbt_assert(!surf_storage_resource_priv(surf_storage_resource_by_name(id)), @@ -217,21 +202,28 @@ static void* storage_create_resource(const char* id, const char* model,const cha storage = (storage_t) surf_resource_new(sizeof(s_storage_t), surf_storage_model, id,NULL); + storage->generic_resource.name = xbt_strdup(id); 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")); - 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); + double Bread = + surf_parse_get_bandwidth(xbt_dict_get(storage_type->properties,"Bread")); + double Bwrite = + surf_parse_get_bandwidth(xbt_dict_get(storage_type->properties,"Bwrite")); + double Bconnection = + surf_parse_get_bandwidth(xbt_dict_get(storage_type->properties, + "Bconnection")); + XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%lu'",Bconnection,Bread,Bwrite,(unsigned long)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->content_type = xbt_strdup(content_type); storage->size = storage_type->size; + storage->type_id = xbt_strdup(type_id); xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage); @@ -242,7 +234,8 @@ 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 *),NULL); + if (!storage_list) + storage_list = xbt_dynar_new(sizeof(char *),NULL); xbt_dynar_push(storage_list,&storage); return storage; @@ -276,8 +269,11 @@ static void storage_update_actions_state(double now, double delta) 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->size += delta * rate; // file size + /* Hack to avoid rounding differences between x86 and x86_64 + * (note that the next sizes are of type size_t). */ + long incr = delta * rate + MAXMIN_PRECISION; + ((storage_t)(action->storage))->used_size += incr; // disk usage + ((surf_action_t)action)->file->size += incr; // file size } } @@ -423,20 +419,27 @@ static void parse_storage_init(sg_platf_storage_cbarg_t storage) // 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); + storage->content_type = ((storage_type_t) stype)->content_type; + XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s) from storage type '%s' ", + storage->id,((storage_type_t) stype)->content_type, + ((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", + XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' " + "\n\t\tmodel '%s' \n\t\tcontent '%s'\n\t\tcontent_type '%s' " + "\n\t\tproperties '%p'\n", storage->id, ((storage_type_t) stype)->model, ((storage_type_t) stype)->type_id, storage->content, + storage->content_type, ((storage_type_t) stype)->properties); storage_create_resource(storage->id, ((storage_type_t) stype)->model, ((storage_type_t) stype)->type_id, - storage->content); + storage->content, + storage->content_type); } static void parse_mstorage_init(sg_platf_mstorage_cbarg_t mstorage) @@ -493,7 +496,6 @@ static void surf_storage_model_init_internal(void) surf_storage_model->extension.storage.close = storage_action_close; surf_storage_model->extension.storage.read = storage_action_read; surf_storage_model->extension.storage.write = storage_action_write; - surf_storage_model->extension.storage.unlink = storage_action_unlink; surf_storage_model->extension.storage.ls = storage_action_ls; if (!storage_maxmin_system) { @@ -532,7 +534,7 @@ static void storage_parse_storage(sg_platf_storage_cbarg_t storage) (void *) xbt_strdup(storage->type_id)); } -static xbt_dict_t parse_storage_content(char *filename, unsigned long *used_size) +static xbt_dict_t parse_storage_content(char *filename, size_t *used_size) { *used_size = 0; if ((!filename) || (strcmp(filename, "") == 0)) @@ -549,12 +551,12 @@ static xbt_dict_t parse_storage_content(char *filename, unsigned long *used_size size_t len = 0; ssize_t read; char path[1024]; - unsigned long size; + size_t size; while ((read = xbt_getline(&line, &len, file)) != -1) { if (read){ - if(sscanf(line,"%s %ld",path, &size)==2) { + if(sscanf(line,"%s %zu",path, &size)==2) { *used_size += size; xbt_dict_set(parse_content,path,(void*) size,NULL); } else { @@ -576,13 +578,16 @@ static void storage_parse_storage_type(sg_platf_storage_type_cbarg_t storage_typ stype->model = xbt_strdup(storage_type->model); stype->properties = storage_type->properties; stype->content = xbt_strdup(storage_type->content); + stype->content_type = xbt_strdup(storage_type->content_type); 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 */ + stype->size = storage_type->size; - XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s' content '%s'", + XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s', " + "content '%s', and content_type '%s'", stype->type_id, stype->model, - storage_type->content); + storage_type->content, + storage_type->content_type); xbt_lib_set(storage_type_lib, stype->type_id, @@ -617,14 +622,15 @@ 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); + void* storage = xbt_lib_get_or_null(storage_lib, mount->storageId,ROUTING_STORAGE_LEVEL); #endif - xbt_assert(storage,"Disk id \"%s\" does not exists", mount->id); + xbt_assert(storage,"Disk id \"%s\" does not exists", mount->storageId); - XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->id, mount->name); + XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->storageId, mount->name); s_mount_t mnt; - mnt.id = surf_storage_resource_priv(surf_storage_resource_by_name(mount->id)); + mnt.storage = + surf_storage_resource_priv(surf_storage_resource_by_name(mount->storageId)); mnt.name = xbt_strdup(mount->name); if(!mount_list){ @@ -640,6 +646,7 @@ static XBT_INLINE void routing_storage_type_free(void *r) free(stype->model); free(stype->type_id); free(stype->content); + free(stype->content_type); xbt_dict_free(&(stype->properties)); free(stype); }