X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/27e5a1eebe0cc33508692e868ae7b369f4a482b4..1386d9951c6653d682ba02d5ed9155485acf4f64:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index f45d2f7b33..85c2bc325b 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -4,6 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "ptask_L07.hpp" +#include "src/kernel/resource/profile/Event.hpp" #include "surf/surf.hpp" #include "xbt/config.hpp" @@ -56,7 +57,8 @@ 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{498000000}, 0.000015, + s4u::Link::SharingPolicy::FATPIPE); } NetworkL07Model::~NetworkL07Model() @@ -92,7 +94,7 @@ void HostL07Model::update_actions_state(double /*now*/, double delta) } if ((action.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(); } } @@ -109,35 +111,36 @@ 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 (not static_cast(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); + continue; + } + + /* 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++; + 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(size_t host_nb, s4u::Host* const* host_list, - const double* flops_amount, const 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, size_t host_nb, s4u::Host* const* host_list, +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), computationAmount_(flops_amount), communicationAmount_(bytes_amount), rate_(rate) { @@ -146,64 +149,55 @@ L07Action::L07Action(kernel::resource::Model* model, size_t host_nb, s4u::Host* double latency = 0.0; this->set_last_update(); - this->hostList_.reserve(host_nb); - for (size_t 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 (size_t i = 0; i < host_nb; i++) - if (flops_amount[i] > 0) - used_host_nb++; + 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) { std::unordered_set affected_links; - for (size_t i = 0; i < host_nb; i++) { - for (size_t 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; - - std::vector route; - hostList_.at(i)->route_to(hostList_.at(j), route, &lat); - latency = std::max(latency, lat); + 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); - for (auto const& link : route) - affected_links.insert(link->get_cname()); - } - } + for (auto const& link : route) + affected_links.insert(link->get_cname()); } link_nb = affected_links.size(); } - XBT_DEBUG("Creating a parallel task (%p) with %zu hosts and %zu unique links.", this, host_nb, link_nb); + 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 + link_nb)); + 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 (size_t i = 0; i < host_nb; i++) + 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 (bytes_amount != nullptr) { - for (size_t i = 0; i < host_nb; i++) { - for (size_t 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]); } } @@ -215,36 +209,35 @@ L07Action::L07Action(kernel::resource::Model* model, size_t host_nb, s4u::Host* 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](); + std::vector host_list = {src, dst}; double* flops_amount = new double[2](); double* 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, int core) { return new CpuL07(this, host, speed_per_pstate, core); } -kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name, double bandwidth, double latency, - s4u::Link::SharingPolicy policy) +kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name, const std::vector& bandwidths, + double latency, 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."); + return new LinkL07(this, name, bandwidths[0], latency, policy); } /************ * 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, +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) { } @@ -264,25 +257,25 @@ LinkL07::LinkL07(NetworkL07Model* model, const std::string& name, double bandwid 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_host()}; - double* flops_amount = new double[1](); + double* 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)); 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; } @@ -415,7 +408,7 @@ void L07Action::updateBound() } 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