X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/850f95301f96109093c438def7238f07c6ae7d7e..4a2a591f2a153d202731c3d2e2a6739a3775ee0a:/src/surf/storage.c diff --git a/src/surf/storage.c b/src/surf/storage.c index 85fdb6d126..971b778b04 100644 --- a/src/surf/storage.c +++ b/src/surf/storage.c @@ -1,16 +1,16 @@ -/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2013. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/ex.h" #include "xbt/dict.h" -#include "xbt/file_stat.h" #include "portable.h" #include "surf_private.h" #include "storage_private.h" #include "surf/surf_resource.h" +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module"); @@ -30,93 +30,139 @@ 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 xbt_dict_t parse_storage_content(char *filename, sg_storage_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, size_t size, e_surf_action_storage_type_t type); +static surf_action_t storage_action_execute (void *storage, sg_storage_size_t size, e_surf_action_storage_type_t type); -static surf_action_t storage_action_stat(void *storage, surf_file_t stream) +static surf_action_t storage_action_ls(void *storage, const char* path) { - surf_action_t action = storage_action_execute(storage,0, STAT); - action->file = stream; - action->stat = stream->content->stat; + surf_action_t action = storage_action_execute(storage,0, LS); + action->ls_dict = NULL; + xbt_dict_t ls_dict = xbt_dict_new_homogeneous(NULL); + + char* key; + sg_storage_size_t size = 0; + xbt_dict_cursor_t cursor = NULL; + + xbt_dynar_t dyn = NULL; + char* file = NULL; + + // for each file in the storage content + xbt_dict_foreach(((storage_t)storage)->content,cursor,key,size){ + // 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,&size,NULL); + } + // Directory + else + { + // if directory does not exist yet in the dictionary + 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_open(void *storage, const char* mount, const char* path, const char* mode) +static surf_action_t storage_action_open(void *storage, const char* mount, + const char* path) { 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); + sg_storage_size_t size = (sg_storage_size_t) xbt_dict_get_or_null(content_dict,path); + // if file does not exist create an empty file + if(!size){ + size = 0; + xbt_dict_set(content_dict,path,&size,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; - file->storage = mount; + file->size = size; + file->mount = xbt_strdup(mount); surf_action_t action = storage_action_execute(storage,0, OPEN); action->file = (void *)file; return action; } -static surf_action_t storage_action_close(void *storage, surf_file_t fp) +static surf_action_t storage_action_close(void *storage, surf_file_t fd) { - char *filename = fp->name; - free(fp->name); - fp->content = NULL; - xbt_free(fp); + char *filename = fd->name; + XBT_DEBUG("\tClose file '%s' size '%" PRIu64 "'", filename, fd->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) == fd) { + xbt_dynar_cursor_rm(((storage_t)storage)->write_actions, &i); + storage_action_unref((surf_action_t) write_action); + } + } + free(fd->name); + free(fd->mount); + xbt_free(fd); 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, sg_storage_size_t size, + surf_file_t fd) { - 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; + 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, sg_storage_size_t size, + surf_file_t fd) { - char *filename = stream->name; - 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; + char *filename = fd->name; + XBT_DEBUG("\tWrite file '%s' size '%" PRIu64 "/%" PRIu64 "'", + filename, size, fd->size); surf_action_t action = storage_action_execute(storage,size,WRITE); - // if(used_size==size) { - // storage_action_state_set((surf_action_t) action, SURF_ACTION_FAILED); - // } + action->file = fd; + + // 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, sg_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,%" PRIu64, 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... */ @@ -131,6 +177,7 @@ static surf_action_t storage_action_execute (void *storage, size_t size, e_surf_ case OPEN: case CLOSE: case STAT: + case LS: break; case READ: lmm_expand(storage_maxmin_system, STORAGE->constraint_read, @@ -139,37 +186,67 @@ 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); + surf_action_ref((surf_action_t) 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,const char* content_name) +static xbt_dict_t storage_get_properties(const void *storage) { + return surf_resource_properties(surf_storage_resource_priv(storage)); +} + +static xbt_dict_t storage_get_content(void *storage) +{ + /* For the moment this action has no cost, but in the future we could take in account access latency of the disk */ + /*surf_action_t action = storage_action_execute(storage,0, LS);*/ + + void *st = surf_storage_resource_priv(storage); + xbt_dict_t content_dict = xbt_dict_new_homogeneous(NULL); + xbt_dict_cursor_t cursor = NULL; + char *file; + char *size; + xbt_dict_foreach(((storage_t)st)->content, cursor, file, size){ + xbt_dict_set(content_dict,file,(void*)size,NULL); + } + return content_dict; +} + +static void* storage_create_resource(const char* id, const char* model, + const char* type_id, const char* content_name, const char* content_type, xbt_dict_t properties){ 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), - surf_storage_model, id,NULL); + surf_storage_model, id, properties, 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")); - 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); @@ -180,6 +257,10 @@ 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); + xbt_dynar_push(storage_list,&storage); + return storage; } @@ -191,6 +272,8 @@ static void storage_finalize(void) surf_model_exit(surf_storage_model); surf_storage_model = NULL; + 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; @@ -202,29 +285,44 @@ 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 -// 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) { + if(action->type == WRITE) + { + // Update the disk usage + // Update the file size + // Update the storage content (with file size) + double rate = lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable); + /* Hack to avoid rounding differences between x86 and x86_64 + * (note that the next sizes are of type sg_storage_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 + + xbt_dict_t content_dict = ((storage_t)(action->storage))->content; + xbt_dict_set(content_dict,((surf_action_t)action)->file->name,(void*)(((surf_action_t)action)->file->size),NULL); + } + 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)) { + + 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); } @@ -237,19 +335,27 @@ static double storage_share_resources(double NOW) { XBT_DEBUG("storage_share_resources %f",NOW); s_surf_action_storage_t action; + 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); - /* - 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); - } - }*/ + + 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; } @@ -337,20 +443,28 @@ 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, + storage->properties); } static void parse_mstorage_init(sg_platf_mstorage_cbarg_t mstorage) @@ -407,8 +521,9 @@ 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.stat = storage_action_stat; - surf_storage_model->extension.storage.create_resource = storage_create_resource; + surf_storage_model->extension.storage.ls = storage_action_ls; + surf_storage_model->extension.storage.get_properties = storage_get_properties; + surf_storage_model->extension.storage.get_content = storage_get_content; if (!storage_maxmin_system) { storage_maxmin_system = lmm_system_new(storage_selective_update); @@ -446,24 +561,13 @@ static void storage_parse_storage(sg_platf_storage_cbarg_t storage) (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) +static xbt_dict_t parse_storage_content(char *filename, sg_storage_size_t *used_size) { *used_size = 0; if ((!filename) || (strcmp(filename, "") == 0)) return NULL; - xbt_dict_t parse_content = xbt_dict_new_homogeneous(free_storage_content); + xbt_dict_t parse_content = xbt_dict_new_homogeneous(NULL); FILE *file = NULL; file = surf_fopen(filename, "r"); @@ -473,36 +577,20 @@ static xbt_dict_t parse_storage_content(char *filename, unsigned long *used_size 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 + sg_storage_size_t size; + + while ((read = xbt_getline(&line, &len, file)) != -1) { + if (read){ + if (sscanf(line,"%s %" SCNu64, path, &size) == 2) { + *used_size += size; + xbt_dict_set(parse_content,path,(void*) size,NULL); + } else { + xbt_die("Be sure of passing a good format for content file.\n"); + } } } - if (line) - free(line); + free(line); fclose(file); return parse_content; } @@ -516,13 +604,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, @@ -557,14 +648,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_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){ @@ -580,6 +672,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); } @@ -589,6 +682,9 @@ 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); + free(storage->type_id); + free(storage->content_type); // generic resource surf_resource_free(r); } @@ -611,3 +707,4 @@ void storage_register_callbacks() { sg_platf_storage_type_add_cb(storage_parse_storage_type); sg_platf_mount_add_cb(storage_parse_mount); } +