X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d70f95ee9e74e70bbf4932bef39ae76fb592fbd..6c56800bdad43cabb6c870c9163bbeea694d6692:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 31147f7890..c18d8d759b 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -3,17 +3,19 @@ /* 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 + #include "simgrid/sg_config.hpp" #include "src/kernel/resource/profile/Profile.hpp" +#include "src/surf/network_interface.hpp" #include "src/surf/surf_interface.hpp" -#include "surf/surf.hpp" + +#include #ifndef NETWORK_INTERFACE_CPP_ #define NETWORK_INTERFACE_CPP_ -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_network, ker_resource, "Network resources, that fuels communications"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_network, ker_resource, "Network resources, that fuel communications"); /********* * Model * @@ -24,34 +26,19 @@ namespace kernel { namespace resource { /** @brief Command-line option 'network/TCP-gamma' -- see @ref options_model_network_gamma */ -simgrid::config::Flag NetworkModel::cfg_tcp_gamma( +config::Flag NetworkModel::cfg_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 */ -simgrid::config::Flag NetworkModel::cfg_crosstraffic( +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::get_latency_factor(double /*size*/) -{ - return sg_latency_factor; -} - -double NetworkModel::get_bandwidth_factor(double /*size*/) -{ - return sg_bandwidth_factor; -} - -double NetworkModel::get_bandwidth_constraint(double rate, double /*bound*/, double /*size*/) -{ - return rate; -} - double NetworkModel::next_occurring_event_full(double now) { double minRes = Model::next_occurring_event_full(now); @@ -67,114 +54,6 @@ double NetworkModel::next_occurring_event_full(double now) return minRes; } -/************ - * Resource * - ************/ - -LinkImpl::LinkImpl(const std::string& name) : Resource_T(name), piface_(this) -{ - if (name != "__loopback__") - 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; - - s4u::Engine::get_instance()->link_register(name, &piface_); - XBT_DEBUG("Create link '%s'", name.c_str()); -} - -/** @brief Fire the required callbacks and destroy the object - * - * Don't delete directly a Link, call l->destroy() instead. - */ -void LinkImpl::destroy() -{ - s4u::Link::on_destruction(this->piface_); - delete this; -} - -bool LinkImpl::is_used() const -{ - return get_model()->get_maxmin_system()->constraint_used(get_constraint()); -} - -double LinkImpl::get_latency() const -{ - return latency_.peak * latency_.scale; -} - -double LinkImpl::get_bandwidth() const -{ - return bandwidth_.peak * bandwidth_.scale; -} - -s4u::Link::SharingPolicy LinkImpl::get_sharing_policy() const -{ - return get_constraint()->get_sharing_policy(); -} - -void LinkImpl::latency_check(double latency) const -{ - 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()) { - Resource::turn_on(); - s4u::Link::on_state_change(this->piface_); - } -} - -void LinkImpl::turn_off() -{ - if (is_on()) { - Resource::turn_off(); - 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::seal() -{ - xbt_assert(this->get_model(), "Cannot seal Link(%s) without setting the Network model first", this->get_cname()); - Resource::seal(); - simgrid::s4u::Link::on_creation(*get_iface()); -} - -void LinkImpl::on_bandwidth_change() const -{ - s4u::Link::on_bandwidth_change(this->piface_); -} - -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 profile to Link %s", get_cname()); - latency_.event = profile->schedule(&profile::future_evt_set, this); -} - /********** * Action * **********/ @@ -182,9 +61,10 @@ void LinkImpl::set_latency_profile(profile::Profile* profile) void NetworkAction::set_state(Action::State state) { Action::State previous = get_state(); - Action::set_state(state); - if (previous != state) // Trigger only if the state changed + if (previous != state) { // Trigger only if the state changed + Action::set_state(state); s4u::Link::on_communication_state_change(*this, previous); + } } /** @brief returns a list of all Links that this action is using */ @@ -195,17 +75,41 @@ std::list NetworkAction::get_links() const 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 = get_variable()->get_constraint(i)->get_id(); - auto* link = dynamic_cast(resource); - if (link != nullptr) + if (auto* link = dynamic_cast(get_variable()->get_constraint(i)->get_id())) retlist.push_back(link); } return retlist; } + +static void add_latency(const std::vector& links, double* latency) +{ + if (latency) + *latency = std::accumulate(begin(links), end(links), *latency, + [](double lat, const auto* link) { return lat + link->get_latency(); }); } -} // namespace kernel + +void add_link_latency(std::vector& result, LinkImpl* link, double* latency) +{ + result.push_back(link); + if (latency) + *latency += link->get_latency(); } +void add_link_latency(std::vector& result, const std::vector& links, double* latency) +{ + result.insert(result.end(), begin(links), end(links)); + add_latency(links, latency); +} + +void insert_link_latency(std::vector& result, const std::vector& links, double* latency) +{ + result.insert(result.begin(), rbegin(links), rend(links)); + add_latency(links, latency); +} + +} // namespace resource +} // namespace kernel +} // namespace simgrid + #endif /* NETWORK_INTERFACE_CPP_ */