X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d9966aa66acc63c0417fbeae8e3ff12bccb0cdb0..985cb4f936f5d78428b12093010b8a99a6c31187:/src/surf/network_ib.cpp diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp index edc43236c5..3445c11bc8 100644 --- a/src/surf/network_ib.cpp +++ b/src/surf/network_ib.cpp @@ -1,24 +1,22 @@ -/* Copyright (c) 2014-2017. The SimGrid Team. -*All rights reserved. */ +/* Copyright (c) 2014-2018. 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/kernel/lmm/maxmin.hpp" -#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/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; + 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 @@ -26,15 +24,15 @@ static void IB_create_host_callback(simgrid::s4u::Host& host){ IBNode* act = new IBNode(id); id++; - ((NetworkIBModel*)surf_network_model)->active_nodes.insert({host.getName(), act}); + ((NetworkIBModel*)surf_network_model)->active_nodes.insert({host.get_name(), act}); } -static void IB_action_state_changed_callback(simgrid::surf::NetworkAction* action) +static void IB_action_state_changed_callback(simgrid::kernel::resource::NetworkAction* action) { - using simgrid::surf::NetworkIBModel; - using simgrid::surf::IBNode; + using simgrid::kernel::resource::IBNode; + using simgrid::kernel::resource::NetworkIBModel; - if (action->getState() != simgrid::kernel::resource::Action::State::done) + 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); @@ -45,25 +43,25 @@ static void IB_action_state_changed_callback(simgrid::surf::NetworkAction* actio } -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; + simgrid::kernel::resource::NetworkIBModel* ibModel = (simgrid::kernel::resource::NetworkIBModel*)surf_network_model; + simgrid::kernel::resource::IBNode* act_src; + simgrid::kernel::resource::IBNode* act_dst; - auto asrc = ibModel->active_nodes.find(src->getName()); + 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->getCname() + "' active comms !"); + throw std::out_of_range(std::string("Could not find '") + src->get_cname() + "' active comms !"); } - auto adst = ibModel->active_nodes.find(dst->getName()); + 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->getCname() + "' active comms !"); + 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); @@ -90,21 +88,21 @@ void surf_network_model_init_IB() if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkIBModel(); + surf_network_model = new simgrid::kernel::resource::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); - + 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"); + std::string IB_factors_string = simgrid::config::get_value("smpi/IB-penalty-factors"); std::vector radical_elements; boost::split(radical_elements, IB_factors_string, boost::is_any_of(";")); @@ -164,7 +162,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 +171,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); @@ -239,3 +237,4 @@ void NetworkIBModel::updateIBfactors(NetworkAction* action, IBNode* from, IBNode } } } +} // namespace simgrid