X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d68f666f1af96f557cd6fe7503703358439ca188..8d777265e12b0b9c5f13fecfc719474cdd214e9e:/src/surf/network_ib.cpp diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp index 86db6aa05b..8771a39a89 100644 --- a/src/surf/network_ib.cpp +++ b/src/surf/network_ib.cpp @@ -14,7 +14,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); -static void IB_create_host_callback(simgrid::surf::Host* host){ +static void IB_create_host_callback(simgrid::s4u::Host& host){ using namespace simgrid::surf; static int id=0; @@ -26,8 +26,8 @@ static void IB_create_host_callback(simgrid::surf::Host* host){ id++; xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes, - host->getName(), act, NULL); - + host.name().c_str(), act, NULL); + } static void IB_action_state_changed_callback( @@ -48,7 +48,7 @@ static void IB_action_state_changed_callback( static void IB_action_init_callback( - simgrid::surf::NetworkAction *action, simgrid::surf::RoutingEdge *src, simgrid::surf::RoutingEdge *dst, + simgrid::surf::NetworkAction *action, simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst, double size, double rate) { using namespace simgrid::surf; @@ -99,7 +99,7 @@ void surf_network_model_init_IB(void) xbt_dynar_push(all_existing_models, &surf_network_model); networkActionStateChangedCallbacks.connect(IB_action_state_changed_callback); networkCommunicateCallbacks.connect(IB_action_init_callback); - simgrid::surf::Host::creationCallbacks.connect(IB_create_host_callback); + simgrid::s4u::Host::onCreation.connect(IB_create_host_callback); xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775); }