X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e22da6010c6499813ff88c76041cf499ffbf2b67..69aaa26fa5228c31e55086fa166479732a9cd1b7:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index de75a275e1..169d528ed3 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -4,6 +4,8 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "ptask_L07.hpp" +#include "simgrid/kernel/routing/NetZoneImpl.hpp" +#include "simgrid/s4u/Engine.hpp" #include "src/kernel/EngineImpl.hpp" #include "src/kernel/resource/profile/Event.hpp" #include "surf/surf.hpp" @@ -21,31 +23,31 @@ void surf_host_model_init_ptask_L07() { XBT_CINFO(xbt_cfg, "Switching to the L07 model to handle parallel tasks."); - auto host_model = std::make_unique(); - simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::HOST, - std::move(host_model), true); + auto host_model = std::make_shared("Host_Ptask"); + simgrid::kernel::EngineImpl::get_instance()->add_model(host_model); + simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_host_model(host_model); } namespace simgrid { namespace surf { -HostL07Model::HostL07Model() : HostModel() +HostL07Model::HostL07Model(const std::string& name) : HostModel(name) { auto* maxmin_system = new simgrid::kernel::lmm::FairBottleneck(true /* selective update */); set_maxmin_system(maxmin_system); - net_model_ = std::make_unique(this, maxmin_system); - auto engine = simgrid::kernel::EngineImpl::get_instance(); - engine->add_model_ptask(simgrid::kernel::resource::Model::Type::NETWORK, net_model_.get(), true); + auto net_model = std::make_shared("Network_Ptask", this, maxmin_system); + auto engine = simgrid::kernel::EngineImpl::get_instance(); + engine->add_model(net_model); + simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model); - cpu_model_ = std::make_unique(this, maxmin_system); - engine->add_model_ptask(simgrid::kernel::resource::Model::Type::CPU_PM, cpu_model_.get(), true); + auto cpu_model = std::make_shared("Cpu_Ptask", this, maxmin_system); + engine->add_model(cpu_model); + simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_cpu_pm_model(cpu_model); } -HostL07Model::~HostL07Model() {} - -CpuL07Model::CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) - : CpuModel(Model::UpdateAlgo::FULL), hostModel_(hmodel) +CpuL07Model::CpuL07Model(const std::string& name, HostL07Model* hmodel, kernel::lmm::System* sys) + : CpuModel(name), hostModel_(hmodel) { set_maxmin_system(sys); } @@ -55,14 +57,14 @@ CpuL07Model::~CpuL07Model() set_maxmin_system(nullptr); } -NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) - : NetworkModel(Model::UpdateAlgo::FULL), hostModel_(hmodel) +NetworkL07Model::NetworkL07Model(const std::string& name, HostL07Model* hmodel, kernel::lmm::System* sys) + : NetworkModel(name), hostModel_(hmodel) { set_maxmin_system(sys); - loopback_ = NetworkL07Model::create_link( - "__loopback__", std::vector{simgrid::config::get_value("network/loopback-bw")}, - s4u::Link::SharingPolicy::FATPIPE) - ->set_latency(simgrid::config::get_value("network/loopback-lat")); + loopback_ = + create_link("__loopback__", std::vector{simgrid::config::get_value("network/loopback-bw")}) + ->set_sharing_policy(s4u::Link::SharingPolicy::FATPIPE) + ->set_latency(simgrid::config::get_value("network/loopback-lat")); loopback_->seal(); } @@ -103,9 +105,8 @@ void HostL07Model::update_actions_state(double /*now*/, double delta) action.set_last_update(); } } - XBT_DEBUG("Action (%p) : remains (%g) updated by %g.", &action, action.get_remains(), - action.get_variable()->get_value() * delta); - action.update_remains(action.get_variable()->get_value() * delta); + XBT_DEBUG("Action (%p) : remains (%g) updated by %g.", &action, action.get_remains(), action.get_rate() * delta); + action.update_remains(action.get_rate() * delta); action.update_max_duration(delta); XBT_DEBUG("Action (%p) : remains (%g).", &action, action.get_remains()); @@ -192,10 +193,10 @@ L07Action::L07Action(kernel::resource::Model* model, const std::vector::max(); for (size_t i = 0; i < host_list.size(); i++) { - model->get_maxmin_system()->expand(host_list[i]->pimpl_cpu->get_constraint(), get_variable(), + model->get_maxmin_system()->expand(host_list[i]->get_cpu()->get_constraint(), get_variable(), (flops_amount == nullptr ? 0.0 : flops_amount[i])); if (flops_amount && flops_amount[i] > 0) - bound = std::min(bound, host_list[i]->pimpl_cpu->get_speed(1.0) * host_list[i]->pimpl_cpu->get_speed_ratio() / + bound = std::min(bound, host_list[i]->get_cpu()->get_speed(1.0) * host_list[i]->get_cpu()->get_speed_ratio() / flops_amount[i]); } if (bound < std::numeric_limits::max()) @@ -232,18 +233,21 @@ kernel::resource::Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host return res; } -kernel::resource::Cpu* CpuL07Model::create_cpu(s4u::Host* host, const std::vector& speed_per_pstate) +kernel::resource::CpuImpl* CpuL07Model::create_cpu(s4u::Host* host, const std::vector& speed_per_pstate) { return (new CpuL07(host, speed_per_pstate))->set_model(this); } -kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name, const std::vector& bandwidths, - s4u::Link::SharingPolicy policy) +kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name, const std::vector& bandwidths) { xbt_assert(bandwidths.size() == 1, "Non WIFI link must have only 1 bandwidth."); - auto link = new LinkL07(name, bandwidths[0], policy, get_maxmin_system()); - link->set_model(this); - return link; + return (new LinkL07(name, bandwidths[0], get_maxmin_system()))->set_model(this); +} + +kernel::resource::LinkImpl* NetworkL07Model::create_wifi_link(const std::string& name, + const std::vector& bandwidths) +{ + THROW_UNIMPLEMENTED; } /************ @@ -281,28 +285,22 @@ bool CpuL07::is_used() const /** @brief take into account changes of speed (either load or max) */ void CpuL07::on_speed_change() { - const kernel::lmm::Variable* var; const kernel::lmm::Element* elem = nullptr; get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), speed_.peak * speed_.scale); - while ((var = get_constraint()->get_variable(&elem))) { + while (const auto* var = get_constraint()->get_variable(&elem)) { const kernel::resource::Action* action = var->get_id(); get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak); } - Cpu::on_speed_change(); + CpuImpl::on_speed_change(); } -LinkL07::LinkL07(const std::string& name, double bandwidth, s4u::Link::SharingPolicy policy, - kernel::lmm::System* system) - : LinkImpl(name) +LinkL07::LinkL07(const std::string& name, double bandwidth, kernel::lmm::System* system) : LinkImpl(name) { this->set_constraint(system->constraint_new(this, bandwidth)); bandwidth_.peak = bandwidth; - - if (policy == s4u::Link::SharingPolicy::FATPIPE) - get_constraint()->unshare(); } bool LinkL07::is_used() const @@ -367,13 +365,11 @@ void LinkL07::set_bandwidth(double value) kernel::resource::LinkImpl* LinkL07::set_latency(double value) { latency_check(value); - const kernel::lmm::Variable* var; - L07Action* action; const kernel::lmm::Element* elem = nullptr; latency_.peak = value; - while ((var = get_constraint()->get_variable(&elem))) { - action = static_cast(var->get_id()); + while (const auto* var = get_constraint()->get_variable(&elem)) { + auto* action = static_cast(var->get_id()); action->updateBound(); } return this;