X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/26c6aebfc3d40f0ba86e7f352867bd626a89f14a..ee0aeec0c91b0d36df626e0d74ac872ae7ddac44:/src/surf/storage.c diff --git a/src/surf/storage.c b/src/surf/storage.c index d25b3d6255..1b6bd3f43e 100644 --- a/src/surf/storage.c +++ b/src/surf/storage.c @@ -8,76 +8,231 @@ #include "xbt/dict.h" #include "portable.h" #include "surf_private.h" +#include "storage_private.h" #include "surf/surf_resource.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module"); surf_model_t surf_storage_model = NULL; +lmm_system_t storage_maxmin_system = NULL; +static int storage_selective_update = 0; +static xbt_swag_t + storage_running_action_set_that_does_not_need_being_checked = NULL; + +#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* model; + const char* type; const char* content; /*should be a dict */ } s_surf_storage_t, *surf_storage_t; +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_open(void *storage, const char* path, const char* mode) { - return NULL; + 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); + + m_file_t file = xbt_new0(s_m_file_t,1); + file->name = xbt_strdup(path); + file->content = content; + + surf_action_t action = storage_action_execute(storage,0, DEFAULT); + return action; } -static surf_action_t storage_action_close(void *storage, surf_file_t fp) +static surf_action_t storage_action_close(void *storage, m_file_t fp) { - return NULL; + char *filename = fp->name; + free(fp->name); + fp->content = NULL; + xbt_free(fp); + surf_action_t action = storage_action_execute(storage,0, DEFAULT); + 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, size_t size, size_t nmemb, m_file_t stream) { - return NULL; + char *filename = stream->name; + content_t content = (content_t)(stream->content); + XBT_DEBUG("\tRead file '%s' size '%Zu/%Zu'",filename,size,content->size); + if(size > content->size) + size = content->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, const void* ptr, size_t size, size_t nmemb, m_file_t stream) { - return NULL; + char *filename = stream->name; + content_t content = (content_t)(stream->content); + XBT_DEBUG("\tWrite file '%s' size '%Zu/%Zu'",filename,size,content->size); + + surf_action_t action = storage_action_execute(storage,size,WRITE); + content->size += size; + return action; } static surf_action_t storage_action_stat(void *storage, int fd, void* buf) { + THROW_UNIMPLEMENTED; return NULL; } -static void* storage_create_resource(const char* id, const char* model, - const char* content, xbt_dict_t storage_properties) +static surf_action_t storage_action_execute (void *storage, size_t size, STORAGE_execute_type_t type) { - XBT_DEBUG("Storage_create_resource '%s' at level SURF_STORAGE_LEVEL",id); - surf_storage_t storage = NULL; - xbt_assert(!surf_storage_resource_by_name(id), - "Storage '%s' declared several times in the platform file", - id); - storage = (surf_storage_t) surf_resource_new(sizeof(s_surf_storage_t), - surf_storage_model, id, storage_properties); - storage->model = model; - storage->content = content; - xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage); + surf_action_storage_t action = NULL; + storage_t STORAGE = storage; + + 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); + + GENERIC_LMM_ACTION(action).suspended = 0; /* Should be useless because of the + calloc but it seems to help valgrind... */ + + GENERIC_LMM_ACTION(action).variable = + lmm_variable_new(storage_maxmin_system, action, 1.0, -1.0 , 3); + + if(type == DEFAULT) + lmm_expand(storage_maxmin_system, STORAGE->constraint, + GENERIC_LMM_ACTION(action).variable, 1.0); + else if(type == READ) + lmm_expand(storage_maxmin_system, STORAGE->constraint_read, + GENERIC_LMM_ACTION(action).variable, 1.0); + else if(type == 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; +} - return storage; +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); + } + + 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) +{ + storage_t storage = NULL; + + xbt_assert(!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); + + storage->state_current = SURF_RESOURCE_ON; + + 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); + storage->constraint_read = lmm_constraint_new(storage_maxmin_system, storage, Bread); + storage->constraint_write = lmm_constraint_new(storage_maxmin_system, storage, Bwrite); + + 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", + id, + model, + type_id, + storage_type->properties, + Bread); + + return storage; } static void storage_finalize(void) { + lmm_system_free(storage_maxmin_system); + storage_maxmin_system = NULL; + surf_model_exit(surf_storage_model); surf_storage_model = NULL; + + xbt_swag_free + (storage_running_action_set_that_does_not_need_being_checked); + storage_running_action_set_that_does_not_need_being_checked = NULL; } 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) { + + 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)) { + 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).finish = surf_get_clock(); + storage_action_state_set((surf_action_t) action, SURF_ACTION_DONE); + } + } + + return; } static double storage_share_resources(double NOW) { - double min_action_duration = -1; - return min_action_duration; + 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, + xbt_swag_offset(action, generic_lmm_action.variable), + storage_maxmin_system, lmm_solve); } static int storage_resource_used(void *resource_id) @@ -94,23 +249,43 @@ static void storage_resources_state(void *id, tmgr_trace_event_t event_type, static int storage_action_unref(surf_action_t action) { - THROW_UNIMPLEMENTED; + action->refcount--; + if (!action->refcount) { + xbt_swag_remove(action, action->state_set); + if (((surf_action_lmm_t) action)->variable) + lmm_variable_free(storage_maxmin_system, + ((surf_action_lmm_t) action)->variable); +#ifdef HAVE_TRACING + xbt_free(action->category); +#endif + surf_action_free(&action); + return 1; + } return 0; } static void storage_action_cancel(surf_action_t action) { - THROW_UNIMPLEMENTED; + surf_action_state_set(action, SURF_ACTION_FAILED); + return; } static void storage_action_state_set(surf_action_t action, e_surf_action_state_t state) { - THROW_UNIMPLEMENTED; + surf_action_state_set(action, state); + return; } static void storage_action_suspend(surf_action_t action) { - THROW_UNIMPLEMENTED; + XBT_IN("(%p)", action); + if (((surf_action_lmm_t) action)->suspended != 2) { + lmm_update_variable_weight(storage_maxmin_system, + ((surf_action_lmm_t) action)->variable, + 0.0); + ((surf_action_lmm_t) action)->suspended = 1; + } + XBT_OUT(); } static void storage_action_resume(surf_action_t action) @@ -120,8 +295,7 @@ static void storage_action_resume(surf_action_t action) static int storage_action_is_suspended(surf_action_t action) { - THROW_UNIMPLEMENTED; - return 0; + return (((surf_action_lmm_t) action)->suspended == 1); } static void storage_action_set_max_duration(surf_action_t action, double duration) @@ -136,22 +310,55 @@ static void storage_action_set_priority(surf_action_t action, double priority) static void parse_storage_init(sg_platf_storage_cbarg_t storage) { - storage_create_resource(storage->id, - storage->model, - storage->content, - storage->properties); + void* stype = xbt_lib_get_or_null(storage_type_lib, + 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, + ((storage_type_t) stype)->model, + ((storage_type_t) stype)->type_id); +} + +static void parse_mstorage_init(sg_platf_mstorage_cbarg_t mstorage) +{ + XBT_DEBUG("parse_mstorage_init"); +} + +static void parse_storage_type_init(sg_platf_storage_type_cbarg_t storagetype_) +{ + XBT_DEBUG("parse_storage_type_init"); +} + +static void parse_mount_init(sg_platf_mount_cbarg_t mount) +{ + XBT_DEBUG("parse_mount_init"); } static void storage_define_callbacks() { sg_platf_storage_add_cb(parse_storage_init); + sg_platf_storage_type_add_cb(parse_storage_type_init); + sg_platf_mstorage_add_cb(parse_mstorage_init); + sg_platf_mount_add_cb(parse_mount_init); } static void surf_storage_model_init_internal(void) { + s_surf_action_t action; + XBT_DEBUG("surf_storage_model_init_internal"); surf_storage_model = surf_model_init(); + storage_running_action_set_that_does_not_need_being_checked = + xbt_swag_new(xbt_swag_offset(action, state_hookup)); + surf_storage_model->name = "Storage"; surf_storage_model->action_unref = storage_action_unref; surf_storage_model->action_cancel = storage_action_cancel; @@ -175,6 +382,11 @@ static void surf_storage_model_init_internal(void) 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; + + if (!storage_maxmin_system) { + storage_maxmin_system = lmm_system_new(storage_selective_update); + } + } void surf_storage_model_init_default(void)