X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6..38f246c4c46920a78ea0af8233449f402c178f04:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 4478d5342b..cc27a24688 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -1,16 +1,19 @@ -/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2021. 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 "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" #include "xbt/config.hpp" #include -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_host); XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg); /**************************************/ @@ -18,32 +21,34 @@ XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg); /**************************************/ void surf_host_model_init_ptask_L07() { - XBT_CINFO(xbt_cfg,"Switching to the L07 model to handle parallel tasks."); - xbt_assert(not surf_cpu_model_pm, "Cannot switch to ptasks: CPU model already defined"); - xbt_assert(not surf_network_model, "Cannot switch to ptasks: network model already defined"); + XBT_CINFO(xbt_cfg, "Switching to the L07 model to handle parallel tasks."); - surf_host_model = new simgrid::surf::HostL07Model(); - all_existing_models.push_back(surf_host_model); + auto host_model = std::make_shared("Host_Ptask"); + auto* engine = simgrid::kernel::EngineImpl::get_instance(); + engine->add_model(host_model); + engine->get_netzone_root()->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); - surf_network_model = new NetworkL07Model(this, maxmin_system); - surf_cpu_model_pm = new CpuL07Model(this, maxmin_system); -} -HostL07Model::~HostL07Model() -{ - delete surf_network_model; - delete surf_cpu_model_pm; + auto net_model = std::make_shared("Network_Ptask", this, maxmin_system); + auto engine = simgrid::kernel::EngineImpl::get_instance(); + engine->add_model(net_model); + engine->get_netzone_root()->set_network_model(net_model); + + auto cpu_model = std::make_shared("Cpu_Ptask", this, maxmin_system); + engine->add_model(cpu_model); + engine->get_netzone_root()->set_cpu_pm_model(cpu_model); } -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); } @@ -53,12 +58,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{498000000}, 0.000015, - s4u::Link::SharingPolicy::FATPIPE); + loopback_ = create_link("__loopback__", {simgrid::config::get_value("network/loopback-bw")}); + loopback_->set_sharing_policy(s4u::Link::SharingPolicy::FATPIPE, {}); + loopback_->set_latency(simgrid::config::get_value("network/loopback-lat")); + loopback_->seal(); } NetworkL07Model::~NetworkL07Model() @@ -70,9 +77,9 @@ double HostL07Model::next_occurring_event(double now) { double min = HostModel::next_occurring_event_full(now); for (kernel::resource::Action const& action : *get_started_action_set()) { - const L07Action& net_action = static_cast(action); - if (net_action.latency_ > 0 && (min < 0 || net_action.latency_ < min)) { - min = net_action.latency_; + const auto& net_action = static_cast(action); + if (net_action.get_latency() > 0 && (min < 0 || net_action.get_latency() < min)) { + min = net_action.get_latency(); XBT_DEBUG("Updating min with %p (start %f): %f", &net_action, net_action.get_start_time(), min); } } @@ -84,23 +91,22 @@ double HostL07Model::next_occurring_event(double now) void HostL07Model::update_actions_state(double /*now*/, double delta) { for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) { - L07Action& action = static_cast(*it); + auto& action = static_cast(*it); ++it; // increment iterator here since the following calls to action.finish() may invalidate it - if (action.latency_ > 0) { - if (action.latency_ > delta) { - double_update(&(action.latency_), delta, sg_surf_precision); + if (action.get_latency() > 0) { + if (action.get_latency() > delta) { + action.update_latency(delta, sg_surf_precision); } else { - action.latency_ = 0.0; + action.set_latency(0.0); } - if ((action.latency_ <= 0.0) && (action.is_suspended() == 0)) { + if ((action.get_latency() <= 0.0) && (action.is_suspended() == 0)) { action.updateBound(); get_maxmin_system()->update_variable_penalty(action.get_variable(), 1.0); 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()); @@ -118,7 +124,7 @@ void HostL07Model::update_actions_state(double /*now*/, double delta) } /* Need to check that none of the model has failed */ - int i = 0; + int i = 0; const kernel::lmm::Constraint* cnst = action.get_variable()->get_constraint(i); while (cnst != nullptr) { i++; @@ -142,11 +148,11 @@ kernel::resource::CpuAction* HostL07Model::execute_parallel(const std::vector& host_list, const double* flops_amount, const double* bytes_amount, double rate) - : CpuAction(model, 1, 0), computationAmount_(flops_amount), communicationAmount_(bytes_amount), rate_(rate) + : CpuAction(model, 1.0, false), computationAmount_(flops_amount), communicationAmount_(bytes_amount), rate_(rate) { size_t link_nb = 0; size_t used_host_nb = 0; /* Only the hosts with something to compute (>0 flops) are counted) */ - double latency = 0.0; + double latency = 0.0; this->set_last_update(); hostList_.insert(hostList_.end(), host_list.begin(), host_list.end()); @@ -155,7 +161,7 @@ L07Action::L07Action(kernel::resource::Model* model, const std::vector 0.0; }); /* Compute the number of affected resources... */ - if(bytes_amount != nullptr) { + if (bytes_amount != nullptr) { std::unordered_set affected_links; for (size_t k = 0; k < host_list.size() * host_list.size(); k++) { @@ -185,9 +191,16 @@ L07Action::L07Action(kernel::resource::Model* model, const std::vectorget_maxmin_system()->expand(host_list[i]->pimpl_cpu->get_constraint(), get_variable(), + double bound = std::numeric_limits::max(); + for (size_t i = 0; i < host_list.size(); i++) { + 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]->get_cpu()->get_speed(1.0) * host_list[i]->get_cpu()->get_speed_ratio() / + flops_amount[i]); + } + if (bound < std::numeric_limits::max()) + model->get_maxmin_system()->update_variable_bound(get_variable(), bound); if (bytes_amount != nullptr) { for (size_t k = 0; k < host_list.size() * host_list.size(); k++) { @@ -210,8 +223,8 @@ L07Action::L07Action(kernel::resource::Model* model, const std::vector host_list = {src, dst}; - const double* flops_amount = new double[2](); - double* bytes_amount = new double[4](); + const auto* flops_amount = new double[2](); + auto* bytes_amount = new double[4](); bytes_amount[1] = size; @@ -220,49 +233,36 @@ 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, int core) +kernel::resource::CpuImpl* CpuL07Model::create_cpu(s4u::Host* host, const std::vector& speed_per_pstate) { - return new CpuL07(this, host, speed_per_pstate, core); + return (new CpuL07(host, speed_per_pstate))->set_model(this); } -kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name, const std::vector& bandwidths, - double latency, 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."); - return new LinkL07(this, name, bandwidths[0], latency, policy); + auto link = new LinkL07(name, bandwidths[0], get_maxmin_system()); + link->set_model(this); + return link; } -/************ - * Resource * - ************/ - -CpuL07::CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, const std::vector& speed_per_pstate, int core) - : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, speed_per_pstate.front()), speed_per_pstate, - core) +kernel::resource::LinkImpl* NetworkL07Model::create_wifi_link(const std::string& name, + const std::vector& bandwidths) { + THROW_UNIMPLEMENTED; } -CpuL07::~CpuL07()=default; - -LinkL07::LinkL07(NetworkL07Model* model, const std::string& name, double bandwidth, double latency, - s4u::Link::SharingPolicy policy) - : LinkImpl(model, name, model->get_maxmin_system()->constraint_new(this, bandwidth)) -{ - bandwidth_.peak = bandwidth; - latency_.peak = latency; - - if (policy == s4u::Link::SharingPolicy::FATPIPE) - get_constraint()->unshare(); - - s4u::Link::on_creation(*get_iface()); -} +/************ + * Resource * + ************/ -kernel::resource::CpuAction* CpuL07::execution_start(double size) +kernel::resource::CpuAction* CpuL07::execution_start(double size, double user_bound) { - std::vector host_list = {get_host()}; + std::vector host_list = {get_iface()}; + xbt_assert(user_bound <= 0, "User bound not supported by ptask model"); - double* flops_amount = new double[host_list.size()](); - flops_amount[0] = size; + auto* flops_amount = new double[host_list.size()](); + flops_amount[0] = size; kernel::resource::CpuAction* res = static_cast(get_model())->hostModel_->execute_parallel(host_list, flops_amount, nullptr, -1); @@ -272,7 +272,7 @@ kernel::resource::CpuAction* CpuL07::execution_start(double size) kernel::resource::CpuAction* CpuL07::sleep(double duration) { - L07Action *action = static_cast(execution_start(1.0)); + auto* action = static_cast(execution_start(1.0, -1)); action->set_max_duration(duration); action->set_suspend_state(kernel::resource::Action::SuspendStates::SLEEPING); get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), 0.0); @@ -280,7 +280,7 @@ kernel::resource::CpuAction* CpuL07::sleep(double duration) return action; } -bool CpuL07::is_used() +bool CpuL07::is_used() const { return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } @@ -288,20 +288,25 @@ bool CpuL07::is_used() /** @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))) { - const kernel::resource::Action* action = static_cast(var->get_id()); + 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(); } -bool LinkL07::is_used() +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; +} + +bool LinkL07::is_used() const { return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } @@ -317,11 +322,11 @@ void CpuL07::apply_event(kernel::profile::Event* triggered, double value) } else if (triggered == state_event_) { if (value > 0) { if (not is_on()) { - XBT_VERB("Restart processes on host %s", get_host()->get_cname()); - get_host()->turn_on(); + XBT_VERB("Restart actors on host %s", get_iface()->get_cname()); + get_iface()->turn_on(); } } else - get_host()->turn_off(); + get_iface()->turn_off(); tmgr_trace_event_unref(&state_event_); } else { @@ -362,13 +367,12 @@ void LinkL07::set_bandwidth(double value) void LinkL07::set_latency(double value) { - const kernel::lmm::Variable* var; - L07Action *action; + latency_check(value); 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(); } } @@ -415,5 +419,5 @@ void L07Action::updateBound() } } -} -} +} // namespace surf +} // namespace simgrid