X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3056e7eed34d3b9ec18341b4c4279071bc6b428c..ebc355d0c96552d0bc2aa301d90723490337bca3:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 52ebc62c91..2f78a0de72 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -9,7 +9,6 @@ #include "network_cm02.hpp" #include "simgrid/s4u/Host.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" @@ -35,11 +34,9 @@ double sg_weight_S_parameter = 0.0; /* default value; can be set by model or /* } */ void surf_network_model_init_LegrandVelho() { - if (surf_network_model) - return; + xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice"); surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(); - all_existing_models->push_back(surf_network_model); simgrid::config::set_default("network/latency-factor", 13.01); simgrid::config::set_default("network/bandwidth-factor", 0.97); @@ -59,16 +56,13 @@ void surf_network_model_init_LegrandVelho() /* } */ void surf_network_model_init_CM02() { - - if (surf_network_model) - return; + xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice"); simgrid::config::set_default("network/latency-factor", 1.0); simgrid::config::set_default("network/bandwidth-factor", 1.0); simgrid::config::set_default("network/weight-S", 0.0); surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(); - all_existing_models->push_back(surf_network_model); } /***************************************************************************/ @@ -83,10 +77,9 @@ void surf_network_model_init_CM02() /* } */ void surf_network_model_init_Reno() { - if (surf_network_model) - return; + xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice"); - using namespace simgrid::kernel; + namespace lmm = simgrid::kernel::lmm; lmm::Lagrange::set_default_protocol_function(lmm::func_reno_f, lmm::func_reno_fp, lmm::func_reno_fpi); simgrid::config::set_default("network/latency-factor", 13.01); @@ -94,16 +87,14 @@ void surf_network_model_init_Reno() simgrid::config::set_default("network/weight-S", 20537); surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system); - all_existing_models->push_back(surf_network_model); } void surf_network_model_init_Reno2() { - if (surf_network_model) - return; + xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice"); - using namespace simgrid::kernel; + namespace lmm = simgrid::kernel::lmm; lmm::Lagrange::set_default_protocol_function(lmm::func_reno2_f, lmm::func_reno2_fp, lmm::func_reno2_fpi); simgrid::config::set_default("network/latency-factor", 13.01); @@ -111,15 +102,13 @@ void surf_network_model_init_Reno2() simgrid::config::set_default("network/weight-S", 20537); surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system); - all_existing_models->push_back(surf_network_model); } void surf_network_model_init_Vegas() { - if (surf_network_model) - return; + xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice"); - using namespace simgrid::kernel; + namespace lmm = simgrid::kernel::lmm; lmm::Lagrange::set_default_protocol_function(lmm::func_vegas_f, lmm::func_vegas_fp, lmm::func_vegas_fpi); simgrid::config::set_default("network/latency-factor", 13.01); @@ -127,7 +116,6 @@ void surf_network_model_init_Vegas() simgrid::config::set_default("network/weight-S", 20537); surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system); - all_existing_models->push_back(surf_network_model); } namespace simgrid { @@ -135,9 +123,11 @@ namespace kernel { namespace resource { NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(bool)) - : NetworkModel(simgrid::config::get_value("network/optim") == "Full" ? Model::UpdateAlgo::Full - : Model::UpdateAlgo::Lazy) + : NetworkModel(simgrid::config::get_value("network/optim") == "Full" ? Model::UpdateAlgo::FULL + : Model::UpdateAlgo::LAZY) { + all_existing_models.push_back(this); + std::string optim = simgrid::config::get_value("network/optim"); bool select = simgrid::config::get_value("network/maxmin-selective-update"); @@ -148,11 +138,11 @@ NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(b } set_maxmin_system(make_new_lmm_system(select)); - loopback_ = NetworkCm02Model::createLink("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE); + loopback_ = NetworkCm02Model::create_link("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE); } -LinkImpl* NetworkCm02Model::createLink(const std::string& name, double bandwidth, double latency, - s4u::Link::SharingPolicy policy) +LinkImpl* NetworkCm02Model::create_link(const std::string& name, double bandwidth, double latency, + s4u::Link::SharingPolicy policy) { return new NetworkCm02Link(this, name, bandwidth, latency, policy, get_maxmin_system()); } @@ -163,17 +153,6 @@ void NetworkCm02Model::update_actions_state_lazy(double now, double /*delta*/) NetworkCm02Action* action = static_cast(get_action_heap().pop()); XBT_DEBUG("Something happened to action %p", action); - if (TRACE_is_enabled()) { - int n = action->get_variable()->get_number_of_constraint(); - - for (int i = 0; i < n; i++){ - kernel::lmm::Constraint* constraint = action->get_variable()->get_constraint(i); - NetworkCm02Link* link = static_cast(constraint->get_id()); - double value = action->get_variable()->get_value() * action->get_variable()->get_constraint_weight(i); - TRACE_surf_link_set_utilization(link->get_cname(), action->get_category(), value, action->get_last_update(), - now - action->get_last_update()); - } - } // if I am wearing a latency hat if (action->get_type() == ActionHeap::Type::latency) { @@ -187,15 +166,15 @@ void NetworkCm02Model::update_actions_state_lazy(double now, double /*delta*/) // no need to communicate anymore // assume that flows that reached max_duration have remaining of 0 XBT_DEBUG("Action %p finished", action); - action->finish(Action::State::done); + action->finish(Action::State::FINISHED); get_action_heap().remove(action); } } } -void NetworkCm02Model::update_actions_state_full(double now, double delta) +void NetworkCm02Model::update_actions_state_full(double /*now*/, double delta) { - for (auto it = std::begin(*get_running_action_set()); it != std::end(*get_running_action_set());) { + for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) { NetworkCm02Action& action = static_cast(*it); ++it; // increment iterator here since the following calls to action.finish() may invalidate it XBT_DEBUG("Something happened to action %p", &action); @@ -211,17 +190,7 @@ void NetworkCm02Model::update_actions_state_full(double now, double delta) if (action.latency_ <= 0.0 && not action.is_suspended()) get_maxmin_system()->update_variable_weight(action.get_variable(), action.weight_); } - if (TRACE_is_enabled()) { - int n = action.get_variable()->get_number_of_constraint(); - for (int i = 0; i < n; i++) { - kernel::lmm::Constraint* constraint = action.get_variable()->get_constraint(i); - NetworkCm02Link* link = static_cast(constraint->get_id()); - TRACE_surf_link_set_utilization( - link->get_cname(), action.get_category(), - (action.get_variable()->get_value() * action.get_variable()->get_constraint_weight(i)), - action.get_last_update(), now - action.get_last_update()); - } - } + if (not action.get_variable()->get_number_of_constraint()) { /* There is actually no link used, hence an infinite bandwidth. This happens often when using models like * vivaldi. In such case, just make sure that the action completes immediately. @@ -230,67 +199,68 @@ void NetworkCm02Model::update_actions_state_full(double now, double delta) } action.update_remains(action.get_variable()->get_value() * delta); - if (action.get_max_duration() > NO_MAX_DURATION) + if (action.get_max_duration() != NO_MAX_DURATION) action.update_max_duration(delta); if (((action.get_remains() <= 0) && (action.get_variable()->get_weight() > 0)) || - ((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { - action.finish(Action::State::done); + ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { + action.finish(Action::State::FINISHED); } } } Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) { - bool failed = false; double latency = 0.0; std::vector back_route; std::vector route; XBT_IN("(%s,%s,%g,%g)", src->get_cname(), dst->get_cname(), size, rate); - src->routeTo(dst, route, &latency); - xbt_assert(not route.empty() || latency, + src->route_to(dst, route, &latency); + xbt_assert(not route.empty() || latency > 0, "You're trying to send data from %s to %s but there is no connecting path between these two hosts.", src->get_cname(), dst->get_cname()); - failed = std::any_of(route.begin(), route.end(), [](LinkImpl* link) { return link->is_off(); }); + bool failed = std::any_of(route.begin(), route.end(), [](const LinkImpl* link) { return not link->is_on(); }); if (cfg_crosstraffic) { - dst->routeTo(src, back_route, nullptr); - failed = std::any_of(back_route.begin(), back_route.end(), [](LinkImpl* const& link) { return link->is_off(); }); + dst->route_to(src, back_route, nullptr); + if (not failed) + failed = + std::any_of(back_route.begin(), back_route.end(), [](const LinkImpl* link) { return not link->is_on(); }); } NetworkCm02Action *action = new NetworkCm02Action(this, size, failed); action->weight_ = latency; action->latency_ = latency; action->rate_ = rate; - if (get_update_algorithm() == Model::UpdateAlgo::Lazy) { + if (get_update_algorithm() == Model::UpdateAlgo::LAZY) { action->set_last_update(); } if (sg_weight_S_parameter > 0) { action->weight_ = std::accumulate(route.begin(), route.end(), action->weight_, [](double total, LinkImpl* const& link) { - return total + sg_weight_S_parameter / link->bandwidth(); + return total + sg_weight_S_parameter / link->get_bandwidth(); }); } - double bandwidth_bound = route.empty() ? -1.0 : bandwidthFactor(size) * route.front()->bandwidth(); + double bandwidth_bound = route.empty() ? -1.0 : get_bandwidth_factor(size) * route.front()->get_bandwidth(); for (auto const& link : route) - bandwidth_bound = std::min(bandwidth_bound, bandwidthFactor(size) * link->bandwidth()); + bandwidth_bound = std::min(bandwidth_bound, get_bandwidth_factor(size) * link->get_bandwidth()); action->lat_current_ = action->latency_; - action->latency_ *= latencyFactor(size); - action->rate_ = bandwidthConstraint(action->rate_, bandwidth_bound, size); + action->latency_ *= get_latency_factor(size); + action->rate_ = get_bandwidth_constraint(action->rate_, bandwidth_bound, size); - int constraints_per_variable = route.size(); + size_t constraints_per_variable = route.size(); constraints_per_variable += back_route.size(); if (action->latency_ > 0) { action->set_variable(get_maxmin_system()->variable_new(action, 0.0, -1.0, constraints_per_variable)); - if (get_update_algorithm() == Model::UpdateAlgo::Lazy) { + if (get_update_algorithm() == Model::UpdateAlgo::LAZY) { // add to the heap the event when the latency is payed double date = action->latency_ + action->get_last_update(); @@ -326,7 +296,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz } XBT_OUT(); - simgrid::s4u::Link::onCommunicate(action, src, dst); + simgrid::s4u::Link::on_communicate(action, src, dst); return action; } @@ -346,21 +316,21 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& nam if (policy == s4u::Link::SharingPolicy::FATPIPE) get_constraint()->unshare(); - simgrid::s4u::Link::onCreation(this->piface_); + simgrid::s4u::Link::on_creation(this->piface_); } -void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value) +void NetworkCm02Link::apply_event(kernel::profile::Event* triggered, double value) { /* Find out which of my iterators was triggered, and react accordingly */ if (triggered == bandwidth_.event) { - setBandwidth(value); + set_bandwidth(value); tmgr_trace_event_unref(&bandwidth_.event); } else if (triggered == latency_.event) { - setLatency(value); + set_latency(value); tmgr_trace_event_unref(&latency_.event); - } else if (triggered == stateEvent_) { + } else if (triggered == state_event_) { if (value > 0) turn_on(); else { @@ -372,13 +342,13 @@ void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value) while ((var = get_constraint()->get_variable(&elem))) { Action* action = static_cast(var->get_id()); - if (action->get_state() == Action::State::running || action->get_state() == Action::State::ready) { + if (action->get_state() == Action::State::INITED || action->get_state() == Action::State::STARTED) { action->set_finish_time(now); - action->set_state(Action::State::failed); + action->set_state(Action::State::FAILED); } } } - tmgr_trace_event_unref(&stateEvent_); + tmgr_trace_event_unref(&state_event_); } else { xbt_die("Unknown event!\n"); } @@ -387,14 +357,14 @@ void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value) get_constraint()); } -void NetworkCm02Link::setBandwidth(double value) +void NetworkCm02Link::set_bandwidth(double value) { bandwidth_.peak = value; get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), sg_bandwidth_factor * (bandwidth_.peak * bandwidth_.scale)); - TRACE_surf_link_set_bandwidth(surf_get_clock(), get_cname(), - sg_bandwidth_factor * bandwidth_.peak * bandwidth_.scale); + + LinkImpl::on_bandwidth_change(); if (sg_weight_S_parameter > 0) { double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (bandwidth_.peak * bandwidth_.scale); @@ -412,7 +382,7 @@ void NetworkCm02Link::setBandwidth(double value) } } -void NetworkCm02Link::setLatency(double value) +void NetworkCm02Link::set_latency(double value) { double delta = value - latency_.peak; kernel::lmm::Variable* var = nullptr; @@ -454,7 +424,6 @@ void NetworkCm02Action::update_remains_lazy(double now) return; double delta = now - get_last_update(); - double max_duration = get_max_duration(); if (get_remains_no_update() > 0) { XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, get_remains_no_update(), @@ -464,14 +433,11 @@ void NetworkCm02Action::update_remains_lazy(double now) XBT_DEBUG("Updating action(%p): remains is now %f", this, get_remains_no_update()); } - if (max_duration > NO_MAX_DURATION) { - double_update(&max_duration, delta, sg_surf_precision); - set_max_duration(max_duration); - } + update_max_duration(delta); if ((get_remains_no_update() <= 0 && (get_variable()->get_weight() > 0)) || - ((max_duration > NO_MAX_DURATION) && (max_duration <= 0))) { - finish(Action::State::done); + ((get_max_duration() != NO_MAX_DURATION) && (get_max_duration() <= 0))) { + finish(Action::State::FINISHED); get_model()->get_action_heap().remove(this); }