X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a59892e02855ae21ccf6abd4925d962f81b384b2..35e51746af39c4061a0336771f8f31bb371fae23:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index e64788558e..eb203e53b6 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -5,12 +5,12 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "storage_n11.hpp" +#include "simgrid/s4u/engine.hpp" +#include "src/kernel/routing/NetPoint.hpp" #include "surf_private.h" #include /*ceil*/ -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage); -static int storage_selective_update = 0; -static xbt_swag_t storage_running_action_set_that_does_not_need_being_checked = NULL; +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage); /************* * CallBacks * @@ -28,67 +28,60 @@ static inline void routing_storage_type_free(void *r) free(stype); } -static inline void surf_storage_resource_free(void *r) -{ - // specific to storage - simgrid::surf::Storage *storage = static_cast(r); - // generic resource - delete storage; -} - static inline void routing_storage_host_free(void *r) { xbt_dynar_t dyn = (xbt_dynar_t) r; xbt_dynar_free(&dyn); } +static void check_disk_attachment() +{ + xbt_lib_cursor_t cursor; + char* key; + void** data; + xbt_lib_foreach(storage_lib, cursor, key, data) { + if (xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) { + simgrid::surf::Storage* storage = + static_cast(xbt_lib_get_or_null(storage_lib, key, SURF_STORAGE_LEVEL)); + simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(storage->attach_); + if (!host_elm) + surf_parse_error("Unable to attach storage %s: host %s does not exist.", storage->cname(), storage->attach_); + } + } +} + void storage_register_callbacks() { + simgrid::s4u::onPlatformCreated.connect(check_disk_attachment); + instr_routing_define_callbacks(); + ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, xbt_free_f); 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); + SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, [](void *self) { + delete static_cast(self); + }); } /********* * Model * *********/ -void surf_storage_model_init_default(void) +void surf_storage_model_init_default() { surf_storage_model = new simgrid::surf::StorageN11Model(); - xbt_dynar_push(all_existing_models, &surf_storage_model); + all_existing_models->push_back(surf_storage_model); } namespace simgrid { namespace surf { -StorageN11Model::StorageN11Model() : StorageModel() { - Action *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)); - if (!maxminSystem_) { - maxminSystem_ = lmm_system_new(storage_selective_update); - } -} - -StorageN11Model::~StorageN11Model(){ - xbt_swag_free(storage_running_action_set_that_does_not_need_being_checked); - storage_running_action_set_that_does_not_need_being_checked = NULL; -} - -#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area -Storage *StorageN11Model::createStorage(const char* id, const char* type_id, - const char* content_name, const char* content_type, xbt_dict_t properties, - const char* attach) +Storage* StorageN11Model::createStorage(const char* id, const char* type_id, const char* content_name, + const char* content_type, const char* attach) { xbt_assert(!surf_storage_resource_priv(surf_storage_resource_by_name(id)), - "Storage '%s' declared several times in the platform file", - id); + "Storage '%s' declared several times in the platform file", id); storage_type_t storage_type = (storage_type_t) xbt_lib_get_or_null(storage_type_lib, type_id,ROUTING_STORAGE_TYPE_LEVEL); @@ -99,49 +92,30 @@ Storage *StorageN11Model::createStorage(const char* id, const char* type_id, double Bconnection = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bconnection"), "property Bconnection, storage",type_id); - Storage *storage = new StorageN11(this, id, properties, maxminSystem_, - Bread, Bwrite, Bconnection, type_id, (char *)content_name, - xbt_strdup(content_type), storage_type->size, (char *) attach); + Storage* storage = new StorageN11(this, id, maxminSystem_, Bread, Bwrite, Bconnection, type_id, (char*)content_name, + content_type, storage_type->size, (char*)attach); storageCreatedCallbacks(storage); 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\tproperties '%p'\n\t\tBread '%f'\n", - id, - type_id, - properties, - Bread); + XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tBread '%f'\n", id, type_id, Bread); - if(!p_storageList) - p_storageList = xbt_dynar_new(sizeof(char *),NULL); - xbt_dynar_push(p_storageList, &storage); + p_storageList.push_back(storage); return storage; } -double StorageN11Model::next_occuring_event(double /*now*/) +double StorageN11Model::nextOccuringEvent(double now) { - XBT_DEBUG("storage_share_resources"); - unsigned int i, j; - Storage *storage; - void *_write_action; - StorageAction *write_action; - - double min_completion = shareResourcesMaxMin(getRunningActionSet(), - maxminSystem_, lmm_solve); - - double rate; - // Foreach disk - xbt_dynar_foreach(p_storageList,i,storage) - { - rate = 0; - // Foreach write action on disk - xbt_dynar_foreach(storage->p_writeActions, j, _write_action) - { - write_action = static_cast(_write_action); + double min_completion = StorageModel::nextOccuringEventFull(now); + + for(auto storage: p_storageList) { + double rate = 0; + // Foreach write action on that disk + for (auto write_action: storage->writeActions_) { rate += lmm_variable_getvalue(write_action->getVariable()); } if(rate > 0) - min_completion = MIN(min_completion, (storage->m_size-storage->m_usedSize)/rate); + min_completion = MIN(min_completion, (storage->size_-storage->usedSize_)/rate); } return min_completion; @@ -149,84 +123,68 @@ double StorageN11Model::next_occuring_event(double /*now*/) void StorageN11Model::updateActionsState(double /*now*/, double delta) { - StorageAction *action = NULL; ActionList *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) - { + StorageAction *action = static_cast(&*it); + + if (action->type_ == WRITE) { // Update the disk usage // Update the file size // For each action of type write - volatile double current_progress = - delta * lmm_variable_getvalue(action->getVariable()); + double current_progress = delta * lmm_variable_getvalue(action->getVariable()); long int incr = current_progress; - XBT_DEBUG("%s:\n\t progress = %.2f, current_progress = %.2f, " - "incr = %ld, lrint(1) = %ld, lrint(2) = %ld", - action->p_file->name, - action->progress, current_progress, incr, - lrint(action->progress + current_progress), - lrint(action->progress)+ incr); + XBT_DEBUG("%s:\n\t progress = %.2f, current_progress = %.2f, incr = %ld, lrint(1) = %ld, lrint(2) = %ld", + action->file_->name, action->progress_, current_progress, incr, + lrint(action->progress_ + current_progress), lrint(action->progress_) + incr); /* take care of rounding error accumulation */ - if (lrint(action->progress + current_progress) > - lrint(action->progress)+ incr) + if (lrint(action->progress_ + current_progress) > lrint(action->progress_) + incr) incr++; - action->progress +=current_progress; + action->progress_ += current_progress; - action->p_storage->m_usedSize += incr; // disk usage - action->p_file->current_position+= incr; // current_position + action->storage_->usedSize_ += incr; // disk usage + action->file_->current_position += incr; // current_position // which becomes the new file size - action->p_file->size = action->p_file->current_position ; + action->file_->size = action->file_->current_position; 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); + *psize = action->file_->size; + xbt_dict_t content_dict = action->storage_->content_; + xbt_dict_set(content_dict, action->file_->name, psize, nullptr); } action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); - if (action->getMaxDuration() != NO_MAX_DURATION) + if (action->getMaxDuration() > NO_MAX_DURATION) action->updateMaxDuration(delta); - if(action->getRemainsNoUpdate() > 0 && - lmm_get_variable_weight(action->getVariable()) > 0 && - action->p_storage->m_usedSize == action->p_storage->m_size) - { - action->finish(); - action->setState(SURF_ACTION_FAILED); - } else if ((action->getRemainsNoUpdate() <= 0) && - (lmm_get_variable_weight(action->getVariable()) > 0)) - { + if (action->getRemainsNoUpdate() > 0 && lmm_get_variable_weight(action->getVariable()) > 0 && + action->storage_->usedSize_ == action->storage_->size_) { action->finish(); - action->setState(SURF_ACTION_DONE); - } else if ((action->getMaxDuration() != NO_MAX_DURATION) && - (action->getMaxDuration() <= 0)) - { + action->setState(Action::State::failed); + } else if (((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) || + ((action->getMaxDuration() > NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) { action->finish(); - action->setState(SURF_ACTION_DONE); + action->setState(Action::State::done); } } - return; } /************ * Resource * ************/ -StorageN11::StorageN11(StorageModel *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, char *attach) -: Storage(model, name, properties, - maxminSystem, bread, bwrite, bconnection, type_id, content_name, content_type, size, attach) { +StorageN11::StorageN11(StorageModel* model, const char* name, lmm_system_t maxminSystem, double bread, double bwrite, + double bconnection, const char* type_id, char* content_name, const char* content_type, + sg_size_t size, char* attach) + : Storage(model, name, 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); } @@ -234,8 +192,8 @@ StorageAction *StorageN11::open(const char* mount, const 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); + sg_size_t size; + sg_size_t* psize = (sg_size_t*)xbt_dict_get_or_null(content_, path); // if file does not exist create an empty file if(psize) size = *psize; @@ -243,7 +201,7 @@ StorageAction *StorageN11::open(const char* mount, const char* path) psize = xbt_new(sg_size_t,1); size = 0; *psize = size; - xbt_dict_set(p_content, path, psize, NULL); + xbt_dict_set(content_, path, psize, nullptr); XBT_DEBUG("File '%s' was not found, file created.",path); } surf_file_t file = xbt_new0(s_surf_file_t,1); @@ -252,31 +210,29 @@ StorageAction *StorageN11::open(const char* mount, const char* path) file->mount = xbt_strdup(mount); file->current_position = 0; - StorageAction *action = new StorageN11Action(getModel(), 0, isOff(), this, OPEN); - action->p_file = file; + StorageAction* action = new StorageN11Action(model(), 0, isOff(), this, OPEN); + action->file_ = file; return action; } StorageAction *StorageN11::close(surf_file_t fd) { - char *filename = fd->name; - XBT_DEBUG("\tClose file '%s' size '%llu'", filename, fd->size); + XBT_DEBUG("\tClose file '%s' size '%llu'", fd->name, fd->size); // unref write actions from storage - void *_write_action; - StorageAction *write_action; - unsigned int i; - xbt_dynar_foreach(p_writeActions, i, _write_action) { - write_action = static_cast(_write_action); - if ((write_action->p_file) == fd) { - xbt_dynar_cursor_rm(p_writeActions, &i); + for (std::vector::iterator it = writeActions_.begin(); it != writeActions_.end();) { + StorageAction *write_action = *it; + if ((write_action->file_) == fd) { write_action->unref(); + it = writeActions_.erase(it); + } else { + ++it; } } free(fd->name); free(fd->mount); xbt_free(fd); - StorageAction *action = new StorageN11Action(getModel(), 0, isOff(), this, CLOSE); + StorageAction* action = new StorageN11Action(model(), 0, isOff(), this, CLOSE); return action; } @@ -293,7 +249,7 @@ StorageAction *StorageN11::read(surf_file_t fd, sg_size_t size) else fd->current_position += size; - StorageAction *action = new StorageN11Action(getModel(), size, isOff(), this, READ); + StorageAction* action = new StorageN11Action(model(), size, isOff(), this, READ); return action; } @@ -302,14 +258,13 @@ StorageAction *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); - StorageAction *action = new StorageN11Action(getModel(), size, isOff(), this, WRITE); - action->p_file = fd; - /* Substract the part of the file that might disappear from the used sized on - * the storage element */ - m_usedSize -= (fd->size - fd->current_position); + StorageAction* action = new StorageN11Action(model(), size, isOff(), this, WRITE); + action->file_ = fd; + /* Substract the part of the file that might disappear from the used sized on the storage element */ + usedSize_ -= (fd->size - fd->current_position); // If the storage is full before even starting to write - if(m_usedSize==m_size) { - action->setState(SURF_ACTION_FAILED); + if(usedSize_==size_) { + action->setState(Action::State::failed); } return action; } @@ -322,38 +277,38 @@ StorageN11Action::StorageN11Action(Model *model, double cost, bool failed, Stora : StorageAction(model, cost, failed, lmm_variable_new(model->getMaxminSystem(), this, 1.0, -1.0 , 3), storage, type) { - XBT_IN("(%s,%g", storage->getName(), cost); + XBT_IN("(%s,%g", storage->cname(), cost); // Must be less than the max bandwidth for all actions - lmm_expand(model->getMaxminSystem(), storage->getConstraint(), getVariable(), 1.0); + lmm_expand(model->getMaxminSystem(), storage->constraint(), getVariable(), 1.0); switch(type) { case OPEN: case CLOSE: case STAT: break; case READ: - lmm_expand(model->getMaxminSystem(), storage->p_constraintRead, - getVariable(), 1.0); + lmm_expand(model->getMaxminSystem(), storage->constraintRead_, getVariable(), 1.0); break; case WRITE: - lmm_expand(model->getMaxminSystem(), storage->p_constraintWrite, - getVariable(), 1.0); + lmm_expand(model->getMaxminSystem(), storage->constraintWrite_, getVariable(), 1.0); //TODO there is something annoying with what's below. Have to sort it out... // Action *action = this; - // xbt_dynar_push(storage->p_writeActions, &action); + // storage->p_writeActions->push_back(action); // ref(); break; + default: + THROW_UNIMPLEMENTED; } XBT_OUT(); } int StorageN11Action::unref() { - m_refcount--; - if (!m_refcount) { + refcount_--; + if (!refcount_) { if (action_hook.is_linked()) - p_stateSet->erase(p_stateSet->iterator_to(*this)); + stateSet_->erase(stateSet_->iterator_to(*this)); if (getVariable()) lmm_variable_free(getModel()->getMaxminSystem(), getVariable()); xbt_free(getCategory()); @@ -365,16 +320,15 @@ int StorageN11Action::unref() void StorageN11Action::cancel() { - setState(SURF_ACTION_FAILED); - return; + setState(Action::State::failed); } void StorageN11Action::suspend() { XBT_IN("(%p)", this); - if (m_suspended != 2) { + if (suspended_ != 2) { lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0); - m_suspended = 1; + suspended_ = 1; } XBT_OUT(); } @@ -386,7 +340,7 @@ void StorageN11Action::resume() bool StorageN11Action::isSuspended() { - return m_suspended == 1; + return suspended_ == 1; } void StorageN11Action::setMaxDuration(double /*duration*/)