X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17c819afc4ceda4000eec137c8fee35168253b4d..a3963d5d61399ccf9810d0ce1745432afede2069:/src/surf/network_ib.cpp diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp index ee9d50edb0..c62ea553cc 100644 --- a/src/surf/network_ib.cpp +++ b/src/surf/network_ib.cpp @@ -1,10 +1,12 @@ -/* Copyright (c) 2014-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2014-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 "src/surf/network_ib.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/sg_config.hpp" +#include "src/kernel/EngineImpl.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/xml/platf.hpp" #include "surf/surf.hpp" @@ -12,62 +14,7 @@ #include #include -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); - -static void IB_create_host_callback(simgrid::s4u::Host& host){ - using simgrid::surf::NetworkIBModel; - using simgrid::surf::IBNode; - - static int id=0; - // pour t->id -> rajouter une nouvelle struct dans le dict, pour stocker les comms actives - - IBNode* act = new IBNode(id); - - id++; - ((NetworkIBModel*)surf_network_model)->active_nodes.insert({host.get_name(), act}); -} - -static void IB_action_state_changed_callback(simgrid::surf::NetworkAction* action) -{ - using simgrid::surf::NetworkIBModel; - using simgrid::surf::IBNode; - - if (action->get_state() != simgrid::kernel::resource::Action::State::done) - return; - std::pair pair = ((NetworkIBModel*)surf_network_model)->active_comms[action]; - XBT_DEBUG("IB callback - action %p finished", action); - - ((NetworkIBModel*)surf_network_model)->updateIBfactors(action, pair.first, pair.second, 1); - - ((NetworkIBModel*)surf_network_model)->active_comms.erase(action); - -} - -static void IB_action_init_callback(simgrid::surf::NetworkAction* action, simgrid::s4u::Host* src, - simgrid::s4u::Host* dst) -{ - simgrid::surf::NetworkIBModel* ibModel = (simgrid::surf::NetworkIBModel*)surf_network_model; - simgrid::surf::IBNode* act_src; - simgrid::surf::IBNode* act_dst; - - auto asrc = ibModel->active_nodes.find(src->get_name()); - if (asrc != ibModel->active_nodes.end()) { - act_src = asrc->second; - } else { - throw std::out_of_range(std::string("Could not find '") + src->get_cname() + "' active comms !"); - } - - auto adst = ibModel->active_nodes.find(dst->get_name()); - if (adst != ibModel->active_nodes.end()) { - act_dst = adst->second; - } else { - throw std::out_of_range(std::string("Could not find '") + dst->get_cname() + "' active comms !"); - } - - ibModel->active_comms[action]=std::make_pair(act_src, act_dst); - - ibModel->updateIBfactors(action, act_src, act_dst, 0); -} +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network); /********* * Model * @@ -85,24 +32,55 @@ static void IB_action_init_callback(simgrid::surf::NetworkAction* action, simgri /* } */ void surf_network_model_init_IB() { - if (surf_network_model) - return; + using simgrid::kernel::resource::NetworkIBModel; - surf_network_model = new simgrid::surf::NetworkIBModel(); - all_existing_models->push_back(surf_network_model); - simgrid::s4u::Link::onCommunicationStateChange.connect(IB_action_state_changed_callback); - simgrid::s4u::Link::onCommunicate.connect(IB_action_init_callback); - simgrid::s4u::Host::onCreation.connect(IB_create_host_callback); - xbt_cfg_setdefault_double("network/weight-S", 8775); + auto net_model = std::make_shared("Network_IB"); + simgrid::kernel::EngineImpl::get_instance()->add_model(net_model); + simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model); + simgrid::s4u::Link::on_communication_state_change.connect(NetworkIBModel::IB_action_state_changed_callback); + simgrid::s4u::Link::on_communicate.connect(NetworkIBModel::IB_action_init_callback); + simgrid::s4u::Host::on_creation.connect(NetworkIBModel::IB_create_host_callback); + simgrid::config::set_default("network/weight-S", 8775); } namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { + +void NetworkIBModel::IB_create_host_callback(s4u::Host const& host) +{ + static int id = 0; + auto* ibModel = static_cast(host.get_netpoint()->get_englobing_zone()->get_network_model().get()); + ibModel->active_nodes.emplace(host.get_name(), IBNode(id)); + id++; +} + +void NetworkIBModel::IB_action_state_changed_callback(NetworkAction& action, Action::State /*previous*/) +{ + if (action.get_state() != Action::State::FINISHED) + return; + auto* ibModel = static_cast(action.get_model()); + std::pair pair = ibModel->active_comms[&action]; -NetworkIBModel::NetworkIBModel() : NetworkSmpiModel() + XBT_DEBUG("IB callback - action %p finished", &action); + ibModel->update_IB_factors(&action, pair.first, pair.second, 1); + ibModel->active_comms.erase(&action); +} + +void NetworkIBModel::IB_action_init_callback(NetworkAction& action) +{ + auto* ibModel = static_cast(action.get_model()); + auto* act_src = &ibModel->active_nodes.at(action.get_src().get_name()); + auto* act_dst = &ibModel->active_nodes.at(action.get_dst().get_name()); + + ibModel->active_comms[&action] = std::make_pair(act_src, act_dst); + ibModel->update_IB_factors(&action, act_src, act_dst, 0); +} + +NetworkIBModel::NetworkIBModel(const std::string& name) : NetworkSmpiModel(name) { - std::string IB_factors_string = xbt_cfg_get_string("smpi/IB-penalty-factors"); + std::string IB_factors_string = config::get_value("smpi/IB-penalty-factors"); std::vector radical_elements; boost::split(radical_elements, IB_factors_string, boost::is_any_of(";")); @@ -110,130 +88,122 @@ NetworkIBModel::NetworkIBModel() : NetworkSmpiModel() "elements, semi-colon separated. Example: 0.965;0.925;1.35"); try { - Be = std::stod(radical_elements.front()); - } catch (std::invalid_argument& ia) { + Be_ = std::stod(radical_elements.front()); + } catch (const std::invalid_argument& ia) { throw std::invalid_argument(std::string("First part of smpi/IB-penalty-factors is not numerical:") + ia.what()); } try { - Bs = std::stod(radical_elements.at(1)); - } catch (std::invalid_argument& ia) { + Bs_ = std::stod(radical_elements.at(1)); + } catch (const std::invalid_argument& ia) { throw std::invalid_argument(std::string("Second part of smpi/IB-penalty-factors is not numerical:") + ia.what()); } try { - ys = std::stod(radical_elements.back()); - } catch (std::invalid_argument& ia) { + ys_ = std::stod(radical_elements.back()); + } catch (const std::invalid_argument& ia) { throw std::invalid_argument(std::string("Third part of smpi/IB-penalty-factors is not numerical:") + ia.what()); } } -NetworkIBModel::~NetworkIBModel() +void NetworkIBModel::compute_IB_factors(IBNode* root) const { - for (auto const& instance : active_nodes) - delete instance.second; -} - -void NetworkIBModel::computeIBfactors(IBNode* root) -{ - double num_comm_out = static_cast(root->ActiveCommsUp.size()); + size_t num_comm_out = root->active_comms_up_.size(); double max_penalty_out = 0.0; // first, compute all outbound penalties to get their max - for (std::vector::iterator it = root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) { + for (ActiveComm const* comm : root->active_comms_up_) { double my_penalty_out = 1.0; if (num_comm_out != 1) { - if ((*it)->destination->nbActiveCommsDown > 2) // number of comms sent to the receiving node - my_penalty_out = num_comm_out * Bs * ys; + if (comm->destination->nb_active_comms_down_ > 2) // number of comms sent to the receiving node + my_penalty_out = num_comm_out * Bs_ * ys_; else - my_penalty_out = num_comm_out * Bs; + my_penalty_out = num_comm_out * Bs_; } max_penalty_out = std::max(max_penalty_out, my_penalty_out); } - for (std::vector::iterator it = root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) { + for (ActiveComm* comm : root->active_comms_up_) { // compute inbound penalty double my_penalty_in = 1.0; - int nb_comms = (*it)->destination->nbActiveCommsDown; // total number of incoming comms + int nb_comms = comm->destination->nb_active_comms_down_; // total number of incoming comms if (nb_comms != 1) - my_penalty_in = ((*it)->destination->ActiveCommsDown)[root] // number of comm sent to dest by root node - * Be * (*it)->destination->ActiveCommsDown.size(); // number of different nodes sending to dest + my_penalty_in = (comm->destination->active_comms_down_)[root] // number of comm sent to dest by root node + * Be_ * comm->destination->active_comms_down_.size(); // number of different nodes sending to dest double penalty = std::max(my_penalty_in, max_penalty_out); - double rate_before_update = (*it)->action->get_bound(); + double rate_before_update = comm->action->get_bound(); // save initial rate of the action - if ((*it)->init_rate == -1) - (*it)->init_rate = rate_before_update; + if (comm->init_rate == -1) + comm->init_rate = rate_before_update; - double penalized_bw = num_comm_out ? (*it)->init_rate / penalty : (*it)->init_rate; + double penalized_bw = num_comm_out ? comm->init_rate / penalty : comm->init_rate; if (not double_equals(penalized_bw, rate_before_update, sg_surf_precision)) { - XBT_DEBUG("%d->%d action %p penalty updated : bw now %f, before %f , initial rate %f", root->id, - (*it)->destination->id, (*it)->action, penalized_bw, (*it)->action->get_bound(), (*it)->init_rate); - get_maxmin_system()->update_variable_bound((*it)->action->get_variable(), penalized_bw); + XBT_DEBUG("%d->%d action %p penalty updated : bw now %f, before %f , initial rate %f", root->id_, + comm->destination->id_, comm->action, penalized_bw, comm->action->get_bound(), comm->init_rate); + get_maxmin_system()->update_variable_bound(comm->action->get_variable(), penalized_bw); } else { - XBT_DEBUG("%d->%d action %p penalty not updated : bw %f, initial rate %f", root->id, (*it)->destination->id, - (*it)->action, penalized_bw, (*it)->init_rate); + XBT_DEBUG("%d->%d action %p penalty not updated : bw %f, initial rate %f", root->id_, comm->destination->id_, + comm->action, penalized_bw, comm->init_rate); } } XBT_DEBUG("Finished computing IB penalties"); } -void NetworkIBModel::updateIBfactors_rec(IBNode* root, std::vector& updatedlist) +void NetworkIBModel::update_IB_factors_rec(IBNode* root, std::vector& updatedlist) const { - if (not updatedlist[root->id]) { - XBT_DEBUG("IB - Updating rec %d", root->id); - computeIBfactors(root); - updatedlist[root->id] = true; - for (std::vector::iterator it = root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) { - if (not updatedlist[(*it)->destination->id]) - updateIBfactors_rec((*it)->destination, updatedlist); + if (not updatedlist[root->id_]) { + XBT_DEBUG("IB - Updating rec %d", root->id_); + compute_IB_factors(root); + updatedlist[root->id_] = true; + for (ActiveComm const* comm : root->active_comms_up_) { + if (not updatedlist[comm->destination->id_]) + update_IB_factors_rec(comm->destination, updatedlist); } - for (std::map::iterator it = root->ActiveCommsDown.begin(); it != root->ActiveCommsDown.end(); ++it) { - if (not updatedlist[it->first->id]) - updateIBfactors_rec(it->first, updatedlist); + for (std::map::value_type const& comm : root->active_comms_down_) { + if (not updatedlist[comm.first->id_]) + update_IB_factors_rec(comm.first, updatedlist); } } } -void NetworkIBModel::updateIBfactors(NetworkAction* action, IBNode* from, IBNode* to, int remove) +void NetworkIBModel::update_IB_factors(NetworkAction* action, IBNode* from, IBNode* to, int remove) const { if (from == to) // disregard local comms (should use loopback) return; - ActiveComm* comm = nullptr; if (remove) { - if (to->ActiveCommsDown[from] == 1) - to->ActiveCommsDown.erase(from); + if (to->active_comms_down_[from] == 1) + to->active_comms_down_.erase(from); else - to->ActiveCommsDown[from] -= 1; - - to->nbActiveCommsDown--; - for (std::vector::iterator it = from->ActiveCommsUp.begin(); it != from->ActiveCommsUp.end(); ++it) { - if ((*it)->action == action) { - comm = (*it); - from->ActiveCommsUp.erase(it); - break; - } + to->active_comms_down_[from] -= 1; + + to->nb_active_comms_down_--; + auto it = std::find_if(begin(from->active_comms_up_), end(from->active_comms_up_), + [action](const ActiveComm* comm) { return comm->action == action; }); + if (it != std::end(from->active_comms_up_)) { + delete *it; + from->active_comms_up_.erase(it); } action->unref(); } else { action->ref(); - ActiveComm* comm = new ActiveComm(); + auto* comm = new ActiveComm(); comm->action = action; comm->destination = to; - from->ActiveCommsUp.push_back(comm); + from->active_comms_up_.push_back(comm); - to->ActiveCommsDown[from] += 1; - to->nbActiveCommsDown++; + to->active_comms_down_[from] += 1; + to->nb_active_comms_down_++; } - XBT_DEBUG("IB - Updating %d", from->id); + XBT_DEBUG("IB - Updating %d", from->id_); std::vector updated(active_nodes.size(), false); - updateIBfactors_rec(from, updated); - XBT_DEBUG("IB - Finished updating %d", from->id); - delete comm; -} -} + update_IB_factors_rec(from, updated); + XBT_DEBUG("IB - Finished updating %d", from->id_); } +} // namespace resource +} // namespace kernel +} // namespace simgrid