X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc79d648c6fd0e8fc281e263c24fe72adbe59769..f409d6f711ba652a6fd78e185791cf7870b6765d:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index 6518688671..8c3eac9543 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2020. 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. */ @@ -10,18 +10,19 @@ #include "src/kernel/lmm/maxmin.hpp" #include "src/surf/xml/platf.hpp" #include "surf/surf.hpp" +#include "xbt/parse_units.hpp" 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 = + const simgrid::kernel::routing::NetPoint* host_elm = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(s->get_impl()->get_host()); if (not host_elm) surf_parse_error(std::string("Unable to attach storage ") + s->get_cname() + ": host " + @@ -49,15 +50,16 @@ StorageN11Model::StorageN11Model() all_existing_models.push_back(this); } -StorageImpl* StorageN11Model::createStorage(const std::string& id, const std::string& type_id, - const std::string& content_name, const std::string& attach) +StorageImpl* StorageN11Model::createStorage(std::string& filename, int lineno, 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); + const 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.c_str()); - double Bwrite = surf_parse_get_bandwidth(storage_type->model_properties->at("Bwrite").c_str(), - "property Bwrite, storage", type_id.c_str()); + double Bread = xbt_parse_get_bandwidth(filename, lineno, storage_type->model_properties->at("Bread").c_str(), + "property Bread, storage", type_id); + double Bwrite = xbt_parse_get_bandwidth(filename, lineno, storage_type->model_properties->at("Bwrite").c_str(), + "property Bwrite, storage", type_id); 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); @@ -66,20 +68,20 @@ StorageImpl* StorageN11Model::createStorage(const std::string& id, const std::st attach); } -double StorageN11Model::next_occuring_event(double now) +double StorageN11Model::next_occurring_event(double now) { - return StorageModel::next_occuring_event_full(now); + return StorageModel::next_occurring_event_full(now); } void StorageN11Model::update_actions_state(double /*now*/, double delta) { for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) { - StorageAction& action = static_cast(*it); + auto& action = *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)); + action.update_remains(rint(action.get_variable()->get_value() * delta)); action.update_max_duration(delta); - if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_weight() > 0)) || + if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_penalty() > 0)) || ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { action.finish(Action::State::FINISHED); } @@ -96,22 +98,22 @@ StorageN11::StorageN11(StorageModel* model, const std::string& name, lmm::System : 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); - s4u::Storage::on_creation(this->piface_); + s4u::Storage::on_creation(*get_iface()); } StorageAction* StorageN11::io_start(sg_size_t size, s4u::Io::OpType type) { - return new StorageN11Action(get_model(), size, not is_on(), this, type); + return new StorageN11Action(get_model(), static_cast(size), not is_on(), this, type); } StorageAction* StorageN11::read(sg_size_t size) { - return new StorageN11Action(get_model(), size, not is_on(), this, s4u::Io::OpType::READ); + return new StorageN11Action(get_model(), static_cast(size), not is_on(), this, s4u::Io::OpType::READ); } StorageAction* StorageN11::write(sg_size_t size) { - return new StorageN11Action(get_model(), size, not is_on(), this, s4u::Io::OpType::WRITE); + return new StorageN11Action(get_model(), static_cast(size), not is_on(), this, s4u::Io::OpType::WRITE); } /********** @@ -127,10 +129,10 @@ StorageN11Action::StorageN11Action(Model* model, double cost, bool failed, Stora model->get_maxmin_system()->expand(storage->get_constraint(), get_variable(), 1.0); switch(type) { case s4u::Io::OpType::READ: - model->get_maxmin_system()->expand(storage->constraint_read_, get_variable(), 1.0); + model->get_maxmin_system()->expand(storage->get_read_constraint(), get_variable(), 1.0); break; case s4u::Io::OpType::WRITE: - model->get_maxmin_system()->expand(storage->constraint_write_, get_variable(), 1.0); + model->get_maxmin_system()->expand(storage->get_write_constraint(), get_variable(), 1.0); break; default: THROW_UNIMPLEMENTED; @@ -147,7 +149,7 @@ void StorageN11Action::suspend() { XBT_IN("(%p)", this); if (is_running()) { - get_model()->get_maxmin_system()->update_variable_weight(get_variable(), 0.0); + get_model()->get_maxmin_system()->update_variable_penalty(get_variable(), 0.0); set_suspend_state(Action::SuspendStates::SUSPENDED); } XBT_OUT(); @@ -163,7 +165,7 @@ void StorageN11Action::set_max_duration(double /*duration*/) THROW_UNIMPLEMENTED; } -void StorageN11Action::set_priority(double /*priority*/) +void StorageN11Action::set_sharing_penalty(double) { THROW_UNIMPLEMENTED; }