X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/72d32c4e88a57f4786f62fec48a1bfa454adbff9..3be0396ca83e510e42adc8e3eb12f4befb2f1fff:/src/surf/network_constant.cpp diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index c81187484b..a5a358838b 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -61,7 +61,7 @@ void NetworkConstantModel::update_actions_state(double /*now*/, double delta) action.latency_ = 0.0; } } - action.update_remains(action.get_cost() * delta / sg_latency_factor); + action.update_remains(action.get_cost() * delta / get_latency_factor()); action.update_max_duration(delta); if ((action.get_remains_no_update() <= 0) || @@ -71,7 +71,8 @@ void NetworkConstantModel::update_actions_state(double /*now*/, double delta) } } -Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double /*rate*/) +Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double /*rate*/, + bool /*streamed*/) { return (new NetworkConstantAction(this, *src, *dst, size)); } @@ -82,7 +83,7 @@ Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, s4u::Host& src, s4u::Host& dst, double size) : NetworkAction(model_, src, dst, size, false) { - latency_ = sg_latency_factor; + latency_ = model_->get_latency_factor(); if (latency_ <= 0.0) set_state(Action::State::FINISHED); }