X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e0d3b66cb9e29820cb06538de0c803f58e942794..f2df13795e01302813a6aef10825ec7e922ce530:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index b9d42dc55e..289e657470 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2013-2014. 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. */ + #include "storage_n11.hpp" #include "surf_private.h" @@ -18,18 +24,14 @@ static XBT_INLINE void routing_storage_type_free(void *r) free(stype->content); free(stype->content_type); xbt_dict_free(&(stype->properties)); - xbt_dict_free(&(stype->properties)); + xbt_dict_free(&(stype->model_properties)); free(stype); } static XBT_INLINE void surf_storage_resource_free(void *r) { // specific to storage - StoragePtr storage = dynamic_cast(static_cast(r)); - xbt_dict_free(&storage->p_content); - xbt_dynar_free(&storage->p_writeActions); - free(storage->p_typeId); - free(storage->p_contentType); + StoragePtr storage = static_cast(r); // generic resource delete storage; } @@ -58,19 +60,20 @@ static void parse_storage_init(sg_platf_storage_cbarg_t storage) 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", + "\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->properties); surf_storage_model->createResource(storage->id, ((storage_type_t) stype)->type_id, storage->content, storage->content_type, - storage->properties); + storage->properties, + storage->attach); } static void parse_mstorage_init(sg_platf_mstorage_cbarg_t /*mstorage*/) @@ -122,6 +125,7 @@ static void storage_parse_storage_type(sg_platf_storage_type_cbarg_t storage_typ stype->content_type = xbt_strdup(storage_type->content_type); stype->type_id = xbt_strdup(storage_type->id); stype->size = storage_type->size; + stype->model_properties = storage_type->model_properties; XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s', " "content '%s', and content_type '%s'", @@ -214,13 +218,12 @@ void surf_storage_model_init_default(void) } StorageN11Model::StorageN11Model() : StorageModel() { - StorageN11ActionLmm action; + ActionPtr action = NULL; XBT_DEBUG("surf_storage_model_init_internal"); storage_running_action_set_that_does_not_need_being_checked = - xbt_swag_new(xbt_swag_offset(action, p_stateHookup)); - + xbt_swag_new(xbt_swag_offset(*action, p_stateHookup)); if (!p_maxminSystem) { p_maxminSystem = lmm_system_new(storage_selective_update); } @@ -232,7 +235,7 @@ StorageN11Model::~StorageN11Model(){ } StoragePtr StorageN11Model::createResource(const char* id, const char* type_id, - const char* content_name, const char* content_type, xbt_dict_t properties) + const char* content_name, const char* content_type, xbt_dict_t properties, const char* attach) { xbt_assert(!surf_storage_resource_priv(surf_storage_resource_by_name(id)), @@ -241,21 +244,20 @@ StoragePtr StorageN11Model::createResource(const char* id, const char* type_id, storage_type_t storage_type = (storage_type_t) xbt_lib_get_or_null(storage_type_lib, type_id,ROUTING_STORAGE_TYPE_LEVEL); - double Bread = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->properties, "Bread")); - double Bwrite = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->properties, "Bwrite")); - double Bconnection = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->properties, "Bconnection")); + double Bread = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bread")); + double Bwrite = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bwrite")); + double Bconnection = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bconnection")); - StoragePtr storage = new StorageN11Lmm(this, id, properties, p_maxminSystem, + StoragePtr storage = new StorageN11(this, id, properties, p_maxminSystem, Bread, Bwrite, Bconnection, - type_id, (char *)content_name, xbt_strdup(content_type), storage_type->size); + type_id, (char *)content_name, xbt_strdup(content_type), storage_type->size, (char *) attach); xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, static_cast(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 '%f'\n", + XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tproperties '%p'\n\t\tBread '%f'\n", id, - this, type_id, - storage_type->properties, + properties, Bread); if(!p_storageList) @@ -271,9 +273,9 @@ double StorageN11Model::shareResources(double now) unsigned int i, j; StoragePtr storage; void *_write_action; - StorageActionLmmPtr write_action; + StorageActionPtr write_action; - double min_completion = shareResourcesMaxMin(p_runningActionSet, + double min_completion = shareResourcesMaxMin(getRunningActionSet(), p_maxminSystem, lmm_solve); double rate; @@ -284,8 +286,8 @@ double StorageN11Model::shareResources(double now) // Foreach write action on disk xbt_dynar_foreach(storage->p_writeActions, j, _write_action) { - write_action = dynamic_cast(static_cast(_write_action)); - rate += lmm_variable_getvalue(write_action->p_variable); + write_action = static_cast(_write_action); + rate += lmm_variable_getvalue(write_action->getVariable()); } if(rate > 0) min_completion = MIN(min_completion, (storage->m_size-storage->m_usedSize)/rate); @@ -296,55 +298,54 @@ double StorageN11Model::shareResources(double now) void StorageN11Model::updateActionsState(double /*now*/, double delta) { - void *_action, *_next_action; - StorageActionLmmPtr action = NULL; + StorageActionPtr action = NULL; - xbt_swag_foreach_safe(_action, _next_action, p_runningActionSet) { - action = dynamic_cast(static_cast(_action)); + ActionListPtr actionSet = getRunningActionSet(); + for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end()) + ; it != itend ; it=itNext) { + ++itNext; + action = static_cast(&*it); if(action->m_type == WRITE) { // Update the disk usage // Update the file size // For each action of type write - double rate = lmm_variable_getvalue(action->p_variable); + double rate = lmm_variable_getvalue(action->getVariable()); /* Hack to avoid rounding differences between x86 and x86_64 * (note that the next sizes are of type sg_size_t). */ long incr = delta * rate + MAXMIN_PRECISION; - action->p_storage->m_usedSize += (incr - action->p_file->size); // disk usage - action->p_file->size = incr; // file size + action->p_storage->m_usedSize += incr; // disk usage + action->p_file->size += incr; // file size sg_size_t *psize = xbt_new(sg_size_t,1); *psize = action->p_file->size; - xbt_dict_t content_dict = action->p_storage->p_content; xbt_dict_set(content_dict, action->p_file->name, psize, NULL); } - double_update(&action->m_remains, - lmm_variable_getvalue(action->p_variable) * delta); + action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); - if (action->m_maxDuration != NO_MAX_DURATION) - double_update(&action->m_maxDuration, delta); + if (action->getMaxDuration() != NO_MAX_DURATION) + action->updateMaxDuration(delta); - if(action->m_remains > 0 && - lmm_get_variable_weight(action->p_variable) > 0 && + if(action->getRemainsNoUpdate() > 0 && + lmm_get_variable_weight(action->getVariable()) > 0 && action->p_storage->m_usedSize == action->p_storage->m_size) { - action->m_finish = surf_get_clock(); + action->finish(); action->setState(SURF_ACTION_FAILED); - } else if ((action->m_remains <= 0) && - (lmm_get_variable_weight(action->p_variable) > 0)) + } else if ((action->getRemainsNoUpdate() <= 0) && + (lmm_get_variable_weight(action->getVariable()) > 0)) { - action->m_finish = surf_get_clock(); + action->finish(); action->setState(SURF_ACTION_DONE); - } else if ((action->m_maxDuration != NO_MAX_DURATION) && - (action->m_maxDuration <= 0)) + } else if ((action->getMaxDuration() != NO_MAX_DURATION) && + (action->getMaxDuration() <= 0)) { - action->m_finish = surf_get_clock(); + action->finish(); action->setState(SURF_ACTION_DONE); } } - return; } @@ -352,29 +353,17 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) * Resource * ************/ -StorageN11Lmm::StorageN11Lmm(StorageModelPtr model, const char* name, xbt_dict_t properties, +StorageN11::StorageN11(StorageModelPtr model, const char* name, xbt_dict_t properties, lmm_system_t maxminSystem, double bread, double bwrite, double bconnection, - const char* type_id, char *content_name, char *content_type, sg_size_t size) - : Resource(model, name, properties), - StorageLmm(maxminSystem, bread, bwrite, bconnection, type_id, content_name, content_type, size) { + const char* type_id, char *content_name, char *content_type, sg_size_t size, char *attach) + : Storage(model, name, properties, + maxminSystem, bread, bwrite, bconnection, type_id, content_name, content_type, size, attach) { XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size); - - p_stateCurrent = SURF_RESOURCE_ON; - m_usedSize = 0; - m_size = 0; - - p_content = parseContent(content_name); - p_contentType = content_type; - p_constraint = lmm_constraint_new(maxminSystem, this, bconnection); - p_constraintRead = lmm_constraint_new(maxminSystem, this, bread); - p_constraintWrite = lmm_constraint_new(maxminSystem, this, bwrite); - m_size = size; - p_typeId = xbt_strdup(type_id); } -StorageActionPtr StorageN11Lmm::ls(const char* path) +StorageActionPtr StorageN11::ls(const char* path) { - StorageActionLmmPtr action = new StorageN11ActionLmm(p_model, 0, p_stateCurrent != SURF_RESOURCE_ON, this, LS); + StorageActionPtr action = new StorageN11Action(getModel(), 0, getState() != SURF_RESOURCE_ON, this, LS); action->p_lsDict = NULL; xbt_dict_t ls_dict = xbt_dict_new_homogeneous(xbt_free); @@ -417,9 +406,10 @@ StorageActionPtr StorageN11Lmm::ls(const char* path) return action; } -StorageActionPtr StorageN11Lmm::open(const char* mount, const char* path) +StorageActionPtr StorageN11::open(char* mount, char* path) { XBT_DEBUG("\tOpen file '%s'",path); + sg_size_t size, *psize; psize = (sg_size_t*) xbt_dict_get_or_null(p_content, path); // if file does not exist create an empty file @@ -438,21 +428,24 @@ StorageActionPtr StorageN11Lmm::open(const char* mount, const char* path) file->mount = xbt_strdup(mount); file->current_position = 0; - StorageActionLmmPtr action = new StorageN11ActionLmm(p_model, 0, p_stateCurrent != SURF_RESOURCE_ON, this, OPEN); + StorageActionPtr action = new StorageN11Action(getModel(), 0, getState() != SURF_RESOURCE_ON, this, OPEN); action->p_file = file; + free(path); + free(mount); + return action; } -StorageActionPtr StorageN11Lmm::close(surf_file_t fd) +StorageActionPtr StorageN11::close(surf_file_t fd) { char *filename = fd->name; XBT_DEBUG("\tClose file '%s' size '%llu'", filename, fd->size); // unref write actions from storage void *_write_action; - StorageActionLmmPtr write_action; + StorageActionPtr write_action; unsigned int i; xbt_dynar_foreach(p_writeActions, i, _write_action) { - write_action = dynamic_cast(static_cast(_write_action)); + write_action = static_cast(static_cast(_write_action)); if ((write_action->p_file) == fd) { xbt_dynar_cursor_rm(p_writeActions, &i); write_action->unref(); @@ -461,11 +454,11 @@ StorageActionPtr StorageN11Lmm::close(surf_file_t fd) free(fd->name); free(fd->mount); xbt_free(fd); - StorageActionLmmPtr action = new StorageN11ActionLmm(p_model, 0, p_stateCurrent != SURF_RESOURCE_ON, this, CLOSE); + StorageActionPtr action = new StorageN11Action(getModel(), 0, getState() != SURF_RESOURCE_ON, this, CLOSE); return action; } -StorageActionPtr StorageN11Lmm::read(surf_file_t fd, sg_size_t size) +StorageActionPtr StorageN11::read(surf_file_t fd, sg_size_t size) { if(size > fd->size){ size = fd->size; @@ -474,16 +467,16 @@ StorageActionPtr StorageN11Lmm::read(surf_file_t fd, sg_size_t size) else fd->current_position += size; - StorageActionLmmPtr action = new StorageN11ActionLmm(p_model, size, p_stateCurrent != SURF_RESOURCE_ON, this, READ); + StorageActionPtr action = new StorageN11Action(getModel(), size, getState() != SURF_RESOURCE_ON, this, READ); return action; } -StorageActionPtr StorageN11Lmm::write(surf_file_t fd, sg_size_t size) +StorageActionPtr StorageN11::write(surf_file_t fd, sg_size_t size) { char *filename = fd->name; XBT_DEBUG("\tWrite file '%s' size '%llu/%llu'",filename,size,fd->size); - StorageActionLmmPtr action = new StorageN11ActionLmm(p_model, size, p_stateCurrent != SURF_RESOURCE_ON, this, WRITE); + StorageActionPtr action = new StorageN11Action(getModel(), size, getState() != SURF_RESOURCE_ON, this, WRITE); action->p_file = fd; fd->current_position += size; // If the storage is full @@ -493,7 +486,7 @@ StorageActionPtr StorageN11Lmm::write(surf_file_t fd, sg_size_t size) return action; } -void StorageN11Lmm::rename(const char *src, const char *dest) +void StorageN11::rename(const char *src, const char *dest) { sg_size_t *psize, *new_psize; psize = (sg_size_t*) xbt_dict_get_or_null(p_content,src); @@ -508,38 +501,18 @@ void StorageN11Lmm::rename(const char *src, const char *dest) XBT_DEBUG("File %s doesn't exist",src); } -xbt_dict_t StorageN11Lmm::getContent() -{ - /* 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);*/ - - xbt_dict_t content_dict = xbt_dict_new_homogeneous(NULL); - xbt_dict_cursor_t cursor = NULL; - char *file; - sg_size_t *psize; - - xbt_dict_foreach(p_content, cursor, file, psize){ - xbt_dict_set(content_dict,file,psize,NULL); - } - return content_dict; -} - -sg_size_t StorageN11Lmm::getSize(){ - return m_size; -} - /********** * Action * **********/ -StorageN11ActionLmm::StorageN11ActionLmm(ModelPtr model, double cost, bool failed, StorageLmmPtr storage, e_surf_action_storage_type_t type) - : Action(model, cost, failed), - StorageActionLmm(storage, type) { - XBT_IN("(%s,%g", storage->m_name, cost); - p_variable = lmm_variable_new(p_model->p_maxminSystem, this, 1.0, -1.0 , 3); +StorageN11Action::StorageN11Action(ModelPtr model, double cost, bool failed, StoragePtr storage, e_surf_action_storage_type_t type) + : StorageAction(model, cost, failed, + lmm_variable_new(model->getMaxminSystem(), this, 1.0, -1.0 , 3), + storage, type) { + XBT_IN("(%s,%g", storage->getName(), cost); // Must be less than the max bandwidth for all actions - lmm_expand(p_model->p_maxminSystem, storage->p_constraint, p_variable, 1.0); + lmm_expand(model->getMaxminSystem(), storage->getConstraint(), getVariable(), 1.0); switch(type) { case OPEN: case CLOSE: @@ -547,12 +520,12 @@ StorageN11ActionLmm::StorageN11ActionLmm(ModelPtr model, double cost, bool faile case LS: break; case READ: - lmm_expand(p_model->p_maxminSystem, storage->p_constraintRead, - p_variable, 1.0); + lmm_expand(model->getMaxminSystem(), storage->p_constraintRead, + getVariable(), 1.0); break; case WRITE: - lmm_expand(p_model->p_maxminSystem, storage->p_constraintWrite, - p_variable, 1.0); + lmm_expand(model->getMaxminSystem(), storage->p_constraintWrite, + getVariable(), 1.0); ActionPtr action = this; xbt_dynar_push(storage->p_writeActions, &action); ref(); @@ -561,15 +534,16 @@ StorageN11ActionLmm::StorageN11ActionLmm(ModelPtr model, double cost, bool faile XBT_OUT(); } -int StorageN11ActionLmm::unref() +int StorageN11Action::unref() { m_refcount--; if (!m_refcount) { - xbt_swag_remove(static_cast(this), p_stateSet); - if (p_variable) - lmm_variable_free(p_model->p_maxminSystem, p_variable); + if (actionHook::is_linked()) + p_stateSet->erase(p_stateSet->iterator_to(*this)); + if (getVariable()) + lmm_variable_free(getModel()->getMaxminSystem(), getVariable()); #ifdef HAVE_TRACING - xbt_free(p_category); + xbt_free(getCategory()); #endif delete this; return 1; @@ -577,40 +551,40 @@ int StorageN11ActionLmm::unref() return 0; } -void StorageN11ActionLmm::cancel() +void StorageN11Action::cancel() { setState(SURF_ACTION_FAILED); return; } -void StorageN11ActionLmm::suspend() +void StorageN11Action::suspend() { XBT_IN("(%p)", this); if (m_suspended != 2) { - lmm_update_variable_weight(p_model->p_maxminSystem, - p_variable, + lmm_update_variable_weight(getModel()->getMaxminSystem(), + getVariable(), 0.0); m_suspended = 1; } XBT_OUT(); } -void StorageN11ActionLmm::resume() +void StorageN11Action::resume() { THROW_UNIMPLEMENTED; } -bool StorageN11ActionLmm::isSuspended() +bool StorageN11Action::isSuspended() { return m_suspended == 1; } -void StorageN11ActionLmm::setMaxDuration(double /*duration*/) +void StorageN11Action::setMaxDuration(double /*duration*/) { THROW_UNIMPLEMENTED; } -void StorageN11ActionLmm::setPriority(double /*priority*/) +void StorageN11Action::setPriority(double /*priority*/) { THROW_UNIMPLEMENTED; }