X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/892c5381a1e84836f326457f4740ae60844f074c..18bee871381a6ce670d9da211f43ab9b55fdc350:/src/surf/network_cm02.cpp?ds=sidebyside
diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 3a27f59086..75d41bc77f 100644
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -152,8 +152,7 @@ NetworkCm02Model::NetworkCm02Model()
}
maxminSystem_ = lmm_system_new(selectiveUpdate_);
-
- routing_model_create(createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE));
+ loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
if (updateMechanism_ == UM_LAZY) {
actionHeap_ = xbt_heap_new(8, nullptr);
@@ -296,12 +295,12 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
std::vector *route = new std::vector();
- XBT_IN("(%s,%s,%g,%g)", src->name().c_str(), dst->name().c_str(), size, rate);
+ XBT_IN("(%s,%s,%g,%g)", src->cname(), dst->cname(), 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());
+ src->cname(), dst->cname());
for (auto link: *route)
if (link->isOff())
@@ -309,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;
@@ -342,7 +341,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
"Using a model with a gap (e.g., SMPI) with a platform without links (e.g. vivaldi)!!!");
gapAppend(size, route->at(0), action);
- XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)", action, src->name().c_str(), dst->name().c_str(), action->senderGap_,
+ XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)", action, src->cname(), dst->cname(), action->senderGap_,
action->latency_);
}
@@ -369,7 +368,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
for (auto link: *route)
lmm_expand(maxminSystem_, link->getConstraint(), action->getVariable(), 1.0);
- if (sg_network_crosstraffic == 1) {
+ if (back_route != nullptr) { // sg_network_crosstraffic was activated
XBT_DEBUG("Fullduplex active adding backward flow using 5%%");
for (auto link : *back_route)
lmm_expand(maxminSystem_, link->getConstraint(), action->getVariable(), .05);