X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7c047878cb2905079a6a0544f1a15134ae3ab3a6..e167326c1369032305b7eb87e166b12d6690df64:/src/surf/network_ib.cpp?ds=sidebyside diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp index 59e29354b9..831dbdb7bc 100644 --- a/src/surf/network_ib.cpp +++ b/src/surf/network_ib.cpp @@ -15,7 +15,8 @@ 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 @@ -34,7 +35,9 @@ static void IB_action_state_changed_callback( simgrid::surf::NetworkAction *action, simgrid::surf::Action::State statein, simgrid::surf::Action::State stateout) { - using namespace simgrid::surf; + 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]; @@ -48,7 +51,7 @@ 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) + simgrid::surf::NetworkAction *action, simgrid::routing::NetCard *src, simgrid::routing::NetCard *dst) { simgrid::surf::NetworkIBModel* ibModel = (simgrid::surf::NetworkIBModel*)surf_network_model;