X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4cedb26366276e3045ed070fb6df5b6e6f77967e..e22da6010c6499813ff88c76041cf499ffbf2b67:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 1bf76de1f0..de75a275e1 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -1,15 +1,17 @@ -/* Copyright (c) 2007-2018. 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 "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); /**************************************/ @@ -17,30 +19,31 @@ 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_unique(); + simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::HOST, + std::move(host_model), true); } namespace simgrid { namespace surf { -HostL07Model::HostL07Model() : HostModel() { +HostL07Model::HostL07Model() : HostModel() +{ 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; + 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); + + cpu_model_ = std::make_unique(this, maxmin_system); + engine->add_model_ptask(simgrid::kernel::resource::Model::Type::CPU_PM, cpu_model_.get(), true); } +HostL07Model::~HostL07Model() {} + CpuL07Model::CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) : CpuModel(Model::UpdateAlgo::FULL), hostModel_(hmodel) { @@ -56,7 +59,11 @@ NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) : NetworkModel(Model::UpdateAlgo::FULL), hostModel_(hmodel) { set_maxmin_system(sys); - loopback_ = NetworkL07Model::create_link("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE); + 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_->seal(); } NetworkL07Model::~NetworkL07Model() @@ -64,13 +71,13 @@ NetworkL07Model::~NetworkL07Model() set_maxmin_system(nullptr); } -double HostL07Model::next_occuring_event(double now) +double HostL07Model::next_occurring_event(double now) { - double min = HostModel::next_occuring_event_full(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); } } @@ -82,26 +89,24 @@ double HostL07Model::next_occuring_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_weight(action.get_variable(), 1.0); + 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); - - if (action.get_max_duration() > NO_MAX_DURATION) - action.update_max_duration(delta); + action.update_max_duration(delta); XBT_DEBUG("Action (%p) : remains (%g).", &action, action.get_remains()); @@ -111,104 +116,104 @@ void HostL07Model::update_actions_state(double /*now*/, double delta) * If it's not done, it may have failed. */ - if (((action.get_remains() <= 0) && (action.get_variable()->get_weight() > 0)) || - ((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { + if (((action.get_remains() <= 0) && (action.get_variable()->get_penalty() > 0)) || + ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { action.finish(kernel::resource::Action::State::FINISHED); - } else { - /* Need to check that none of the model has failed */ - int i = 0; - kernel::lmm::Constraint* cnst = action.get_variable()->get_constraint(i); - while (cnst != nullptr) { - i++; - void* constraint_id = cnst->get_id(); - if (static_cast(constraint_id)->is_off()) { - XBT_DEBUG("Action (%p) Failed!!", &action); - action.finish(kernel::resource::Action::State::FAILED); - break; - } - cnst = action.get_variable()->get_constraint(i); + continue; + } + + /* Need to check that none of the model has failed */ + int i = 0; + const kernel::lmm::Constraint* cnst = action.get_variable()->get_constraint(i); + while (cnst != nullptr) { + i++; + const kernel::resource::Resource* constraint_id = cnst->get_id(); + if (not constraint_id->is_on()) { + XBT_DEBUG("Action (%p) Failed!!", &action); + action.finish(kernel::resource::Action::State::FAILED); + break; } + cnst = action.get_variable()->get_constraint(i); } } } -kernel::resource::Action* HostL07Model::execute_parallel(int host_nb, sg_host_t* host_list, double* flops_amount, - double* bytes_amount, double rate) +kernel::resource::CpuAction* HostL07Model::execute_parallel(const std::vector& host_list, + const double* flops_amount, const double* bytes_amount, + double rate) { - return new L07Action(this, host_nb, host_list, flops_amount, bytes_amount, rate); + return new L07Action(this, host_list, flops_amount, bytes_amount, rate); } -L07Action::L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* host_list, double* flops_amount, - double* bytes_amount, double rate) - : CpuAction(model, 1, 0), computationAmount_(flops_amount), communicationAmount_(bytes_amount), rate_(rate) +L07Action::L07Action(kernel::resource::Model* model, const std::vector& host_list, + const double* flops_amount, const double* bytes_amount, double rate) + : CpuAction(model, 1.0, false), computationAmount_(flops_amount), communicationAmount_(bytes_amount), rate_(rate) { - int nb_link = 0; - int nb_used_host = 0; /* Only the hosts with something to compute (>0 flops) are counted) */ - double latency = 0.0; + 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; this->set_last_update(); - this->hostList_.reserve(host_nb); - for (int i = 0; i < host_nb; i++) - this->hostList_.push_back(host_list[i]); + hostList_.insert(hostList_.end(), host_list.begin(), host_list.end()); if (flops_amount != nullptr) - for (int i = 0; i < host_nb; i++) - if (flops_amount[i] > 0) - nb_used_host++; + used_host_nb += std::count_if(flops_amount, flops_amount + host_list.size(), [](double x) { return x > 0.0; }); /* Compute the number of affected resources... */ - if(bytes_amount != nullptr) { + if (bytes_amount != nullptr) { std::unordered_set affected_links; - for (int i = 0; i < host_nb; i++) { - for (int j = 0; j < host_nb; j++) { + for (size_t k = 0; k < host_list.size() * host_list.size(); k++) { + if (bytes_amount[k] <= 0) + continue; - if (bytes_amount[i * host_nb + j] > 0) { - double lat=0.0; + double lat = 0.0; + std::vector route; + hostList_[k / host_list.size()]->route_to(hostList_[k % host_list.size()], route, &lat); + latency = std::max(latency, lat); - std::vector route; - hostList_.at(i)->route_to(hostList_.at(j), route, &lat); - latency = std::max(latency, lat); - - for (auto const& link : route) - affected_links.insert(link->get_cname()); - } - } + for (auto const& link : route) + affected_links.insert(link->get_cname()); } - nb_link = affected_links.size(); + link_nb = affected_links.size(); } - XBT_DEBUG("Creating a parallel task (%p) with %d hosts and %d unique links.", this, host_nb, nb_link); + XBT_DEBUG("Creating a parallel task (%p) with %zu hosts and %zu unique links.", this, host_list.size(), link_nb); latency_ = latency; - set_variable(model->get_maxmin_system()->variable_new(this, 1.0, (rate > 0 ? rate : -1.0), host_nb + nb_link)); + set_variable( + model->get_maxmin_system()->variable_new(this, 1.0, (rate > 0 ? rate : -1.0), host_list.size() + link_nb)); if (latency_ > 0) - model->get_maxmin_system()->update_variable_weight(get_variable(), 0.0); + model->get_maxmin_system()->update_variable_penalty(get_variable(), 0.0); - /* Expend it for the CPUs even if there is nothing to compute, to make sure that it gets expended even if there is no + /* Expand it for the CPUs even if there is nothing to compute, to make sure that it gets expended even if there is no * communication either */ - for (int i = 0; i < host_nb; i++) + double bound = std::numeric_limits::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(), (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() / + flops_amount[i]); + } + if (bound < std::numeric_limits::max()) + model->get_maxmin_system()->update_variable_bound(get_variable(), bound); if (bytes_amount != nullptr) { - for (int i = 0; i < host_nb; i++) { - for (int j = 0; j < host_nb; j++) { - if (bytes_amount[i * host_nb + j] > 0.0) { - std::vector route; - hostList_.at(i)->route_to(hostList_.at(j), route, nullptr); - - for (auto const& link : route) - model->get_maxmin_system()->expand_add(link->get_constraint(), this->get_variable(), - bytes_amount[i * host_nb + j]); - } - } + for (size_t k = 0; k < host_list.size() * host_list.size(); k++) { + if (bytes_amount[k] <= 0.0) + continue; + std::vector route; + hostList_[k / host_list.size()]->route_to(hostList_[k % host_list.size()], route, nullptr); + + for (auto const& link : route) + model->get_maxmin_system()->expand_add(link->get_constraint(), this->get_variable(), bytes_amount[k]); } } - if (nb_link + nb_used_host == 0) { + if (link_nb + used_host_nb == 0) { this->set_cost(1.0); this->set_remains(0.0); } @@ -216,79 +221,59 @@ L07Action::L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* hos kernel::resource::Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) { - sg_host_t* host_list = new sg_host_t[2](); - double* flops_amount = new double[2](); - double* bytes_amount = new double[4](); + std::vector host_list = {src, dst}; + const auto* flops_amount = new double[2](); + auto* bytes_amount = new double[4](); - host_list[0] = src; - host_list[1] = dst; bytes_amount[1] = size; - kernel::resource::Action* res = hostModel_->execute_parallel(2, host_list, flops_amount, bytes_amount, rate); + kernel::resource::Action* res = hostModel_->execute_parallel(host_list, flops_amount, bytes_amount, rate); static_cast(res)->free_arrays_ = true; return res; } -Cpu* CpuL07Model::create_cpu(simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core) +kernel::resource::Cpu* 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, double bandwidth, double latency, +kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name, const std::vector& bandwidths, s4u::Link::SharingPolicy policy) { - return new LinkL07(this, name, bandwidth, latency, policy); + 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; } /************ * Resource * ************/ -CpuL07::CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, 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) -{ -} - -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(this->piface_); -} - -kernel::resource::Action* CpuL07::execution_start(double size) +kernel::resource::CpuAction* CpuL07::execution_start(double size) { - sg_host_t host_list[1] = {get_host()}; + std::vector host_list = {get_iface()}; - double* flops_amount = new double[1](); - flops_amount[0] = size; + auto* flops_amount = new double[host_list.size()](); + flops_amount[0] = size; - kernel::resource::Action* res = - static_cast(get_model())->hostModel_->execute_parallel(1, host_list, flops_amount, nullptr, -1); + kernel::resource::CpuAction* res = + static_cast(get_model())->hostModel_->execute_parallel(host_list, flops_amount, nullptr, -1); static_cast(res)->free_arrays_ = true; return res; } -kernel::resource::Action* CpuL07::sleep(double duration) +kernel::resource::CpuAction* CpuL07::sleep(double duration) { - L07Action *action = static_cast(execution_start(1.0)); + auto* action = static_cast(execution_start(1.0)); action->set_max_duration(duration); - action->suspended_ = kernel::resource::Action::SuspendStates::sleeping; - get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0); + action->set_suspend_state(kernel::resource::Action::SuspendStates::SLEEPING); + get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), 0.0); return action; } -bool CpuL07::is_used() +bool CpuL07::is_used() const { return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } @@ -296,12 +281,12 @@ bool CpuL07::is_used() /** @brief take into account changes of speed (either load or max) */ void CpuL07::on_speed_change() { - kernel::lmm::Variable* var = nullptr; + 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))) { - kernel::resource::Action* action = static_cast(var->get_id()); + const kernel::resource::Action* action = var->get_id(); get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak); } @@ -309,12 +294,23 @@ void CpuL07::on_speed_change() Cpu::on_speed_change(); } -bool LinkL07::is_used() +LinkL07::LinkL07(const std::string& name, double bandwidth, s4u::Link::SharingPolicy policy, + 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 { return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } -void CpuL07::apply_event(tmgr_trace_event_t triggered, double value) +void CpuL07::apply_event(kernel::profile::Event* triggered, double value) { XBT_DEBUG("Updating cpu %s (%p) with value %g", get_cname(), this, value); if (triggered == speed_.event) { @@ -324,12 +320,12 @@ void CpuL07::apply_event(tmgr_trace_event_t triggered, double value) } else if (triggered == state_event_) { if (value > 0) { - if (is_off()) { - XBT_VERB("Restart processes on host %s", get_host()->get_cname()); - get_host()->turn_on(); + if (not is_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 { @@ -337,7 +333,7 @@ void CpuL07::apply_event(tmgr_trace_event_t triggered, double value) } } -void LinkL07::apply_event(tmgr_trace_event_t triggered, double value) +void LinkL07::apply_event(kernel::profile::Event* triggered, double value) { XBT_DEBUG("Updating link %s (%p) with value=%f", get_cname(), this, value); if (triggered == bandwidth_.event) { @@ -368,10 +364,11 @@ void LinkL07::set_bandwidth(double value) get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), bandwidth_.peak * bandwidth_.scale); } -void LinkL07::set_latency(double value) +kernel::resource::LinkImpl* LinkL07::set_latency(double value) { - kernel::lmm::Variable* var = nullptr; - L07Action *action; + latency_check(value); + const kernel::lmm::Variable* var; + L07Action* action; const kernel::lmm::Element* elem = nullptr; latency_.peak = value; @@ -379,6 +376,7 @@ void LinkL07::set_latency(double value) action = static_cast(var->get_id()); action->updateBound(); } + return this; } LinkL07::~LinkL07() = default; @@ -398,25 +396,24 @@ void L07Action::updateBound() { double lat_current = 0.0; - int hostNb = hostList_.size(); + size_t host_count = hostList_.size(); if (communicationAmount_ != nullptr) { - for (int i = 0; i < hostNb; i++) { - for (int j = 0; j < hostNb; j++) { - - if (communicationAmount_[i * hostNb + j] > 0) { + for (size_t i = 0; i < host_count; i++) { + for (size_t j = 0; j < host_count; j++) { + if (communicationAmount_[i * host_count + j] > 0) { double lat = 0.0; std::vector route; hostList_.at(i)->route_to(hostList_.at(j), route, &lat); - lat_current = std::max(lat_current, lat * communicationAmount_[i * hostNb + j]); + lat_current = std::max(lat_current, lat * communicationAmount_[i * host_count + j]); } } } } double lat_bound = kernel::resource::NetworkModel::cfg_tcp_gamma / (2.0 * lat_current); XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound); - if ((latency_ <= 0.0) && (suspended_ == Action::SuspendStates::not_suspended)) { + if ((latency_ <= 0.0) && is_running()) { if (rate_ < 0) get_model()->get_maxmin_system()->update_variable_bound(get_variable(), lat_bound); else @@ -424,5 +421,5 @@ void L07Action::updateBound() } } -} -} +} // namespace surf +} // namespace simgrid