X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5c008e5e2b41b0b2b9bcafd4f3f841554e687133..796c472929f78dd5131c885d544579d4a6bdc425:/src/surf/disk_s19.cpp diff --git a/src/surf/disk_s19.cpp b/src/surf/disk_s19.cpp index a59bd44e26..d376ba2ad7 100644 --- a/src/surf/disk_s19.cpp +++ b/src/surf/disk_s19.cpp @@ -1,44 +1,53 @@ -/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2022. 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 "disk_s19.hpp" -#include "simgrid/kernel/routing/NetPoint.hpp" -#include "simgrid/kernel/routing/NetZoneImpl.hpp" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Host.hpp" +#include "simgrid/sg_config.hpp" +#include +#include +#include +#include + #include "src/kernel/EngineImpl.hpp" #include "src/kernel/lmm/maxmin.hpp" -#include "src/surf/xml/platf.hpp" -#include "surf/surf.hpp" +#include "src/kernel/resource/profile/Event.hpp" +#include "src/surf/disk_s19.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_disk); +/*********** + * Options * + ***********/ +static simgrid::config::Flag cfg_disk_solver("disk/solver", + "Set linear equations solver used by disk model", "maxmin", + &simgrid::kernel::lmm::System::validate_solver); /********* * Model * *********/ -void surf_disk_model_init_default() +void surf_disk_model_init_S19() { - auto disk_model = std::make_shared(); - disk_model->set_name("Disk"); - simgrid::kernel::EngineImpl::get_instance()->add_model(disk_model); - simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_disk_model(disk_model); + auto disk_model = std::make_shared("Disk"); + auto* engine = simgrid::kernel::EngineImpl::get_instance(); + engine->add_model(disk_model); + engine->get_netzone_root()->set_disk_model(disk_model); } -namespace simgrid { -namespace kernel { -namespace resource { +namespace simgrid::kernel::resource { +/********* + * Model * + *********/ -DiskImpl* DiskS19Model::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) +DiskS19Model::DiskS19Model(const std::string& name) : DiskModel(name) { - return (new DiskS19(name, read_bandwidth, write_bandwidth))->set_model(this); + set_maxmin_system(lmm::System::build(cfg_disk_solver.get(), true /* selective update */)); } -double DiskS19Model::next_occurring_event(double now) + +DiskImpl* DiskS19Model::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) { - return DiskModel::next_occurring_event_full(now); + return (new DiskS19(name, read_bandwidth, write_bandwidth))->set_model(this); } void DiskS19Model::update_actions_state(double /*now*/, double delta) @@ -46,7 +55,7 @@ void DiskS19Model::update_actions_state(double /*now*/, double delta) for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) { auto& action = *it; ++it; // increment iterator here since the following calls to action.finish() may invalidate it - action.update_remains(rint(action.get_variable()->get_value() * delta)); + action.update_remains(rint(action.get_rate() * delta)); action.update_max_duration(delta); if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_penalty() > 0)) || @@ -59,78 +68,57 @@ void DiskS19Model::update_actions_state(double /*now*/, double delta) /************ * Resource * ************/ -DiskAction* DiskS19::io_start(sg_size_t size, s4u::Io::OpType type) -{ - return new DiskS19Action(get_model(), static_cast(size), not is_on(), this, type); -} -DiskAction* DiskS19::read(sg_size_t size) +void DiskS19::apply_event(kernel::profile::Event* triggered, double value) { - return new DiskS19Action(get_model(), static_cast(size), not is_on(), this, s4u::Io::OpType::READ); -} + /* Find out which of my iterators was triggered, and react accordingly */ + if (triggered == get_read_event()) { + set_read_bandwidth(value); + unref_read_event(); + } else if (triggered == get_write_event()) { + set_write_bandwidth(value); + unref_write_event(); + } else if (triggered == get_state_event()) { + if (value > 0) + turn_on(); + else + turn_off(); + unref_state_event(); + } else { + xbt_die("Unknown event!\n"); + } -DiskAction* DiskS19::write(sg_size_t size) -{ - return new DiskS19Action(get_model(), static_cast(size), not is_on(), this, s4u::Io::OpType::WRITE); + XBT_DEBUG("There was a resource state event, need to update actions related to the constraint (%p)", + get_constraint()); } /********** * Action * **********/ -DiskS19Action::DiskS19Action(Model* model, double cost, bool failed, DiskImpl* disk, s4u::Io::OpType type) - : DiskAction(model, cost, failed, model->get_maxmin_system()->variable_new(this, 1.0, -1.0, 3), disk, type) +DiskS19Action::DiskS19Action(Model* model, double cost, bool failed) + : DiskAction(model, cost, failed, model->get_maxmin_system()->variable_new(this, 1.0, -1.0, 3)) { - XBT_IN("(%s,%g", disk->get_cname(), cost); +} - // Must be less than the max bandwidth for all actions - model->get_maxmin_system()->expand(disk->get_constraint(), get_variable(), 1.0); +DiskAction* DiskS19::io_start(sg_size_t size, s4u::Io::OpType type) +{ + auto* action = new DiskS19Action(get_model(), static_cast(size), not is_on()); + get_model()->get_maxmin_system()->expand(get_constraint(), action->get_variable(), 1.0); switch (type) { case s4u::Io::OpType::READ: - model->get_maxmin_system()->expand(disk->get_read_constraint(), get_variable(), 1.0); + get_model()->get_maxmin_system()->expand(get_read_constraint(), action->get_variable(), 1.0); break; case s4u::Io::OpType::WRITE: - model->get_maxmin_system()->expand(disk->get_write_constraint(), get_variable(), 1.0); + get_model()->get_maxmin_system()->expand(get_write_constraint(), action->get_variable(), 1.0); break; default: THROW_UNIMPLEMENTED; } - XBT_OUT(); -} - -void DiskS19Action::cancel() -{ - set_state(Action::State::FAILED); -} - -void DiskS19Action::suspend() -{ - XBT_IN("(%p)", this); - if (is_running()) { - get_model()->get_maxmin_system()->update_variable_penalty(get_variable(), 0.0); - set_suspend_state(Action::SuspendStates::SUSPENDED); + if (const auto& factor_cb = get_factor_cb()) { // handling disk variability + action->set_rate_factor(factor_cb(size, type)); } - XBT_OUT(); + return action; } -void DiskS19Action::resume() -{ - THROW_UNIMPLEMENTED; -} - -void DiskS19Action::set_max_duration(double /*duration*/) -{ - THROW_UNIMPLEMENTED; -} - -void DiskS19Action::set_sharing_penalty(double) -{ - THROW_UNIMPLEMENTED; -} -void DiskS19Action::update_remains_lazy(double /*now*/) -{ - THROW_IMPOSSIBLE; -} -} // namespace resource -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel::resource