X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4ed74ca6d4a744d2956a4f2906c897e1886cefd..403af5e6247ce6452b721f418a5b41e4548efac4:/src/surf/network_ib.cpp diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp index cecdfc8d7e..9f0e10ca24 100644 --- a/src/surf/network_ib.cpp +++ b/src/surf/network_ib.cpp @@ -1,65 +1,75 @@ -/* Copyright (c) 2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2014-2017. 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_ib.hpp" +#include + #include "simgrid/sg_config.h" -#include "maxmin_private.hpp" +#include "src/surf/HostImpl.hpp" +#include "src/surf/maxmin_private.hpp" +#include "src/surf/network_ib.hpp" +#include "src/surf/xml/platf.hpp" +#include +#include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); -static void IB_create_host_callback(sg_platf_host_cbarg_t t){ - +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 - if(((NetworkIBModel*)surf_network_model)->active_nodes==NULL) - ((NetworkIBModel*)surf_network_model)->active_nodes=xbt_dict_new(); - + // pour t->id -> rajouter une nouvelle struct dans le dict, pour stocker les comms actives + IBNode* act = new IBNode(id); id++; - xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes, t->id, act, NULL); - + ((NetworkIBModel*)surf_network_model)->active_nodes.insert({host.getName(), act}); } -static void IB_action_state_changed_callback(NetworkAction *action, e_surf_action_state_t statein, e_surf_action_state_t stateout){ - if(statein!=SURF_ACTION_RUNNING|| stateout!=SURF_ACTION_DONE) +static void IB_action_state_changed_callback(simgrid::surf::NetworkAction* action) +{ + using simgrid::surf::NetworkIBModel; + using simgrid::surf::IBNode; + + if (action->getState() != simgrid::surf::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)->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->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 !"); + } -static void IB_action_init_callback(NetworkAction *action,RoutingEdge *src, RoutingEdge *dst, double size, double rate){ - if(((NetworkIBModel*)surf_network_model)->active_nodes==NULL) - xbt_die("IB comm added, without any node connected !"); - - IBNode* act_src= (IBNode*) xbt_dict_get_or_null(((NetworkIBModel*)surf_network_model)->active_nodes, src->getName()); - if(act_src==NULL) - xbt_die("could not find src node active comms !"); - //act_src->rate=rate; - - IBNode* act_dst= (IBNode*) xbt_dict_get_or_null(((NetworkIBModel*)surf_network_model)->active_nodes, dst->getName()); - if(act_dst==NULL) - xbt_die("could not find dst node active comms !"); - // act_dst->rate=rate; - - ((NetworkIBModel*)surf_network_model)->active_comms[action]=make_pair(act_src, act_dst); - //post the action in the second dist, to retrieve in the other callback - XBT_DEBUG("IB callback - action %p init", action); - - ((NetworkIBModel*)surf_network_model)->updateIBfactors(action, act_src, act_dst, 0); - -} + 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); + ibModel->updateIBfactors(action, act_src, act_dst, 0); +} /********* * Model * @@ -75,152 +85,159 @@ static void IB_action_init_callback(NetworkAction *action,RoutingEdge *src, Rout /* month=june, */ /* year={2010} */ /* } */ -void surf_network_model_init_IB(void) +void surf_network_model_init_IB() { - if (surf_network_model) return; - surf_network_model = new NetworkIBModel(); - net_define_callbacks(); - xbt_dynar_push(model_list, &surf_network_model); - surf_callback_connect(networkActionStateChangedCallbacks, IB_action_state_changed_callback); - surf_callback_connect(networkCommunicateCallbacks, IB_action_init_callback); - - sg_platf_host_add_cb(IB_create_host_callback); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775); - + + 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); + } -NetworkIBModel::NetworkIBModel() - : NetworkSmpiModel() { - m_haveGap=false; - active_nodes=NULL; - - const char* IB_factors_string=sg_cfg_get_string("smpi/IB_penalty_factors"); - xbt_dynar_t radical_elements = xbt_str_split(IB_factors_string, ";"); - - if(xbt_dynar_length(radical_elements)!=3) - surf_parse_error("smpi/IB_penalty_factors should be provided and contain 3 elements, semi-colon separated : for example 0.965;0.925;1.35"); - - Be = atof(xbt_dynar_get_as(radical_elements, 0, char *)); - Bs = atof(xbt_dynar_get_as(radical_elements, 1, char *)); - ys = atof(xbt_dynar_get_as(radical_elements, 2, char *)); - - xbt_dynar_free(&radical_elements); +namespace simgrid { +namespace surf { + +NetworkIBModel::NetworkIBModel() : NetworkSmpiModel() +{ + std::string IB_factors_string = xbt_cfg_get_string("smpi/IB-penalty-factors"); + std::vector radical_elements; + boost::split(radical_elements, IB_factors_string, boost::is_any_of(";")); + + surf_parse_assert(radical_elements.size() == 3, "smpi/IB-penalty-factors should be provided and contain 3 " + "elements, semi-colon separated. Example: 0.965;0.925;1.35"); + + try { + Be = std::stod(radical_elements.front()); + } catch (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) { + 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) { + throw std::invalid_argument(std::string("Third part of smpi/IB-penalty-factors is not numerical:") + ia.what()); + } } NetworkIBModel::~NetworkIBModel() { - xbt_dict_cursor_t cursor = NULL; - IBNode* instance = NULL; - char *name = NULL; - xbt_dict_foreach(active_nodes, cursor, name, instance) - delete instance; - xbt_dict_free(&active_nodes); + for (auto const& instance : active_nodes) + delete instance.second; } -void NetworkIBModel::computeIBfactors(IBNode *root) { - double penalized_bw=0.0; - double num_comm_out = (double) 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) { +void NetworkIBModel::computeIBfactors(IBNode* root) +{ + double num_comm_out = static_cast(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) { 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 (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; else - my_penalty_out = num_comm_out * Bs; + my_penalty_out = num_comm_out * Bs; } - max_penalty_out = max(max_penalty_out,my_penalty_out); + max_penalty_out = std::max(max_penalty_out, my_penalty_out); } - for (std::vector::iterator it= root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) { - - //compute inbound penalty + for (std::vector::iterator it = root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) { + // compute inbound penalty double my_penalty_in = 1.0; - int nb_comms = (*it)->destination->nbActiveCommsDown;//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 - - double penalty=max(my_penalty_in,max_penalty_out); - + int nb_comms = (*it)->destination->nbActiveCommsDown; // 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 + + double penalty = std::max(my_penalty_in, max_penalty_out); + double rate_before_update = (*it)->action->getBound(); - //save initial rate of the action - if((*it)->init_rate==-1) - (*it)->init_rate= rate_before_update; - - penalized_bw= ! num_comm_out ? (*it)->init_rate : (*it)->init_rate /penalty; - - if (!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 ); - lmm_update_variable_bound(p_maxminSystem, (*it)->action->getVariable(), 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 ); + // save initial rate of the action + if ((*it)->init_rate == -1) + (*it)->init_rate = rate_before_update; + + double penalized_bw = num_comm_out ? (*it)->init_rate / penalty : (*it)->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->getBound(), (*it)->init_rate); + lmm_update_variable_bound(maxminSystem_, (*it)->action->getVariable(), 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("Finished computing IB penalties"); } -void NetworkIBModel::updateIBfactors_rec(IBNode *root, bool* updatedlist) { - if(updatedlist[root->id]==0){ +void NetworkIBModel::updateIBfactors_rec(IBNode* root, bool* updatedlist) +{ + if (updatedlist[root->id] == 0) { XBT_DEBUG("IB - Updating rec %d", root->id); computeIBfactors(root); - updatedlist[root->id]=1; - for (std::vector::iterator it= root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) { - if(updatedlist[(*it)->destination->id]!=1) - updateIBfactors_rec((*it)->destination, updatedlist); + updatedlist[root->id] = 1; + for (std::vector::iterator it = root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) { + if (updatedlist[(*it)->destination->id] != 1) + updateIBfactors_rec((*it)->destination, updatedlist); } - for (std::map::iterator it= root->ActiveCommsDown.begin(); it != root->ActiveCommsDown.end(); ++it) { - if(updatedlist[it->first->id]!=1) - updateIBfactors_rec(it->first, updatedlist); + for (std::map::iterator it = root->ActiveCommsDown.begin(); it != root->ActiveCommsDown.end(); ++it) { + if (updatedlist[it->first->id] != 1) + updateIBfactors_rec(it->first, updatedlist); } } } - -void NetworkIBModel::updateIBfactors(NetworkAction *action, IBNode *from, IBNode * to, int remove) { - if (from == to)//disregard local comms (should use loopback) +void NetworkIBModel::updateIBfactors(NetworkAction* action, IBNode* from, IBNode* to, int remove) +{ + if (from == to) // disregard local comms (should use loopback) return; - - bool* updated=(bool*)xbt_malloc0(xbt_dict_size(active_nodes)*sizeof(bool)); - ActiveComm* comm=NULL; - if(remove){ - if(to->ActiveCommsDown[from]==1) + + bool* updated = (bool*)xbt_malloc0(active_nodes.size() * sizeof(bool)); + ActiveComm* comm = nullptr; + if (remove) { + if (to->ActiveCommsDown[from] == 1) to->ActiveCommsDown.erase(from); else - to->ActiveCommsDown[from]-=1; + 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; + for (std::vector::iterator it = from->ActiveCommsUp.begin(); it != from->ActiveCommsUp.end(); ++it) { + if ((*it)->action == action) { + comm = (*it); + from->ActiveCommsUp.erase(it); + break; } } action->unref(); - - }else{ + } else { action->ref(); - ActiveComm* comm=new ActiveComm(); - comm->action=action; - comm->destination=to; + ActiveComm* comm = new ActiveComm(); + comm->action = action; + comm->destination = to; from->ActiveCommsUp.push_back(comm); - to->ActiveCommsDown[from]+=1; + to->ActiveCommsDown[from] += 1; to->nbActiveCommsDown++; } XBT_DEBUG("IB - Updating %d", from->id); updateIBfactors_rec(from, updated); XBT_DEBUG("IB - Finished updating %d", from->id); - if(comm) + if (comm) delete comm; xbt_free(updated); } +} +}