X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b88233071eaaef45c854e84a8c7b460ab5793b7d..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index 6a1f0db720..f5508833bd 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2019. 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. */ @@ -6,6 +6,7 @@ #include "storage_n11.hpp" #include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Host.hpp" #include "src/kernel/lmm/maxmin.hpp" #include "src/surf/xml/platf.hpp" #include "surf/surf.hpp" @@ -15,17 +16,18 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage); /************* * CallBacks * *************/ -extern std::map storage_types; +extern std::map storage_types; void check_disk_attachment() { 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->get_impl()->getHost().c_str()); + simgrid::kernel::routing::NetPoint* host_elm = + simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(s->get_impl()->getHost()); if (not host_elm) surf_parse_error(std::string("Unable to attach storage ") + s->get_cname() + ": host " + - s->get_impl()->getHost().c_str() + " does not exist."); + s->get_impl()->getHost() + " does not exist."); else - s->set_host(sg_host_by_name(s->get_impl()->getHost().c_str())); + s->set_host(simgrid::s4u::Host::by_name(s->get_impl()->getHost())); } } @@ -35,19 +37,20 @@ void check_disk_attachment() void surf_storage_model_init_default() { - surf_storage_model = new simgrid::surf::StorageN11Model(); + surf_storage_model = new simgrid::kernel::resource::StorageN11Model(); } namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { StorageN11Model::StorageN11Model() { all_existing_models.push_back(this); } -StorageImpl* StorageN11Model::createStorage(std::string id, std::string type_id, std::string content_name, - std::string attach) +StorageImpl* StorageN11Model::createStorage(const std::string& id, const std::string& type_id, + const std::string& content_name, const std::string& attach) { StorageType* storage_type = storage_types.at(type_id); @@ -56,13 +59,11 @@ StorageImpl* StorageN11Model::createStorage(std::string id, std::string type_id, double Bwrite = surf_parse_get_bandwidth(storage_type->model_properties->at("Bwrite").c_str(), "property Bwrite, storage", type_id.c_str()); - StorageImpl* 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); - return storage; + return new StorageN11(this, id, get_maxmin_system(), Bread, Bwrite, type_id, content_name, storage_type->size, + attach); } double StorageN11Model::next_occuring_event(double now) @@ -76,13 +77,11 @@ void StorageN11Model::update_actions_state(double /*now*/, double delta) StorageAction& action = static_cast(*it); ++it; // increment iterator here since the following calls to action.finish() may invalidate it action.update_remains(lrint(action.get_variable()->get_value() * delta)); - - if (action.get_max_duration() > NO_MAX_DURATION) - action.update_max_duration(delta); + action.update_max_duration(delta); 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); + ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { + action.finish(Action::State::FINISHED); } } } @@ -91,30 +90,35 @@ void StorageN11Model::update_actions_state(double /*now*/, double delta) * Resource * ************/ -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) +StorageN11::StorageN11(StorageModel* model, const std::string& name, lmm::System* maxminSystem, double bread, + double bwrite, const std::string& type_id, const std::string& content_name, sg_size_t size, + const 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::on_creation(this->piface_); + s4u::Storage::on_creation(this->piface_); +} + +StorageAction* StorageN11::io_start(sg_size_t size, s4u::Io::OpType type) +{ + return new StorageN11Action(get_model(), size, not is_on(), this, type); } StorageAction* StorageN11::read(sg_size_t size) { - return new StorageN11Action(get_model(), size, is_off(), this, READ); + return new StorageN11Action(get_model(), size, not is_on(), this, s4u::Io::OpType::READ); } StorageAction* StorageN11::write(sg_size_t size) { - return new StorageN11Action(get_model(), size, is_off(), this, WRITE); + return new StorageN11Action(get_model(), size, not is_on(), this, s4u::Io::OpType::WRITE); } /********** * Action * **********/ -StorageN11Action::StorageN11Action(kernel::resource::Model* model, double cost, bool failed, StorageImpl* storage, - e_surf_action_storage_type_t type) +StorageN11Action::StorageN11Action(Model* model, double cost, bool failed, StorageImpl* storage, s4u::Io::OpType type) : StorageAction(model, cost, failed, model->get_maxmin_system()->variable_new(this, 1.0, -1.0, 3), storage, type) { XBT_IN("(%s,%g", storage->get_cname(), cost); @@ -122,14 +126,14 @@ StorageN11Action::StorageN11Action(kernel::resource::Model* model, double cost, // Must be less than the max bandwidth for all actions model->get_maxmin_system()->expand(storage->get_constraint(), get_variable(), 1.0); switch(type) { - case READ: - model->get_maxmin_system()->expand(storage->constraintRead_, get_variable(), 1.0); - break; - case WRITE: - model->get_maxmin_system()->expand(storage->constraintWrite_, get_variable(), 1.0); - break; - default: - THROW_UNIMPLEMENTED; + case s4u::Io::OpType::READ: + model->get_maxmin_system()->expand(storage->constraintRead_, get_variable(), 1.0); + break; + case s4u::Io::OpType::WRITE: + model->get_maxmin_system()->expand(storage->constraintWrite_, get_variable(), 1.0); + break; + default: + THROW_UNIMPLEMENTED; } XBT_OUT(); } @@ -167,5 +171,6 @@ void StorageN11Action::update_remains_lazy(double /*now*/) { THROW_IMPOSSIBLE; } -} -} +} // namespace resource +} // namespace kernel +} // namespace simgrid