X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6c12a132ca10eefd1d566e489e837e459db4d979..16bbb8a8212497d9c44c81333ed2c0e689e0c5af:/src/surf/network_ib.cpp diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp index 9c9854c7a7..5ddb5e2ff4 100644 --- a/src/surf/network_ib.cpp +++ b/src/surf/network_ib.cpp @@ -1,16 +1,21 @@ -/* Copyright (c) 2014. The SimGrid Team. +/* Copyright (c) 2014-2015. 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 + #include "network_ib.hpp" #include "simgrid/sg_config.h" #include "maxmin_private.hpp" +#include "src/surf/host_interface.hpp" 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 namespace simgrid::surf; static int id=0; // pour t->id -> rajouter une nouvelle struct dans le dict, pour stocker les comms actives @@ -20,11 +25,16 @@ static void IB_create_host_callback(sg_platf_host_cbarg_t t){ IBNode* act = new IBNode(id); id++; - xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes, t->id, act, NULL); - + xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes, + host.name().c_str(), act, NULL); + } -static void IB_action_state_changed_callback(NetworkActionPtr action, e_surf_action_state_t statein, e_surf_action_state_t stateout){ +static void IB_action_state_changed_callback( + simgrid::surf::NetworkAction *action, + e_surf_action_state_t statein, e_surf_action_state_t stateout) +{ + using namespace simgrid::surf; if(statein!=SURF_ACTION_RUNNING|| stateout!=SURF_ACTION_DONE) return; std::pair pair = ((NetworkIBModel*)surf_network_model)->active_comms[action]; @@ -37,7 +47,11 @@ static void IB_action_state_changed_callback(NetworkActionPtr action, e_surf_act } -static void IB_action_init_callback(NetworkActionPtr action,RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate){ +static void IB_action_init_callback( + simgrid::surf::NetworkAction *action, simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst, + double size, double rate) +{ + using namespace simgrid::surf; if(((NetworkIBModel*)surf_network_model)->active_nodes==NULL) xbt_die("IB comm added, without any node connected !"); @@ -51,7 +65,7 @@ static void IB_action_init_callback(NetworkActionPtr action,RoutingEdgePtr src, 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); + ((NetworkIBModel*)surf_network_model)->active_comms[action]=std::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); @@ -59,8 +73,6 @@ static void IB_action_init_callback(NetworkActionPtr action,RoutingEdgePtr src, } - - /********* * Model * *********/ @@ -77,20 +89,24 @@ static void IB_action_init_callback(NetworkActionPtr action,RoutingEdgePtr src, /* } */ void surf_network_model_init_IB(void) { + using simgrid::surf::networkActionStateChangedCallbacks; + using simgrid::surf::networkCommunicateCallbacks; if (surf_network_model) return; - surf_network_model = new NetworkIBModel(); + surf_network_model = new simgrid::surf::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_dynar_push(all_existing_models, &surf_network_model); + networkActionStateChangedCallbacks.connect(IB_action_state_changed_callback); + networkCommunicateCallbacks.connect(IB_action_init_callback); + simgrid::s4u::Host::onCreation.connect(IB_create_host_callback); xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775); } +namespace simgrid { +namespace surf { + NetworkIBModel::NetworkIBModel() : NetworkSmpiModel() { m_haveGap=false; @@ -129,12 +145,12 @@ void NetworkIBModel::computeIBfactors(IBNode *root) { 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; + 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) { @@ -144,10 +160,10 @@ void NetworkIBModel::computeIBfactors(IBNode *root) { 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 + * Be + * (*it)->destination->ActiveCommsDown.size();//number of different nodes sending to dest - double penalty=max(my_penalty_in,max_penalty_out); + double penalty = std::max(my_penalty_in,max_penalty_out); double rate_before_update = (*it)->action->getBound(); //save initial rate of the action @@ -184,7 +200,7 @@ void NetworkIBModel::updateIBfactors_rec(IBNode *root, bool* updatedlist) { } -void NetworkIBModel::updateIBfactors(NetworkActionPtr action, IBNode *from, IBNode * to, int remove) { +void NetworkIBModel::updateIBfactors(NetworkAction *action, IBNode *from, IBNode * to, int remove) { if (from == to)//disregard local comms (should use loopback) return; @@ -198,11 +214,11 @@ void NetworkIBModel::updateIBfactors(NetworkActionPtr action, IBNode *from, IBNo to->nbActiveCommsDown--; for (std::vector::iterator it= from->ActiveCommsUp.begin(); - it != from->ActiveCommsUp.end(); ++it) { + it != from->ActiveCommsUp.end(); ++it) { if((*it)->action==action){ - comm=(*it); - from->ActiveCommsUp.erase(it); - break; + comm=(*it); + from->ActiveCommsUp.erase(it); + break; } } action->unref(); @@ -224,3 +240,6 @@ void NetworkIBModel::updateIBfactors(NetworkActionPtr action, IBNode *from, IBNo delete comm; xbt_free(updated); } + +} +}