X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/05a1845ae0f4e4ed1988408ec0e8f95671ff2501..18bee871381a6ce670d9da211f43ab9b55fdc350:/src/surf/network_ib.cpp diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp index d373a381fc..30d8f4ab3c 100644 --- a/src/surf/network_ib.cpp +++ b/src/surf/network_ib.cpp @@ -4,7 +4,6 @@ /* 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" @@ -16,27 +15,28 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); static void IB_create_host_callback(simgrid::s4u::Host& host){ - using namespace simgrid::surf; + 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(); + if(((NetworkIBModel*)surf_network_model)->active_nodes==nullptr) + ((NetworkIBModel*)surf_network_model)->active_nodes = xbt_dict_new_homogeneous(nullptr); IBNode* act = new IBNode(id); id++; - xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes, - host.name().c_str(), act, NULL); - + xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes, host.cname(), act, nullptr); } static void IB_action_state_changed_callback( simgrid::surf::NetworkAction *action, - e_surf_action_state_t statein, e_surf_action_state_t stateout) + simgrid::surf::Action::State statein, simgrid::surf::Action::State stateout) { - using namespace simgrid::surf; - if(statein!=SURF_ACTION_RUNNING|| stateout!=SURF_ACTION_DONE) + using simgrid::surf::NetworkIBModel; + using simgrid::surf::IBNode; + + if(statein!=simgrid::surf::Action::State::running || stateout!=simgrid::surf::Action::State::done) return; std::pair pair = ((NetworkIBModel*)surf_network_model)->active_comms[action]; XBT_DEBUG("IB callback - action %p finished", action); @@ -47,31 +47,20 @@ static void IB_action_state_changed_callback( } - -static void IB_action_init_callback( - simgrid::surf::NetworkAction *action, simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst, - double size, double rate) +static void IB_action_init_callback(simgrid::surf::NetworkAction* action, simgrid::s4u::Host* src, + simgrid::s4u::Host* dst) { - using namespace simgrid::surf; - if(((NetworkIBModel*)surf_network_model)->active_nodes==NULL) - xbt_die("IB comm added, without any node connected !"); + simgrid::surf::NetworkIBModel* ibModel = (simgrid::surf::NetworkIBModel*)surf_network_model; - IBNode* act_src= (IBNode*) xbt_dict_get_or_null(((NetworkIBModel*)surf_network_model)->active_nodes, src->name()); - if(act_src==NULL) - xbt_die("could not find src node active comms !"); - //act_src->rate=rate; + simgrid::surf::IBNode* act_src = (simgrid::surf::IBNode*)xbt_dict_get_or_null(ibModel->active_nodes, src->cname()); + xbt_assert(act_src, "could not find src node active comms !"); - IBNode* act_dst= (IBNode*) xbt_dict_get_or_null(((NetworkIBModel*)surf_network_model)->active_nodes, dst->name()); - if(act_dst==NULL) - xbt_die("could not find dst node active comms !"); - // act_dst->rate=rate; + simgrid::surf::IBNode* act_dst = (simgrid::surf::IBNode*)xbt_dict_get_or_null(ibModel->active_nodes, dst->cname()); + xbt_assert(act_dst, "could not find dst node active comms !"); - ((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); - - ((NetworkIBModel*)surf_network_model)->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); } /********* @@ -88,52 +77,48 @@ static void IB_action_init_callback( /* month=june, */ /* year={2010} */ /* } */ -void surf_network_model_init_IB(void) +void surf_network_model_init_IB() { using simgrid::surf::networkActionStateChangedCallbacks; - using simgrid::surf::networkCommunicateCallbacks; if (surf_network_model) return; - simgrid::surf::on_link.connect(netlink_parse_init); surf_network_model = new simgrid::surf::NetworkIBModel(); - xbt_dynar_push(all_existing_models, &surf_network_model); + all_existing_models->push_back(surf_network_model); networkActionStateChangedCallbacks.connect(IB_action_state_changed_callback); - networkCommunicateCallbacks.connect(IB_action_init_callback); + Link::onCommunicate.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); + xbt_cfg_setdefault_double("network/weight-S", 8775); } -#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area - namespace simgrid { namespace surf { NetworkIBModel::NetworkIBModel() : NetworkSmpiModel() { haveGap_=false; - active_nodes=NULL; + active_nodes=nullptr; - const char* IB_factors_string=sg_cfg_get_string("smpi/IB_penalty_factors"); + const char* IB_factors_string=xbt_cfg_get_string("smpi/IB-penalty-factors"); xbt_dynar_t radical_elements = xbt_str_split(IB_factors_string, ";"); surf_parse_assert(xbt_dynar_length(radical_elements)==3, - "smpi/IB_penalty_factors should be provided and contain 3 elements, semi-colon separated : for example 0.965;0.925;1.35"); + "smpi/IB-penalty-factors should be provided and contain 3 elements, semi-colon separated. Example: 0.965;0.925;1.35"); - Be = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 0, char *), "First part of smpi/IB_penalty_factors is not numerical: %s"); - Bs = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 1, char *), "Second part of smpi/IB_penalty_factors is not numerical: %s"); - ys = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 2, char *), "Third part of smpi/IB_penalty_factors is not numerical: %s"); + Be = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 0, char *), "First part of smpi/IB-penalty-factors is not numerical: %s"); + Bs = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 1, char *), "Second part of smpi/IB-penalty-factors is not numerical: %s"); + ys = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 2, char *), "Third part of smpi/IB-penalty-factors is not numerical: %s"); xbt_dynar_free(&radical_elements); } NetworkIBModel::~NetworkIBModel() { - xbt_dict_cursor_t cursor = NULL; - IBNode* instance = NULL; - char *name = NULL; + xbt_dict_cursor_t cursor = nullptr; + IBNode* instance = nullptr; + char *name = nullptr; xbt_dict_foreach(active_nodes, cursor, name, instance) delete instance; xbt_dict_free(&active_nodes); @@ -209,7 +194,7 @@ namespace simgrid { return; bool* updated=(bool*)xbt_malloc0(xbt_dict_size(active_nodes)*sizeof(bool)); - ActiveComm* comm=NULL; + ActiveComm* comm=nullptr; if(remove){ if(to->ActiveCommsDown[from]==1) to->ActiveCommsDown.erase(from);