X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/149c63f36e15b8500b1e826bda5138318ff7ba2b..3554e5655733577059c0c636e5010961d703d3f9:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 43591c07b2..c55755f824 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -10,7 +10,7 @@ #include -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_host); XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg); /**************************************/ @@ -57,8 +57,10 @@ NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) : NetworkModel(Model::UpdateAlgo::FULL), hostModel_(hmodel) { set_maxmin_system(sys); - loopback_ = NetworkL07Model::create_link("__loopback__", std::vector{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() @@ -70,7 +72,7 @@ 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); + 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,7 +86,7 @@ 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.get_latency() > 0) { if (action.get_latency() > delta) { @@ -142,7 +144,7 @@ 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) */ @@ -185,9 +187,16 @@ 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(), (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 (size_t k = 0; k < host_list.size() * host_list.size(); k++) { @@ -210,8 +219,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,48 +229,27 @@ 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::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, const std::vector& bandwidths, - double latency, s4u::Link::SharingPolicy policy) + s4u::Link::SharingPolicy policy) { xbt_assert(bandwidths.size() == 1, "Non WIFI link must have only 1 bandwidth."); - return new LinkL07(this, name, bandwidths[0], latency, policy); + return new LinkL07(name, bandwidths[0], policy, get_maxmin_system()); } /************ * 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) -{ -} - -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()); -} - kernel::resource::CpuAction* CpuL07::execution_start(double size) { - std::vector host_list = {get_host()}; + std::vector host_list = {get_iface()}; - double* flops_amount = new double[host_list.size()](); + auto* flops_amount = new double[host_list.size()](); flops_amount[0] = size; kernel::resource::CpuAction* res = @@ -272,7 +260,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)); 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 +268,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()); } @@ -293,7 +281,7 @@ void CpuL07::on_speed_change() 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()); + const kernel::resource::Action* action = var->get_id(); get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak); } @@ -301,7 +289,18 @@ 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()); } @@ -317,11 +316,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 { @@ -360,8 +359,9 @@ 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) { + latency_check(value); const kernel::lmm::Variable* var; L07Action *action; const kernel::lmm::Element* elem = nullptr; @@ -371,6 +371,7 @@ void LinkL07::set_latency(double value) action = static_cast(var->get_id()); action->updateBound(); } + return this; } LinkL07::~LinkL07() = default; @@ -415,5 +416,5 @@ void L07Action::updateBound() } } -} -} +} // namespace surf +} // namespace simgrid