X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a8b29f2bc452ad2be0c7285e98f3bf7026d0ce6d..0c07b616d38841a028f8a34fe66394e232008b5e:/src/surf/network_cm02.cpp?ds=sidebyside diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 96c31e07ca..88b131c5dd 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -154,8 +154,6 @@ NetworkCm02Model::NetworkCm02Model() maxminSystem_ = lmm_system_new(selectiveUpdate_); loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); - routing_model_create(); - if (updateMechanism_ == UM_LAZY) { actionHeap_ = xbt_heap_new(8, nullptr); xbt_heap_set_update_callback(actionHeap_, surf_action_lmm_update_index_heap); @@ -299,7 +297,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz XBT_IN("(%s,%s,%g,%g)", src->name().c_str(), dst->name().c_str(), size, rate); - routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, &latency); + src->routeTo(dst, route, &latency); xbt_assert(!route->empty() || latency, "You're trying to send data from %s to %s but there is no connecting path between these two hosts.", src->name().c_str(), dst->name().c_str()); @@ -310,7 +308,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz if (sg_network_crosstraffic == 1) { back_route = new std::vector(); - routing_platf->getRouteAndLatency(dst->pimpl_netcard, src->pimpl_netcard, back_route, nullptr); + dst->routeTo(src, back_route, nullptr); for (auto link: *back_route) if (link->isOff()) failed = 1;