X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6..5156a24c2e6a1695071db9450126c3cc08bf1734:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 94a7a5a136..28b678eaaa 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -87,7 +87,9 @@ NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(b } set_maxmin_system(make_new_lmm_system(select)); - loopback_ = NetworkCm02Model::create_link("__loopback__", std::vector(1, 498000000), 0.000015, + loopback_ = NetworkCm02Model::create_link("__loopback__", + std::vector{simgrid::config::get_value("network/loopback-bw")}, + simgrid::config::get_value("network/loopback-lat"), s4u::Link::SharingPolicy::FATPIPE); } @@ -189,7 +191,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz action->latency_ = latency; action->rate_ = rate; - if (get_update_algorithm() == Model::UpdateAlgo::LAZY) { + if (is_update_lazy()) { action->set_last_update(); } @@ -214,7 +216,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz if (action->latency_ > 0) { action->set_variable(get_maxmin_system()->variable_new(action, 0.0, -1.0, constraints_per_variable)); - if (get_update_algorithm() == Model::UpdateAlgo::LAZY) { + if (is_update_lazy()) { // add to the heap the event when the latency is payed double date = action->latency_ + action->get_last_update();