X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7bc340a73928fe73a57a9664aeba0cf5a92b654c..bde09a7b53c62986d6f22b10de50dec039b4f96a:/src/surf/network_ib.cpp diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp index 4752d1af39..1fba58db12 100644 --- a/src/surf/network_ib.cpp +++ b/src/surf/network_ib.cpp @@ -1,74 +1,55 @@ -/* Copyright (c) 2014-2017. The SimGrid Team. -*All rights reserved. */ +/* Copyright (c) 2014-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 - -#include "simgrid/sg_config.h" -#include "src/surf/HostImpl.hpp" #include "src/surf/network_ib.hpp" +#include "simgrid/sg_config.hpp" +#include "src/surf/HostImpl.hpp" #include "src/surf/xml/platf.hpp" -#include "surf/maxmin.hpp" +#include "surf/surf.hpp" + #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 void IB_create_host_callback(simgrid::s4u::Host const& host) +{ + using simgrid::kernel::resource::IBNode; + using simgrid::kernel::resource::NetworkIBModel; static int id=0; - // pour t->id -> rajouter une nouvelle struct dans le dict, pour stocker les comms actives - - IBNode* act = new IBNode(id); + ((NetworkIBModel*)surf_network_model)->active_nodes.emplace(host.get_name(), IBNode(id)); id++; - ((NetworkIBModel*)surf_network_model)->active_nodes.insert({host.getName(), act}); } -static void IB_action_state_changed_callback(simgrid::surf::NetworkAction* action) +static void IB_action_state_changed_callback(simgrid::kernel::resource::NetworkAction& action, + simgrid::kernel::resource::Action::State /*previous*/) { - using simgrid::surf::NetworkIBModel; - using simgrid::surf::IBNode; + using simgrid::kernel::resource::IBNode; + using simgrid::kernel::resource::NetworkIBModel; - if (action->getState() != simgrid::surf::Action::State::done) + if (action.get_state() != simgrid::kernel::resource::Action::State::FINISHED) return; - std::pair pair = ((NetworkIBModel*)surf_network_model)->active_comms[action]; - XBT_DEBUG("IB callback - action %p finished", action); + 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); + ((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, +static void IB_action_init_callback(simgrid::kernel::resource::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->getName()); - if (asrc != ibModel->active_nodes.end()) { - act_src = asrc->second; - } else { - throw std::out_of_range(std::string("Could not find '") + src->getCname() + "' active comms !"); - } - - auto adst = ibModel->active_nodes.find(dst->getName()); - if (adst != ibModel->active_nodes.end()) { - act_dst = adst->second; - } else { - throw std::out_of_range(std::string("Could not find '") + dst->getCname() + "' active comms !"); - } - - ibModel->active_comms[action]=std::make_pair(act_src, act_dst); + simgrid::kernel::resource::NetworkIBModel* ibModel = (simgrid::kernel::resource::NetworkIBModel*)surf_network_model; + simgrid::kernel::resource::IBNode* act_src = &ibModel->active_nodes.at(src->get_name()); + simgrid::kernel::resource::IBNode* act_dst = &ibModel->active_nodes.at(dst->get_name()); - ibModel->updateIBfactors(action, act_src, act_dst, 0); + ibModel->active_comms[&action] = std::make_pair(act_src, act_dst); + ibModel->updateIBfactors(&action, act_src, act_dst, 0); } /********* @@ -87,24 +68,24 @@ static void IB_action_init_callback(simgrid::surf::NetworkAction* action, simgri /* } */ void surf_network_model_init_IB() { - if (surf_network_model) - return; - - 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); + xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice"); + surf_network_model = new simgrid::kernel::resource::NetworkIBModel(); + simgrid::s4u::Link::on_communication_state_change.connect(IB_action_state_changed_callback); + simgrid::s4u::Link::on_communicate.connect(IB_action_init_callback); + simgrid::s4u::Host::on_creation.connect(IB_create_host_callback); + simgrid::config::set_default("network/weight-S", 8775); } namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { NetworkIBModel::NetworkIBModel() : NetworkSmpiModel() { - std::string IB_factors_string = xbt_cfg_get_string("smpi/IB-penalty-factors"); + /* Do not add this into all_existing_models: our ancestor already does so */ + + 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(";")); @@ -113,32 +94,26 @@ NetworkIBModel::NetworkIBModel() : NetworkSmpiModel() try { Be = std::stod(radical_elements.front()); - } catch (std::invalid_argument& ia) { + } 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) { + } 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) { + } 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() -{ - for (auto const& instance : active_nodes) - delete instance.second; -} - void NetworkIBModel::computeIBfactors(IBNode* root) { - double num_comm_out = static_cast(root->ActiveCommsUp.size()); + double num_comm_out = root->ActiveCommsUp.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) { @@ -164,7 +139,7 @@ void NetworkIBModel::computeIBfactors(IBNode* root) double penalty = std::max(my_penalty_in, max_penalty_out); - double rate_before_update = (*it)->action->getBound(); + double rate_before_update = (*it)->action->get_bound(); // save initial rate of the action if ((*it)->init_rate == -1) (*it)->init_rate = rate_before_update; @@ -173,8 +148,8 @@ void NetworkIBModel::computeIBfactors(IBNode* root) 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->getBound(), (*it)->init_rate); - maxminSystem_->update_variable_bound((*it)->action->getVariable(), penalized_bw); + (*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); } 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); @@ -205,7 +180,6 @@ void NetworkIBModel::updateIBfactors(NetworkAction* action, IBNode* from, IBNode if (from == to) // disregard local comms (should use loopback) return; - ActiveComm* comm = nullptr; if (remove) { if (to->ActiveCommsDown[from] == 1) to->ActiveCommsDown.erase(from); @@ -215,7 +189,7 @@ void NetworkIBModel::updateIBfactors(NetworkAction* action, IBNode* from, IBNode to->nbActiveCommsDown--; for (std::vector::iterator it = from->ActiveCommsUp.begin(); it != from->ActiveCommsUp.end(); ++it) { if ((*it)->action == action) { - comm = (*it); + delete *it; from->ActiveCommsUp.erase(it); break; } @@ -235,7 +209,7 @@ void NetworkIBModel::updateIBfactors(NetworkAction* action, IBNode* from, IBNode std::vector updated(active_nodes.size(), false); updateIBfactors_rec(from, updated); XBT_DEBUG("IB - Finished updating %d", from->id); - delete comm; -} -} } +} // namespace resource +} // namespace kernel +} // namespace simgrid