X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ff3ef77d2ef796e7e5e8c384672f3057997cec4b..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 7391e1d8c4..9bdcd82cb2 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -1,11 +1,11 @@ -/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2019. 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/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals #include "src/surf/surf_interface.hpp" #include "surf/surf.hpp" @@ -14,52 +14,6 @@ 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 - /********* * Model * *********/ @@ -70,31 +24,31 @@ 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"}, "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; } @@ -103,7 +57,7 @@ double NetworkModel::next_occuring_event_full(double now) { double minRes = Model::next_occuring_event_full(now); - for (Action const& action : *get_running_action_set()) { + for (Action const& action : *get_started_action_set()) { const NetworkAction& net_action = static_cast(action); if (net_action.latency_ > 0) minRes = (minRes < 0) ? net_action.latency_ : std::min(minRes, net_action.latency_); @@ -123,19 +77,19 @@ LinkImpl::LinkImpl(NetworkModel* model, const std::string& name, lmm::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."); + xbt_assert(currently_destroying_, "Don't delete Links directly. Call destroy() instead."); } /** @brief Fire the required callbacks and destroy the object * @@ -143,8 +97,8 @@ LinkImpl::~LinkImpl() */ void LinkImpl::destroy() { - if (not currentlyDestroying_) { - currentlyDestroying_ = true; + if (not currently_destroying_) { + currently_destroying_ = true; s4u::Link::on_destruction(this->piface_); delete this; } @@ -155,28 +109,29 @@ bool LinkImpl::is_used() return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } -double LinkImpl::latency() +double LinkImpl::get_latency() { return latency_.peak * latency_.scale; } -double LinkImpl::bandwidth() +double LinkImpl::get_bandwidth() { return bandwidth_.peak * bandwidth_.scale; } -s4u::Link::SharingPolicy LinkImpl::sharingPolicy() +s4u::Link::SharingPolicy LinkImpl::get_sharing_policy() { return get_constraint()->get_sharing_policy(); } void LinkImpl::turn_on() { - if (is_off()) { + if (not is_on()) { Resource::turn_on(); s4u::Link::on_state_change(this->piface_); } } + void LinkImpl::turn_off() { if (is_on()) { @@ -187,27 +142,19 @@ void LinkImpl::turn_off() void LinkImpl::on_bandwidth_change() { - if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) - instr::Container::by_name(get_cname()) - ->get_variable("bandwidth") - ->set_event(surf_get_clock(), sg_bandwidth_factor * bandwidth_.scale * bandwidth_.peak); s4u::Link::on_bandwidth_change(this->piface_); } -void LinkImpl::setStateTrace(tmgr_trace_t trace) +void LinkImpl::set_bandwidth_profile(profile::Profile* profile) { - xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Link %s", get_cname()); - stateEvent_ = future_evt_set->add_trace(trace, this); + xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth profile to Link %s", get_cname()); + bandwidth_.event = profile->schedule(&future_evt_set, this); } -void LinkImpl::setBandwidthTrace(tmgr_trace_t trace) -{ - 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); -} -void LinkImpl::setLatencyTrace(tmgr_trace_t trace) + +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(&future_evt_set, this); } /********** @@ -219,7 +166,7 @@ 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 - s4u::Link::on_communication_state_change(this); + s4u::Link::on_communication_state_change(this, previous); } /** @brief returns a list of all Links that this action is using */