X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3836e4e27a13a0d389812e41a4d5d651ff0c158b..cf454dfcf7c27e86e15af1a45c58dbb7a76e43c8:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 856c3f9f72..23a464aa33 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -1,62 +1,19 @@ -/* Copyright (c) 2013-2018. 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 "network_interface.hpp" +#include "simgrid/s4u/Engine.hpp" #include "simgrid/sg_config.hpp" +#include "src/kernel/resource/profile/Profile.hpp" #include "src/surf/surf_interface.hpp" +#include "surf/surf.hpp" #ifndef NETWORK_INTERFACE_CPP_ #define NETWORK_INTERFACE_CPP_ -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module"); - -namespace simgrid { -namespace kernel { -namespace resource { - -/* List of links */ -std::unordered_map* LinkImpl::links = new std::unordered_map(); - -LinkImpl* LinkImpl::byName(std::string name) -{ - auto link = links->find(name); - return link == links->end() ? nullptr : link->second; -} -/** @brief Returns the amount of links in the platform */ -int LinkImpl::linksCount() -{ - return links->size(); -} -void LinkImpl::linksList(std::vector* linkList) -{ - for (auto const& kv : *links) { - linkList->push_back(&kv.second->piface_); - } -} - -/** @brief Returns a list of all existing links */ -LinkImpl** LinkImpl::linksList() -{ - LinkImpl** res = xbt_new(LinkImpl*, (int)links->size()); - int i = 0; - for (auto const& kv : *links) { - res[i] = kv.second; - i++; - } - return res; -} -/** @brief destructor of the static data */ -void LinkImpl::linksExit() -{ - for (auto const& kv : *links) - (kv.second)->destroy(); - delete links; -} -} -} -} // namespace simgrid +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_network, ker_resource, "Network resources, that fuels communications"); /********* * Model * @@ -68,41 +25,41 @@ namespace simgrid { namespace kernel { namespace resource { -/** @brief Command-line option 'network/TCP-gamma' -- see \ref options_model_network_gamma */ +/** @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); -/** @brief Command-line option 'network/crosstraffic' -- see \ref options_model_network_crosstraffic */ +/** @brief Command-line option 'network/crosstraffic' -- see @ref options_model_network_crosstraffic */ simgrid::config::Flag NetworkModel::cfg_crosstraffic( "network/crosstraffic", "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)", "yes"); NetworkModel::~NetworkModel() = default; -double NetworkModel::latencyFactor(double /*size*/) +double NetworkModel::get_latency_factor(double /*size*/) { return sg_latency_factor; } -double NetworkModel::bandwidthFactor(double /*size*/) +double NetworkModel::get_bandwidth_factor(double /*size*/) { return sg_bandwidth_factor; } -double NetworkModel::bandwidthConstraint(double rate, double /*bound*/, double /*size*/) +double NetworkModel::get_bandwidth_constraint(double rate, double /*bound*/, double /*size*/) { 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_running_action_set()) { - const NetworkAction& net_action = static_cast(action); + for (Action const& action : *get_started_action_set()) { + const auto& net_action = static_cast(action); if (net_action.latency_ > 0) minRes = (minRes < 0) ? net_action.latency_ : std::min(minRes, net_action.latency_); } @@ -116,86 +73,109 @@ 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 LinkImpl::byName(name), "Link '%s' declared several times in the platform.", name.c_str()); + xbt_assert(not s4u::Link::by_name_or_null(name), "Link '%s' declared several times in the platform.", name.c_str()); latency_.scale = 1; bandwidth_.scale = 1; - links->insert({name, this}); + s4u::Engine::get_instance()->link_register(name, &piface_); XBT_DEBUG("Create link '%s'", name.c_str()); } -/** @brief use destroy() instead of this destructor */ -LinkImpl::~LinkImpl() -{ - xbt_assert(currentlyDestroying_, "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 currentlyDestroying_) { - currentlyDestroying_ = true; - s4u::Link::onDestruction(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::latency() +double LinkImpl::get_latency() const { return latency_.peak * latency_.scale; } -double LinkImpl::bandwidth() +double LinkImpl::get_bandwidth() const { return bandwidth_.peak * bandwidth_.scale; } -s4u::Link::SharingPolicy LinkImpl::sharingPolicy() +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 (is_off()) { + if (not is_on()) { Resource::turn_on(); - s4u::Link::onStateChange(this->piface_); + s4u::Link::on_state_change(this->piface_); } } + void LinkImpl::turn_off() { if (is_on()) { Resource::turn_off(); - s4u::Link::onStateChange(this->piface_); + s4u::Link::on_state_change(this->piface_); + + 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 = 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); + } + } } } -void LinkImpl::setStateTrace(tmgr_trace_t trace) + +void LinkImpl::seal() { - xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Link %s", get_cname()); - stateEvent_ = future_evt_set->add_trace(trace, this); + this->set_model(surf_network_model); + Resource::seal(); + simgrid::s4u::Link::on_creation(*get_iface()); } -void LinkImpl::setBandwidthTrace(tmgr_trace_t trace) + +void LinkImpl::on_bandwidth_change() const { - xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth trace to Link %s", get_cname()); - bandwidth_.event = future_evt_set->add_trace(trace, this); + s4u::Link::on_bandwidth_change(this->piface_); } -void LinkImpl::setLatencyTrace(tmgr_trace_t trace) + +void LinkImpl::set_bandwidth_profile(profile::Profile* profile) +{ + xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth profile to Link %s", get_cname()); + bandwidth_.event = profile->schedule(&profile::future_evt_set, this); +} + +void LinkImpl::set_latency_profile(profile::Profile* profile) { - xbt_assert(latency_.event == nullptr, "Cannot set a second latency trace to Link %s", get_cname()); - latency_.event = future_evt_set->add_trace(trace, this); + xbt_assert(latency_.event == nullptr, "Cannot set a second latency profile to Link %s", get_cname()); + latency_.event = profile->schedule(&profile::future_evt_set, this); } /********** @@ -204,12 +184,14 @@ void LinkImpl::setLatencyTrace(tmgr_trace_t trace) void NetworkAction::set_state(Action::State state) { + Action::State previous = get_state(); Action::set_state(state); - s4u::Link::onCommunicationStateChange(this); + if (previous != state) // Trigger only if the state changed + s4u::Link::on_communication_state_change(*this, previous); } /** @brief returns a list of all Links that this action is using */ -std::list NetworkAction::links() +std::list NetworkAction::get_links() const { std::list retlist; int llen = get_variable()->get_number_of_constraint(); @@ -217,8 +199,8 @@ std::list NetworkAction::links() for (int i = 0; i < llen; i++) { /* Beware of composite actions: ptasks put links and cpus together */ // extra pb: we cannot dynamic_cast from void*... - Resource* resource = static_cast(get_variable()->get_constraint(i)->get_id()); - LinkImpl* link = dynamic_cast(resource); + Resource* resource = get_variable()->get_constraint(i)->get_id(); + auto* link = dynamic_cast(resource); if (link != nullptr) retlist.push_back(link); }