X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..cf454dfcf7c27e86e15af1a45c58dbb7a76e43c8:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 54f82296d3..23a464aa33 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2019. 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. */ @@ -13,7 +13,7 @@ #ifndef NETWORK_INTERFACE_CPP_ #define NETWORK_INTERFACE_CPP_ -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_network, ker_resource, "Network resources, that fuels communications"); /********* * Model * @@ -27,7 +27,7 @@ namespace resource { /** @brief Command-line option 'network/TCP-gamma' -- see @ref options_model_network_gamma */ simgrid::config::Flag NetworkModel::cfg_tcp_gamma( - "network/TCP-gamma", {"network/TCP_gamma"}, + "network/TCP-gamma", "Size of the biggest TCP window (cat /proc/sys/net/ipv4/tcp_[rw]mem for recv/send window; " "Use the last given value, which is the max window size)", 4194304.0); @@ -54,12 +54,12 @@ double NetworkModel::get_bandwidth_constraint(double rate, double /*bound*/, dou return rate; } -double NetworkModel::next_occuring_event_full(double now) +double NetworkModel::next_occurring_event_full(double now) { - double minRes = Model::next_occuring_event_full(now); + double minRes = Model::next_occurring_event_full(now); for (Action const& action : *get_started_action_set()) { - const NetworkAction& net_action = static_cast(action); + const auto& net_action = static_cast(action); if (net_action.latency_ > 0) minRes = (minRes < 0) ? net_action.latency_ : std::min(minRes, net_action.latency_); } @@ -73,10 +73,9 @@ double NetworkModel::next_occuring_event_full(double now) * Resource * ************/ -LinkImpl::LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint) - : Resource(model, name, constraint), piface_(this) +LinkImpl::LinkImpl(const std::string& name, lmm::Constraint* constraint) : Resource_T(name), piface_(this) { - + this->set_constraint(constraint); if (name != "__loopback__") xbt_assert(not s4u::Link::by_name_or_null(name), "Link '%s' declared several times in the platform.", name.c_str()); @@ -87,44 +86,47 @@ LinkImpl::LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint XBT_DEBUG("Create link '%s'", name.c_str()); } -/** @brief use destroy() instead of this destructor */ -LinkImpl::~LinkImpl() -{ - xbt_assert(currently_destroying_, "Don't delete Links directly. Call destroy() instead."); -} /** @brief Fire the required callbacks and destroy the object * * Don't delete directly a Link, call l->destroy() instead. */ void LinkImpl::destroy() { - if (not currently_destroying_) { - currently_destroying_ = true; - s4u::Link::on_destruction(this->piface_); - delete this; - } + s4u::Link::on_destruction(this->piface_); + delete this; } -bool LinkImpl::is_used() +bool LinkImpl::is_used() const { return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } -double LinkImpl::get_latency() +double LinkImpl::get_latency() const { return latency_.peak * latency_.scale; } -double LinkImpl::get_bandwidth() +double LinkImpl::get_bandwidth() const { return bandwidth_.peak * bandwidth_.scale; } -s4u::Link::SharingPolicy LinkImpl::get_sharing_policy() +s4u::Link::SharingPolicy LinkImpl::get_sharing_policy() const { return get_constraint()->get_sharing_policy(); } +void LinkImpl::latency_check(double latency) +{ + static double last_warned_latency = sg_surf_precision; + if (latency != 0.0 && latency < last_warned_latency) { + XBT_WARN("Latency for link %s is smaller than surf/precision (%g < %g)." + " For more accuracy, consider setting \"--cfg=surf/precision:%g\".", + get_cname(), latency, sg_surf_precision, latency); + last_warned_latency = latency; + } +} + void LinkImpl::turn_on() { if (not is_on()) { @@ -139,11 +141,11 @@ void LinkImpl::turn_off() Resource::turn_off(); s4u::Link::on_state_change(this->piface_); - kernel::lmm::Variable* var = nullptr; + const kernel::lmm::Variable* var; const kernel::lmm::Element* elem = nullptr; double now = surf_get_clock(); while ((var = get_constraint()->get_variable(&elem))) { - Action* action = static_cast(var->get_id()); + Action* action = var->get_id(); if (action->get_state() == Action::State::INITED || action->get_state() == Action::State::STARTED) { action->set_finish_time(now); action->set_state(Action::State::FAILED); @@ -152,7 +154,14 @@ void LinkImpl::turn_off() } } -void LinkImpl::on_bandwidth_change() +void LinkImpl::seal() +{ + this->set_model(surf_network_model); + Resource::seal(); + simgrid::s4u::Link::on_creation(*get_iface()); +} + +void LinkImpl::on_bandwidth_change() const { s4u::Link::on_bandwidth_change(this->piface_); } @@ -182,7 +191,7 @@ void NetworkAction::set_state(Action::State state) } /** @brief returns a list of all Links that this action is using */ -std::list NetworkAction::links() const +std::list NetworkAction::get_links() const { std::list retlist; int llen = get_variable()->get_number_of_constraint(); @@ -191,7 +200,7 @@ std::list NetworkAction::links() const /* Beware of composite actions: ptasks put links and cpus together */ // extra pb: we cannot dynamic_cast from void*... Resource* resource = get_variable()->get_constraint(i)->get_id(); - LinkImpl* link = dynamic_cast(resource); + auto* link = dynamic_cast(resource); if (link != nullptr) retlist.push_back(link); }