X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0342cac8cbf7d74cf6efa11b33abd8cb6d87cc3c..e95d2dda61913a92ff3a9d1b7c368ba6e1443b30:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index 819b1f59f6..d2424193a7 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -1,29 +1,32 @@ -/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2018. 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 "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/s4u/Engine.hpp" -#include "src/kernel/routing/NetPoint.hpp" -#include /*ceil*/ +#include "simgrid/s4u/Host.hpp" +#include "src/kernel/lmm/maxmin.hpp" +#include "xbt/utility.hpp" +#include /*ceil*/ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage); /************* * CallBacks * *************/ -extern std::map storage_types; +extern std::map storage_types; static void check_disk_attachment() { - for (auto s : *simgrid::surf::StorageImpl::storagesMap()) { - simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s.second->attach_.c_str()); + for (auto const& s : simgrid::s4u::Engine::getInstance()->getAllStorages()) { + simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s->getImpl()->getHost().c_str()); if (not host_elm) - surf_parse_error("Unable to attach storage %s: host %s does not exist.", s.second->cname(), - s.second->attach_.c_str()); + surf_parse_error(std::string("Unable to attach storage ") + s->getCname() + ": host " + + s->getImpl()->getHost().c_str() + " does not exist."); else - s.second->piface_.attached_to_ = sg_host_by_name(s.second->attach_.c_str()); + s->attached_to_ = sg_host_by_name(s->getImpl()->getHost().c_str()); } } @@ -46,23 +49,22 @@ void surf_storage_model_init_default() namespace simgrid { namespace surf { -StorageImpl* StorageN11Model::createStorage(const char* id, const char* type_id, const char* content_name, - const char* attach) +StorageImpl* StorageN11Model::createStorage(std::string id, std::string type_id, std::string content_name, + std::string attach) { - storage_type_t storage_type = storage_types.at(type_id); + StorageType* storage_type = storage_types.at(type_id); - double Bread = - surf_parse_get_bandwidth(storage_type->model_properties->at("Bread").c_str(), "property Bread, storage", type_id); + double Bread = surf_parse_get_bandwidth(storage_type->model_properties->at("Bread").c_str(), + "property Bread, storage", type_id.c_str()); double Bwrite = surf_parse_get_bandwidth(storage_type->model_properties->at("Bwrite").c_str(), - "property Bwrite, storage", type_id); + "property Bwrite, storage", type_id.c_str()); - StorageImpl* storage = new StorageN11(this, id, maxminSystem_, Bread, Bwrite, type_id, (char*)content_name, - storage_type->size, (char*)attach); + StorageImpl* storage = + new StorageN11(this, id, maxminSystem_, Bread, Bwrite, type_id, content_name, storage_type->size, attach); storageCreatedCallbacks(storage); - XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tBread '%f'\n", id, type_id, Bread); - - p_storageList.push_back(storage); + XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tBread '%f'\n", id.c_str(), type_id.c_str(), + Bread); return storage; } @@ -74,53 +76,17 @@ double StorageN11Model::nextOccuringEvent(double now) void StorageN11Model::updateActionsState(double /*now*/, double delta) { + for (auto it = std::begin(*getRunningActionSet()); it != std::end(*getRunningActionSet());) { + StorageAction& action = static_cast(*it); + ++it; // increment iterator here since the following calls to action.finish() may invalidate it + action.updateRemains(lrint(action.getVariable()->get_value() * delta)); - ActionList *actionSet = getRunningActionSet(); - for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end()) - ; it != itend ; it=itNext) { - ++itNext; - - StorageAction *action = static_cast(&*it); - - if (action->type_ == WRITE) { - // Update the disk usage - // Update the file size - // For each action of type write - 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->file_->cname(), 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) - incr++; - - action->progress_ += current_progress; - - action->storage_->usedSize_ += incr; // disk usage - action->file_->incrPosition(incr); // current_position - // which becomes the new file size - action->file_->setSize(action->file_->tell()); - - action->storage_->content_->erase(action->file_->cname()); - action->storage_->content_->insert({action->file_->cname(), action->file_->size()}); - } - - action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); - - if (action->getMaxDuration() > NO_MAX_DURATION) - action->updateMaxDuration(delta); + if (action.getMaxDuration() > NO_MAX_DURATION) + action.updateMaxDuration(delta); - if (action->getRemainsNoUpdate() > 0 && lmm_get_variable_weight(action->getVariable()) > 0 && - action->storage_->usedSize_ == action->storage_->size_) { - action->finish(); - 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(Action::State::done); + if (((action.getRemainsNoUpdate() <= 0) && (action.getVariable()->get_weight() > 0)) || + ((action.getMaxDuration() > NO_MAX_DURATION) && (action.getMaxDuration() <= 0))) { + action.finish(kernel::resource::Action::State::done); } } } @@ -129,8 +95,8 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) * Resource * ************/ -StorageN11::StorageN11(StorageModel* model, const char* name, lmm_system_t maxminSystem, double bread, double bwrite, - const char* type_id, char* content_name, sg_size_t size, char* attach) +StorageN11::StorageN11(StorageModel* model, std::string name, lmm_system_t maxminSystem, double bread, double bwrite, + std::string type_id, std::string content_name, sg_size_t size, std::string attach) : StorageImpl(model, name, maxminSystem, bread, bwrite, type_id, content_name, size, attach) { XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size); @@ -151,20 +117,20 @@ StorageAction* StorageN11::write(sg_size_t size) * Action * **********/ -StorageN11Action::StorageN11Action(Model* model, double cost, bool failed, StorageImpl* storage, +StorageN11Action::StorageN11Action(kernel::resource::Model* model, double cost, bool failed, StorageImpl* 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) + : StorageAction(model, cost, failed, model->getMaxminSystem()->variable_new(this, 1.0, -1.0, 3), storage, type) { - XBT_IN("(%s,%g", storage->cname(), cost); + XBT_IN("(%s,%g", storage->getCname(), cost); // Must be less than the max bandwidth for all actions - lmm_expand(model->getMaxminSystem(), storage->constraint(), getVariable(), 1.0); + model->getMaxminSystem()->expand(storage->constraint(), getVariable(), 1.0); switch(type) { case READ: - lmm_expand(model->getMaxminSystem(), storage->constraintRead_, getVariable(), 1.0); + model->getMaxminSystem()->expand(storage->constraintRead_, getVariable(), 1.0); break; case WRITE: - lmm_expand(model->getMaxminSystem(), storage->constraintWrite_, getVariable(), 1.0); + model->getMaxminSystem()->expand(storage->constraintWrite_, getVariable(), 1.0); break; default: THROW_UNIMPLEMENTED; @@ -176,10 +142,10 @@ int StorageN11Action::unref() { refcount_--; if (not refcount_) { - if (action_hook.is_linked()) - stateSet_->erase(stateSet_->iterator_to(*this)); + if (stateSetHook_.is_linked()) + simgrid::xbt::intrusive_erase(*stateSet_, *this); if (getVariable()) - lmm_variable_free(getModel()->getMaxminSystem(), getVariable()); + getModel()->getMaxminSystem()->variable_free(getVariable()); xbt_free(getCategory()); delete this; return 1; @@ -195,9 +161,9 @@ void StorageN11Action::cancel() void StorageN11Action::suspend() { XBT_IN("(%p)", this); - if (suspended_ != 2) { - lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0); - suspended_ = 1; + if (suspended_ != Action::SuspendStates::sleeping) { + getModel()->getMaxminSystem()->update_variable_weight(getVariable(), 0.0); + suspended_ = Action::SuspendStates::suspended; } XBT_OUT(); } @@ -209,7 +175,7 @@ void StorageN11Action::resume() bool StorageN11Action::isSuspended() { - return suspended_ == 1; + return suspended_ == Action::SuspendStates::suspended; } void StorageN11Action::setMaxDuration(double /*duration*/)