X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b1801e7056930569752cf33757134cb44d32cfac..6c56800bdad43cabb6c870c9163bbeea694d6692:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 056d773712..c18d8d759b 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -1,64 +1,50 @@ -/* 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 + #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(surf_network, surf, "Logging specific to the SURF network module"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_network, ker_resource, "Network resources, that fuel communications"); /********* * Model * *********/ -simgrid::kernel::resource::NetworkModel* surf_network_model = nullptr; - namespace simgrid { namespace kernel { 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"}, +/** @brief Command-line option 'network/TCP-gamma' -- see @ref options_model_network_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( +/** @brief Command-line option 'network/crosstraffic' -- see @ref options_model_network_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*/) +double NetworkModel::next_occurring_event_full(double now) { - 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_occuring_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_); } @@ -68,126 +54,62 @@ double NetworkModel::next_occuring_event_full(double now) return minRes; } -/************ - * Resource * - ************/ - -LinkImpl::LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint) - : Resource(model, name, constraint), 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()); -} +/********** + * Action * + **********/ -/** @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() +void NetworkAction::set_state(Action::State state) { - if (not currently_destroying_) { - currently_destroying_ = true; - s4u::Link::on_destruction(this->piface_); - delete this; + Action::State previous = get_state(); + if (previous != state) { // Trigger only if the state changed + Action::set_state(state); + s4u::Link::on_communication_state_change(*this, previous); } } -bool LinkImpl::is_used() -{ - return get_model()->get_maxmin_system()->constraint_used(get_constraint()); -} - -double LinkImpl::get_latency() -{ - return latency_.peak * latency_.scale; -} - -double LinkImpl::get_bandwidth() -{ - return bandwidth_.peak * bandwidth_.scale; -} - -s4u::Link::SharingPolicy LinkImpl::get_sharing_policy() +/** @brief returns a list of all Links that this action is using */ +std::list NetworkAction::get_links() const { - return get_constraint()->get_sharing_policy(); -} + std::list retlist; + int llen = get_variable()->get_number_of_constraint(); -void LinkImpl::turn_on() -{ - if (is_off()) { - Resource::turn_on(); - s4u::Link::on_state_change(this->piface_); + for (int i = 0; i < llen; i++) { + /* Beware of composite actions: ptasks put links and cpus together */ + if (auto* link = dynamic_cast(get_variable()->get_constraint(i)->get_id())) + retlist.push_back(link); } -} -void LinkImpl::turn_off() -{ - if (is_on()) { - Resource::turn_off(); - s4u::Link::on_state_change(this->piface_); - } + return retlist; } -void LinkImpl::on_bandwidth_change() +static void add_latency(const std::vector& links, double* latency) { - s4u::Link::on_bandwidth_change(this->piface_); + if (latency) + *latency = std::accumulate(begin(links), end(links), *latency, + [](double lat, const auto* link) { return lat + link->get_latency(); }); } -void LinkImpl::set_bandwidth_trace(tmgr_trace_t trace) +void add_link_latency(std::vector& result, LinkImpl* link, double* latency) { - 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); + result.push_back(link); + if (latency) + *latency += link->get_latency(); } -void LinkImpl::set_latency_trace(tmgr_trace_t trace) +void add_link_latency(std::vector& result, const std::vector& links, double* latency) { - 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); + result.insert(result.end(), begin(links), end(links)); + add_latency(links, latency); } -/********** - * Action * - **********/ - -void NetworkAction::set_state(Action::State state) +void insert_link_latency(std::vector& result, const std::vector& links, double* latency) { - Action::State previous = get_state(); - Action::set_state(state); - if (previous != state) // Trigger only if the state changed - s4u::Link::on_communication_state_change(this, previous); + result.insert(result.begin(), rbegin(links), rend(links)); + add_latency(links, latency); } -/** @brief returns a list of all Links that this action is using */ -std::list NetworkAction::links() -{ - std::list retlist; - int llen = get_variable()->get_number_of_constraint(); - - 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); - if (link != nullptr) - retlist.push_back(link); - } - - return retlist; -} -} +} // namespace resource } // namespace kernel -} +} // namespace simgrid #endif /* NETWORK_INTERFACE_CPP_ */