X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index f016c1e5aa..c9bcc38cb4 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -1,13 +1,14 @@ -/* 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 "surf/maxmin.hpp" -#include /*ceil*/ +#include "src/kernel/lmm/maxmin.hpp" +#include "src/surf/xml/platf.hpp" +#include "surf/surf.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage); @@ -16,24 +17,18 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage); *************/ extern std::map storage_types; -static void check_disk_attachment() +void check_disk_attachment() { - for (auto const& s : *simgrid::surf::StorageImpl::storagesMap()) { - simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s.second->getHost().c_str()); + for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages()) { + simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s->getImpl()->getHost().c_str()); if (not host_elm) - surf_parse_error(std::string("Unable to attach storage ") + s.second->getCname() + ": host " + - s.second->getHost() + " does not exist."); + surf_parse_error(std::string("Unable to attach storage ") + s->get_cname() + ": host " + + s->getImpl()->getHost().c_str() + " does not exist."); else - s.second->piface_.attached_to_ = sg_host_by_name(s.second->getHost().c_str()); + s->attached_to_ = sg_host_by_name(s->getImpl()->getHost().c_str()); } } -void storage_register_callbacks() -{ - simgrid::s4u::onPlatformCreated.connect(check_disk_attachment); - instr_routing_define_callbacks(); -} - /********* * Model * *********/ @@ -58,35 +53,32 @@ StorageImpl* StorageN11Model::createStorage(std::string id, std::string type_id, "property Bwrite, storage", type_id.c_str()); StorageImpl* storage = - new StorageN11(this, id, maxminSystem_, Bread, Bwrite, type_id, content_name, storage_type->size, attach); - storageCreatedCallbacks(storage); + new StorageN11(this, id, get_maxmin_system(), Bread, Bwrite, type_id, content_name, storage_type->size, attach); 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); - p_storageList.push_back(storage); - return storage; } -double StorageN11Model::nextOccuringEvent(double now) +double StorageN11Model::next_occuring_event(double now) { - return StorageModel::nextOccuringEventFull(now); + return StorageModel::next_occuring_event_full(now); } -void StorageN11Model::updateActionsState(double /*now*/, double delta) +void StorageN11Model::update_actions_state(double /*now*/, double delta) { - for (auto it = std::begin(*getRunningActionSet()); it != std::end(*getRunningActionSet());) { + for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) { 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)); + action.update_remains(lrint(action.get_variable()->get_value() * delta)); - if (action.getMaxDuration() > NO_MAX_DURATION) - action.updateMaxDuration(delta); + if (action.get_max_duration() > NO_MAX_DURATION) + action.update_max_duration(delta); - if (((action.getRemainsNoUpdate() <= 0) && (action.getVariable()->get_weight() > 0)) || - ((action.getMaxDuration() > NO_MAX_DURATION) && (action.getMaxDuration() <= 0))) { - action.finish(Action::State::done); + if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_weight() > 0)) || + ((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { + action.finish(kernel::resource::Action::State::FINISHED); } } } @@ -95,42 +87,42 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) * Resource * ************/ -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) +StorageN11::StorageN11(StorageModel* model, std::string name, kernel::lmm::System* 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); - simgrid::s4u::Storage::onCreation(this->piface_); + simgrid::s4u::Storage::on_creation(this->piface_); } StorageAction* StorageN11::read(sg_size_t size) { - return new StorageN11Action(model(), size, isOff(), this, READ); + return new StorageN11Action(get_model(), size, is_off(), this, READ); } StorageAction* StorageN11::write(sg_size_t size) { - return new StorageN11Action(model(), size, isOff(), this, WRITE); + return new StorageN11Action(get_model(), size, is_off(), this, WRITE); } /********** * 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, model->getMaxminSystem()->variable_new(this, 1.0, -1.0, 3), storage, type) + : StorageAction(model, cost, failed, model->get_maxmin_system()->variable_new(this, 1.0, -1.0, 3), storage, type) { - XBT_IN("(%s,%g", storage->getCname(), cost); + XBT_IN("(%s,%g", storage->get_cname(), cost); // Must be less than the max bandwidth for all actions - model->getMaxminSystem()->expand(storage->constraint(), getVariable(), 1.0); + model->get_maxmin_system()->expand(storage->get_constraint(), get_variable(), 1.0); switch(type) { case READ: - model->getMaxminSystem()->expand(storage->constraintRead_, getVariable(), 1.0); + model->get_maxmin_system()->expand(storage->constraintRead_, get_variable(), 1.0); break; case WRITE: - model->getMaxminSystem()->expand(storage->constraintWrite_, getVariable(), 1.0); + model->get_maxmin_system()->expand(storage->constraintWrite_, get_variable(), 1.0); break; default: THROW_UNIMPLEMENTED; @@ -138,32 +130,17 @@ StorageN11Action::StorageN11Action(Model* model, double cost, bool failed, Stora XBT_OUT(); } -int StorageN11Action::unref() -{ - refcount_--; - if (not refcount_) { - if (action_hook.is_linked()) - stateSet_->erase(stateSet_->iterator_to(*this)); - if (getVariable()) - getModel()->getMaxminSystem()->variable_free(getVariable()); - xbt_free(getCategory()); - delete this; - return 1; - } - return 0; -} - void StorageN11Action::cancel() { - setState(Action::State::failed); + set_state(Action::State::FAILED); } void StorageN11Action::suspend() { XBT_IN("(%p)", this); - if (suspended_ != 2) { - getModel()->getMaxminSystem()->update_variable_weight(getVariable(), 0.0); - suspended_ = 1; + if (suspended_ != Action::SuspendStates::sleeping) { + get_model()->get_maxmin_system()->update_variable_weight(get_variable(), 0.0); + suspended_ = Action::SuspendStates::suspended; } XBT_OUT(); } @@ -173,20 +150,18 @@ void StorageN11Action::resume() THROW_UNIMPLEMENTED; } -bool StorageN11Action::isSuspended() +void StorageN11Action::set_max_duration(double /*duration*/) { - return suspended_ == 1; + THROW_UNIMPLEMENTED; } -void StorageN11Action::setMaxDuration(double /*duration*/) +void StorageN11Action::set_priority(double /*priority*/) { THROW_UNIMPLEMENTED; } - -void StorageN11Action::setSharingWeight(double /*priority*/) +void StorageN11Action::update_remains_lazy(double /*now*/) { - THROW_UNIMPLEMENTED; + THROW_IMPOSSIBLE; } - } }