-/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2023. 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 "simgrid/s4u/Host.hpp"
#include "simgrid/sg_config.hpp"
#include "src/kernel/EngineImpl.hpp"
+#include "src/kernel/resource/StandardLinkImpl.hpp"
+#include "src/kernel/resource/WifiLinkImpl.hpp"
#include "src/kernel/resource/profile/Event.hpp"
-#include "src/surf/network_wifi.hpp"
#include "src/surf/surf_interface.hpp"
-#include "surf/surf.hpp"
#include <algorithm>
#include <numeric>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network);
-double sg_latency_factor = 1.0; /* default value; can be set by model or from command line */
-double sg_bandwidth_factor = 1.0; /* default value; can be set by model or from command line */
-double sg_weight_S_parameter = 0.0; /* default value; can be set by model or from command line */
+/***********
+ * Options *
+ ***********/
+static simgrid::config::Flag<std::string> cfg_network_solver("network/solver",
+ "Set linear equations solver used by network model",
+ "maxmin", &simgrid::kernel::lmm::System::validate_solver);
/************************************************************************/
/* New model based on optimizations discussed during Pedro Velho's thesis*/
void surf_network_model_init_LegrandVelho()
{
auto net_model = std::make_shared<simgrid::kernel::resource::NetworkCm02Model>("Network_LegrandVelho");
- simgrid::kernel::EngineImpl::get_instance()->add_model(net_model);
- simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model);
+ auto* engine = simgrid::kernel::EngineImpl::get_instance();
+ engine->add_model(net_model);
+ engine->get_netzone_root()->set_network_model(net_model);
- simgrid::config::set_default<double>("network/latency-factor", 13.01);
- simgrid::config::set_default<double>("network/bandwidth-factor", 0.97);
+ simgrid::config::set_default<std::string>("network/latency-factor", "13.01");
+ simgrid::config::set_default<std::string>("network/bandwidth-factor", "0.97");
simgrid::config::set_default<double>("network/weight-S", 20537);
}
/* } */
void surf_network_model_init_CM02()
{
- simgrid::config::set_default<double>("network/latency-factor", 1.0);
- simgrid::config::set_default<double>("network/bandwidth-factor", 1.0);
+ simgrid::config::set_default<std::string>("network/latency-factor", "1.0");
+ simgrid::config::set_default<std::string>("network/bandwidth-factor", "1.0");
simgrid::config::set_default<double>("network/weight-S", 0.0);
auto net_model = std::make_shared<simgrid::kernel::resource::NetworkCm02Model>("Network_CM02");
- simgrid::kernel::EngineImpl::get_instance()->add_model(net_model);
- simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model);
+ auto* engine = simgrid::kernel::EngineImpl::get_instance();
+ engine->add_model(net_model);
+ engine->get_netzone_root()->set_network_model(net_model);
}
-namespace simgrid {
-namespace kernel {
-namespace resource {
+/********************************************************************/
+/* Model based on LV08 and experimental results of MPI ping-pongs */
+/********************************************************************/
+/* @Inproceedings{smpi_ipdps, */
+/* author={Pierre-Nicolas Clauss and Mark Stillwell and Stéphane Genaud and Frédéric Suter and Henri Casanova and
+ * Martin Quinson}, */
+/* title={Single Node On-Line Simulation of {MPI} Applications with SMPI}, */
+/* booktitle={25th IEEE International Parallel and Distributed Processing Symposium (IPDPS'11)}, */
+/* address={Anchorage (Alaska) USA}, */
+/* month=may, */
+/* year={2011} */
+/* } */
+void surf_network_model_init_SMPI()
+{
+ auto net_model = std::make_shared<simgrid::kernel::resource::NetworkCm02Model>("Network_SMPI");
+ auto* engine = simgrid::kernel::EngineImpl::get_instance();
+ engine->add_model(net_model);
+ engine->get_netzone_root()->set_network_model(net_model);
+
+ simgrid::config::set_default<double>("network/weight-S", 8775);
+ simgrid::config::set_default<std::string>("network/bandwidth-factor",
+ "65472:0.940694;15424:0.697866;9376:0.58729;5776:1.08739;3484:0.77493;"
+ "1426:0.608902;732:0.341987;257:0.338112;0:0.812084");
+ simgrid::config::set_default<std::string>("network/latency-factor",
+ "65472:11.6436;15424:3.48845;9376:2.59299;5776:2.18796;3484:1.88101;"
+ "1426:1.61075;732:1.9503;257:1.95341;0:2.01467");
+}
+
+namespace simgrid::kernel::resource {
NetworkCm02Model::NetworkCm02Model(const std::string& name) : NetworkModel(name)
{
select = true;
}
- set_maxmin_system(new lmm::System(select));
- loopback_ = create_link("__loopback__", std::vector<double>{config::get_value<double>("network/loopback-bw")})
- ->set_sharing_policy(s4u::Link::SharingPolicy::FATPIPE)
- ->set_latency(config::get_value<double>("network/loopback-lat"));
- loopback_->seal();
-}
-
-void NetworkCm02Model::check_lat_factor_cb()
-{
- if (not simgrid::config::is_default("network/latency-factor")) {
- throw std::invalid_argument(
- "NetworkModelIntf: Cannot mix network/latency-factor and callback configuration. Choose only one of them.");
- }
-}
-
-void NetworkCm02Model::check_bw_factor_cb()
-{
- if (not simgrid::config::is_default("network/bandwidth-factor")) {
- throw std::invalid_argument(
- "NetworkModelIntf: Cannot mix network/bandwidth-factor and callback configuration. Choose only one of them.");
- }
-}
-
-void NetworkCm02Model::set_lat_factor_cb(const std::function<NetworkFactorCb>& cb)
-{
- if (not cb)
- throw std::invalid_argument("NetworkModelIntf: Invalid callback");
- check_lat_factor_cb();
+ set_maxmin_system(lmm::System::build(cfg_network_solver.get(), select));
- lat_factor_cb_ = cb;
+ loopback_.reset(create_link("__loopback__", {config::get_value<double>("network/loopback-bw")}));
+ loopback_->set_sharing_policy(s4u::Link::SharingPolicy::FATPIPE, {});
+ loopback_->set_latency(config::get_value<double>("network/loopback-lat"));
+ loopback_->get_iface()->seal();
}
-void NetworkCm02Model::set_bw_factor_cb(const std::function<NetworkFactorCb>& cb)
-{
- if (not cb)
- throw std::invalid_argument("NetworkModelIntf: Invalid callback");
- check_bw_factor_cb();
-
- bw_factor_cb_ = cb;
-}
-
-LinkImpl* NetworkCm02Model::create_link(const std::string& name, const std::vector<double>& bandwidths)
+StandardLinkImpl* NetworkCm02Model::create_link(const std::string& name, const std::vector<double>& bandwidths)
{
xbt_assert(bandwidths.size() == 1, "Non-WIFI links must use only 1 bandwidth.");
- return (new NetworkCm02Link(name, bandwidths[0], get_maxmin_system()))->set_model(this);
+ auto link = new NetworkCm02Link(name, bandwidths[0], get_maxmin_system());
+ link->set_model(this);
+ return link;
}
-LinkImpl* NetworkCm02Model::create_wifi_link(const std::string& name, const std::vector<double>& bandwidths)
+StandardLinkImpl* NetworkCm02Model::create_wifi_link(const std::string& name, const std::vector<double>& bandwidths)
{
- return (new NetworkWifiLink(name, bandwidths, get_maxmin_system()))->set_model(this);
+ auto link = new WifiLinkImpl(name, bandwidths, get_maxmin_system());
+ link->set_model(this);
+ return link;
}
void NetworkCm02Model::update_actions_state_lazy(double now, double /*delta*/)
auto& action = static_cast<NetworkCm02Action&>(*it);
++it; // increment iterator here since the following calls to action.finish() may invalidate it
XBT_DEBUG("Something happened to action %p", &action);
- double deltap = delta;
if (action.latency_ > 0) {
- if (action.latency_ > deltap) {
- double_update(&action.latency_, deltap, sg_surf_precision);
- deltap = 0.0;
+ if (action.latency_ > delta) {
+ double_update(&action.latency_, delta, sg_surf_precision);
} else {
- double_update(&deltap, action.latency_, sg_surf_precision);
action.latency_ = 0.0;
}
if (action.latency_ <= 0.0 && not action.is_suspended())
*/
action.update_remains(action.get_remains());
}
- action.update_remains(action.get_variable()->get_value() * delta);
+ action.update_remains(action.get_rate() * delta);
if (action.get_max_duration() != NO_MAX_DURATION)
action.update_max_duration(delta);
}
}
-Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
+void NetworkCm02Model::comm_action_expand_constraints(const s4u::Host* src, const s4u::Host* dst,
+ const NetworkCm02Action* action,
+ const std::vector<StandardLinkImpl*>& route,
+ const std::vector<StandardLinkImpl*>& back_route) const
{
- double latency = 0.0;
- std::vector<LinkImpl*> back_route;
- std::vector<LinkImpl*> route;
- std::unordered_set<kernel::routing::NetZoneImpl*> netzones;
-
- XBT_IN("(%s,%s,%g,%g)", src->get_cname(), dst->get_cname(), size, rate);
+ /* expand route links constraints for route and back_route */
+ const WifiLinkImpl* src_wifi_link = nullptr;
+ const WifiLinkImpl* dst_wifi_link = nullptr;
+ if (not route.empty() && route.front()->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
+ src_wifi_link = static_cast<WifiLinkImpl*>(route.front());
+ }
+ if (route.size() > 1 && route.back()->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
+ dst_wifi_link = static_cast<WifiLinkImpl*>(route.back());
+ }
- kernel::routing::NetZoneImpl::get_global_route_with_netzones(src->get_netpoint(), dst->get_netpoint(), route,
- &latency, netzones);
+ /* WI-FI links needs special treatment, do it here */
+ if (src_wifi_link != nullptr) {
+ if (src_wifi_link->get_host_rate(src) > 0)
+ get_maxmin_system()->expand(src_wifi_link->get_constraint(), action->get_variable(),
+ 1.0 / src_wifi_link->get_host_rate(src));
+ else {
+ get_maxmin_system()->update_variable_penalty(action->get_variable(), 0);
+ }
+ }
- xbt_assert(not route.empty() || latency > 0,
- "You're trying to send data from %s to %s but there is no connecting path between these two hosts.",
- src->get_cname(), dst->get_cname());
+ if (dst_wifi_link != nullptr) {
+ if (dst_wifi_link->get_host_rate(dst) > 0)
+ get_maxmin_system()->expand(dst_wifi_link->get_constraint(), action->get_variable(),
+ 1.0 / dst_wifi_link->get_host_rate(dst));
+ else {
+ get_maxmin_system()->update_variable_penalty(action->get_variable(), 0);
+ }
+ }
- bool failed = std::any_of(route.begin(), route.end(), [](const LinkImpl* link) { return not link->is_on(); });
+ for (auto const* link : route) {
+ if (link->get_sharing_policy() != s4u::Link::SharingPolicy::WIFI)
+ get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0);
+ }
if (cfg_crosstraffic) {
- dst->route_to(src, back_route, nullptr);
- if (not failed)
- failed =
- std::any_of(back_route.begin(), back_route.end(), [](const LinkImpl* link) { return not link->is_on(); });
+ XBT_DEBUG("Crosstraffic active: adding backward flow using 5%% of the available bandwidth");
+ if (dst_wifi_link != nullptr)
+ get_maxmin_system()->expand(dst_wifi_link->get_constraint(), action->get_variable(),
+ .05 / dst_wifi_link->get_host_rate(dst));
+ if (src_wifi_link != nullptr)
+ get_maxmin_system()->expand(src_wifi_link->get_constraint(), action->get_variable(),
+ .05 / src_wifi_link->get_host_rate(src));
+
+ for (auto const* link : back_route) {
+ if (link->get_sharing_policy() != s4u::Link::SharingPolicy::WIFI)
+ get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), .05);
+ }
}
+}
- NetworkWifiLink* src_wifi_link = nullptr;
- NetworkWifiLink* dst_wifi_link = nullptr;
+NetworkCm02Action* NetworkCm02Model::comm_action_create(s4u::Host* src, s4u::Host* dst, double size,
+ const std::vector<StandardLinkImpl*>& route, bool failed)
+{
+ WifiLinkImpl* src_wifi_link = nullptr;
+ WifiLinkImpl* dst_wifi_link = nullptr;
+ /* many checks related to Wi-Fi links */
if (not route.empty() && route.front()->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
- src_wifi_link = static_cast<NetworkWifiLink*>(route.front());
+ src_wifi_link = static_cast<WifiLinkImpl*>(route.front());
xbt_assert(src_wifi_link->get_host_rate(src) != -1,
"The route from %s to %s begins with the WIFI link %s, but the host %s does not seem attached to that "
"WIFI link. Did you call link->set_host_rate()?",
src->get_cname(), dst->get_cname(), src_wifi_link->get_cname(), src->get_cname());
}
if (route.size() > 1 && route.back()->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
- dst_wifi_link = static_cast<NetworkWifiLink*>(route.back());
+ dst_wifi_link = static_cast<WifiLinkImpl*>(route.back());
xbt_assert(dst_wifi_link->get_host_rate(dst) != -1,
"The route from %s to %s ends with the WIFI link %s, but the host %s does not seem attached to that "
"WIFI link. Did you call link->set_host_rate()?",
"Did you declare an access_point in your WIFI zones?",
route[i]->get_cname(), src->get_cname(), dst->get_cname(), i + 1, route.size());
+ for (auto const* link : route) {
+ if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
+ xbt_assert(link == src_wifi_link || link == dst_wifi_link,
+ "Wifi links can only occur at the beginning of the route (meaning that it's attached to the src) or "
+ "at its end (meaning that it's attached to the dst");
+ }
+ }
+
+ /* create action and do some initializations */
NetworkCm02Action* action;
if (src_wifi_link == nullptr && dst_wifi_link == nullptr)
action = new NetworkCm02Action(this, *src, *dst, size, failed);
else
- action = new NetworkWifiAction(this, *src, *dst, size, failed, src_wifi_link, dst_wifi_link);
- action->sharing_penalty_ = latency;
- action->latency_ = latency;
- action->set_user_bound(rate);
+ action = new WifiLinkAction(this, *src, *dst, size, failed, src_wifi_link, dst_wifi_link);
if (is_update_lazy()) {
action->set_last_update();
}
- if (sg_weight_S_parameter > 0) {
- action->sharing_penalty_ =
- std::accumulate(route.begin(), route.end(), action->sharing_penalty_, [](double total, LinkImpl* const& link) {
- return total + sg_weight_S_parameter / link->get_bandwidth();
- });
+ return action;
+}
+
+bool NetworkCm02Model::comm_get_route_info(const s4u::Host* src, const s4u::Host* dst, double& latency,
+ std::vector<StandardLinkImpl*>& route,
+ std::vector<StandardLinkImpl*>& back_route,
+ std::unordered_set<kernel::routing::NetZoneImpl*>& netzones) const
+{
+ kernel::routing::NetZoneImpl::get_global_route_with_netzones(src->get_netpoint(), dst->get_netpoint(), route,
+ &latency, netzones);
+
+ xbt_assert(not route.empty() || latency > 0,
+ "You're trying to send data from %s to %s but there is no connecting path between these two hosts.",
+ src->get_cname(), dst->get_cname());
+
+ bool failed = std::any_of(route.begin(), route.end(), [](const StandardLinkImpl* link) { return not link->is_on(); });
+
+ if (not failed && cfg_crosstraffic) {
+ dst->route_to(src, back_route, nullptr);
+ failed = std::any_of(back_route.begin(), back_route.end(),
+ [](const StandardLinkImpl* link) { return not link->is_on(); });
+ }
+ return failed;
+}
+
+void NetworkCm02Model::comm_action_set_bounds(const s4u::Host* src, const s4u::Host* dst, double size,
+ NetworkCm02Action* action, const std::vector<StandardLinkImpl*>& route,
+ const std::unordered_set<kernel::routing::NetZoneImpl*>& netzones,
+ double rate) const
+{
+ std::vector<s4u::Link*> s4u_route;
+ std::unordered_set<s4u::NetZone*> s4u_netzones;
+
+ /* transform data to user structures if necessary */
+ if (has_network_factor_cb()) {
+ std::for_each(route.begin(), route.end(),
+ [&s4u_route](StandardLinkImpl* l) { s4u_route.push_back(l->get_iface()); });
+ std::for_each(netzones.begin(), netzones.end(),
+ [&s4u_netzones](kernel::routing::NetZoneImpl* n) { s4u_netzones.insert(n->get_iface()); });
}
- double bandwidth_bound = route.empty() ? -1.0 : get_bandwidth_factor(size) * route.front()->get_bandwidth();
+ double bw_factor = get_bandwidth_factor(size, src, dst, s4u_route, s4u_netzones);
+ xbt_assert(bw_factor != 0, "Invalid param for comm %s -> %s. Bandwidth factor cannot be 0", src->get_cname(),
+ dst->get_cname());
+ action->set_rate_factor(bw_factor);
+
+ /* get mininum bandwidth among links in the route and multiply by correct factor
+ * ignore wi-fi links, they're not considered for bw_factors */
+ double bandwidth_bound = -1.0;
+ for (const auto* l : route) {
+ if (l->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI)
+ continue;
+ if (bandwidth_bound == -1.0 || l->get_bandwidth() < bandwidth_bound)
+ bandwidth_bound = l->get_bandwidth();
+ }
- for (auto const& link : route)
- bandwidth_bound = std::min(bandwidth_bound, get_bandwidth_factor(size) * link->get_bandwidth());
+ /* increase rate given by user considering the factor, since the actual rate will be
+ * modified by it */
+ rate = rate / bw_factor;
+ /* the bandwidth is determined by the minimum between flow and user's defined rate */
+ if (rate >= 0 && rate < bandwidth_bound)
+ bandwidth_bound = rate;
+ action->set_user_bound(bandwidth_bound);
action->lat_current_ = action->latency_;
- action->latency_ *= get_latency_factor(size);
- action->set_user_bound(get_bandwidth_constraint(action->get_user_bound(), bandwidth_bound, size));
+ action->latency_ *= get_latency_factor(size, src, dst, s4u_route, s4u_netzones);
+}
+void NetworkCm02Model::comm_action_set_variable(NetworkCm02Action* action, const std::vector<StandardLinkImpl*>& route,
+ const std::vector<StandardLinkImpl*>& back_route, bool streamed)
+{
size_t constraints_per_variable = route.size();
constraints_per_variable += back_route.size();
+ if (streamed) {
+ // setting the number of variable for a communication action involved in a I/O streaming operation
+ // requires to reserve some extra space for the constraints related to the source disk (global and read
+ // bandwidth) and destination disk (global and write bandwidth). We thus add 4 constraints.
+ constraints_per_variable += 4;
+ }
if (action->latency_ > 0) {
action->set_variable(get_maxmin_system()->variable_new(action, 0.0, -1.0, constraints_per_variable));
} else
action->set_variable(get_maxmin_system()->variable_new(action, 1.0, -1.0, constraints_per_variable));
+ /* after setting the variable, update the bounds depending on user configuration */
if (action->get_user_bound() < 0) {
get_maxmin_system()->update_variable_bound(
action->get_variable(), (action->lat_current_ > 0) ? cfg_tcp_gamma / (2.0 * action->lat_current_) : -1.0);
? std::min(action->get_user_bound(), cfg_tcp_gamma / (2.0 * action->lat_current_))
: action->get_user_bound());
}
+}
- if (src_wifi_link != nullptr)
- get_maxmin_system()->expand(src_wifi_link->get_constraint(), action->get_variable(),
- 1.0 / src_wifi_link->get_host_rate(src));
- if (dst_wifi_link != nullptr)
- get_maxmin_system()->expand(dst_wifi_link->get_constraint(), action->get_variable(),
- 1.0 / dst_wifi_link->get_host_rate(dst));
+Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate, bool streamed)
+{
+ double latency = 0.0;
+ std::vector<StandardLinkImpl*> back_route;
+ std::vector<StandardLinkImpl*> route;
+ std::unordered_set<kernel::routing::NetZoneImpl*> netzones;
- for (auto const* link : route) {
- // WIFI links are handled manually just above, so skip them now
- if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
- xbt_assert(link == src_wifi_link || link == dst_wifi_link,
- "Wifi links can only occur at the beginning of the route (meaning that it's attached to the src) or "
- "at its end (meaning that it's attached to the dst");
- } else {
- get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0);
- }
- }
+ XBT_IN("(%s,%s,%g,%g)", src->get_cname(), dst->get_cname(), size, rate);
- if (cfg_crosstraffic) {
- XBT_DEBUG("Crosstraffic active: adding backward flow using 5%% of the available bandwidth");
- if (dst_wifi_link != nullptr)
- get_maxmin_system()->expand(dst_wifi_link->get_constraint(), action->get_variable(),
- .05 / dst_wifi_link->get_host_rate(dst));
- if (src_wifi_link != nullptr)
- get_maxmin_system()->expand(src_wifi_link->get_constraint(), action->get_variable(),
- .05 / src_wifi_link->get_host_rate(src));
- for (auto const* link : back_route)
- if (link->get_sharing_policy() != s4u::Link::SharingPolicy::WIFI)
- get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), .05);
- // Change concurrency_share here, if you want that cross-traffic is included in the SURF concurrency
- // (You would also have to change simgrid::kernel::lmm::Element::get_concurrency())
- // action->getVariable()->set_concurrency_share(2)
+ bool failed = comm_get_route_info(src, dst, latency, route, back_route, netzones);
+
+ NetworkCm02Action* action = comm_action_create(src, dst, size, route, failed);
+ action->sharing_penalty_ = latency;
+ action->latency_ = latency;
+
+ if (cfg_weight_S_parameter > 0) {
+ action->sharing_penalty_ = std::accumulate(route.begin(), route.end(), action->sharing_penalty_,
+ [](double total, StandardLinkImpl* const& link) {
+ return total + cfg_weight_S_parameter / link->get_bandwidth();
+ });
}
+
+ /* setting bandwidth and latency bounds considering route and configured bw/lat factors */
+ comm_action_set_bounds(src, dst, size, action, route, netzones, rate);
+
+ /* creating the maxmin variable associated to this action */
+ comm_action_set_variable(action, route, back_route, streamed);
+
+ /* expand maxmin system to consider this communication in bw constraint for each link in route and back_route */
+ comm_action_expand_constraints(src, dst, action, route, back_route);
XBT_OUT();
- simgrid::s4u::Link::on_communicate(*action);
return action;
}
* Resource *
************/
NetworkCm02Link::NetworkCm02Link(const std::string& name, double bandwidth, kernel::lmm::System* system)
- : LinkImpl(name)
+ : StandardLinkImpl(name)
{
bandwidth_.scale = 1.0;
bandwidth_.peak = bandwidth;
- this->set_constraint(system->constraint_new(this, sg_bandwidth_factor * bandwidth));
+ this->set_constraint(system->constraint_new(this, bandwidth));
}
void NetworkCm02Link::apply_event(kernel::profile::Event* triggered, double value)
set_latency(value);
tmgr_trace_event_unref(&latency_.event);
- } else if (triggered == state_event_) {
+ } else if (triggered == get_state_event()) {
if (value > 0)
turn_on();
else
turn_off();
- tmgr_trace_event_unref(&state_event_);
+ unref_state_event();
} else {
xbt_die("Unknown event!\n");
}
void NetworkCm02Link::set_bandwidth(double value)
{
+ double old_peak = bandwidth_.peak;
bandwidth_.peak = value;
- get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(),
- sg_bandwidth_factor * (bandwidth_.peak * bandwidth_.scale));
+ get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), (bandwidth_.peak * bandwidth_.scale));
- LinkImpl::on_bandwidth_change();
+ StandardLinkImpl::on_bandwidth_change();
- if (sg_weight_S_parameter > 0) {
- double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (bandwidth_.peak * bandwidth_.scale);
+ if (NetworkModel::cfg_weight_S_parameter > 0) {
+ double delta = NetworkModel::cfg_weight_S_parameter / (bandwidth_.peak * bandwidth_.scale) -
+ NetworkModel::cfg_weight_S_parameter / (old_peak * bandwidth_.scale);
const kernel::lmm::Element* elem = nullptr;
const kernel::lmm::Element* nextelem = nullptr;
- int numelem = 0;
+ size_t numelem = 0;
while (const auto* var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem)) {
auto* action = static_cast<NetworkCm02Action*>(var->get_id());
action->sharing_penalty_ += delta;
}
}
-LinkImpl* NetworkCm02Link::set_latency(double value)
+void NetworkCm02Link::set_latency(double value)
{
latency_check(value);
double delta = value - latency_.peak;
const kernel::lmm::Element* elem = nullptr;
const kernel::lmm::Element* nextelem = nullptr;
- int numelem = 0;
+ size_t numelem = 0;
latency_.scale = 1.0;
latency_.peak = value;
std::min(action->get_user_bound(), NetworkModel::cfg_tcp_gamma / (2.0 * action->lat_current_)));
if (action->get_user_bound() < NetworkModel::cfg_tcp_gamma / (2.0 * action->lat_current_)) {
- XBT_INFO("Flow is limited BYBANDWIDTH");
+ XBT_DEBUG("Flow is limited BYBANDWIDTH");
} else {
- XBT_INFO("Flow is limited BYLATENCY, latency of flow is %f", action->lat_current_);
+ XBT_DEBUG("Flow is limited BYLATENCY, latency of flow is %f", action->lat_current_);
}
}
if (not action->is_suspended())
get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), action->sharing_penalty_);
}
- return this;
}
/**********
}
set_last_update();
- set_last_value(get_variable()->get_value());
+ set_last_value(get_rate());
}
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::resource
