-/* Copyright (c) 2013-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-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 <algorithm>
#include <numeric>
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
+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 */
namespace kernel {
namespace resource {
-NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(bool))
- : NetworkModel(simgrid::config::get_value<std::string>("network/optim") == "Full" ? Model::UpdateAlgo::FULL
- : Model::UpdateAlgo::LAZY)
+NetworkCm02Model::NetworkCm02Model()
+ : NetworkModel(config::get_value<std::string>("network/optim") == "Full" ? Model::UpdateAlgo::FULL
+ : Model::UpdateAlgo::LAZY)
{
all_existing_models.push_back(this);
- std::string optim = simgrid::config::get_value<std::string>("network/optim");
- bool select = simgrid::config::get_value<bool>("network/maxmin-selective-update");
+ std::string optim = config::get_value<std::string>("network/optim");
+ bool select = config::get_value<bool>("network/maxmin-selective-update");
if (optim == "Lazy") {
- xbt_assert(select || simgrid::config::is_default("network/maxmin-selective-update"),
+ xbt_assert(select || config::is_default("network/maxmin-selective-update"),
"You cannot disable network selective update when using the lazy update mechanism");
select = true;
}
- set_maxmin_system(make_new_lmm_system(select));
- loopback_ = NetworkCm02Model::create_link("__loopback__",
- std::vector<double>{simgrid::config::get_value<double>("network/loopback-bw")},
- simgrid::config::get_value<double>("network/loopback-lat"),
- s4u::Link::SharingPolicy::FATPIPE);
+ set_maxmin_system(new lmm::System(select));
+ loopback_ = NetworkCm02Model::create_link("__loopback__",
+ std::vector<double>{config::get_value<double>("network/loopback-bw")},
+ s4u::Link::SharingPolicy::FATPIPE)
+ ->set_latency(config::get_value<double>("network/loopback-lat"));
+ loopback_->seal();
}
-LinkImpl* NetworkCm02Model::create_link(const std::string& name, const std::vector<double>& bandwidths, double latency,
+LinkImpl* NetworkCm02Model::create_link(const std::string& name, const std::vector<double>& bandwidths,
s4u::Link::SharingPolicy policy)
{
if (policy == s4u::Link::SharingPolicy::WIFI)
- return new NetworkWifiLink(this, name, bandwidths, get_maxmin_system());
+ return (new NetworkWifiLink(name, bandwidths, get_maxmin_system()))->set_model(this);
xbt_assert(bandwidths.size() == 1, "Non-WIFI links must use only 1 bandwidth.");
- return new NetworkCm02Link(this, name, bandwidths[0], latency, policy, get_maxmin_system());
+ return (new NetworkCm02Link(name, bandwidths[0], policy, get_maxmin_system()))->set_model(this);
}
void NetworkCm02Model::update_actions_state_lazy(double now, double /*delta*/)
get_maxmin_system()->expand(dst_wifi_link->get_constraint(), action->get_variable(),
1.0 / dst_wifi_link->get_host_rate(dst));
- for (auto const& link : route) {
+ 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,
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)
+ 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
/************
* Resource *
************/
-NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency,
- s4u::Link::SharingPolicy policy, kernel::lmm::System* system)
- : LinkImpl(model, name, system->constraint_new(this, sg_bandwidth_factor * bandwidth))
+NetworkCm02Link::NetworkCm02Link(const std::string& name, double bandwidth, s4u::Link::SharingPolicy policy,
+ kernel::lmm::System* system)
+ : LinkImpl(name)
{
bandwidth_.scale = 1.0;
bandwidth_.peak = bandwidth;
-
- latency_.scale = 1.0;
- latency_.peak = latency;
+ this->set_constraint(system->constraint_new(this, sg_bandwidth_factor * bandwidth));
if (policy == s4u::Link::SharingPolicy::FATPIPE)
get_constraint()->unshare();
-
- simgrid::s4u::Link::on_creation(*get_iface());
}
void NetworkCm02Link::apply_event(kernel::profile::Event* triggered, double value)
}
}
-void NetworkCm02Link::set_latency(double value)
+LinkImpl* NetworkCm02Link::set_latency(double value)
{
+ latency_check(value);
+
double delta = value - latency_.peak;
const kernel::lmm::Variable* var;
const kernel::lmm::Element* elem = nullptr;
const kernel::lmm::Element* nextelem = nullptr;
int numelem = 0;
+ latency_.scale = 1.0;
latency_.peak = value;
while ((var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem))) {
if (not action->is_suspended())
get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), action->sharing_penalty_);
}
+ return this;
}
/**********