X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe06d3ceaa02056b708bb777ed9973df6744f776..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/surf/network_constant.cpp diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index 0ebd1813df..c8a5bcb924 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -26,8 +26,7 @@ NetworkConstantModel::NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::F all_existing_models.push_back(this); } -LinkImpl* NetworkConstantModel::create_link(const std::string& name, double bw, double lat, - s4u::Link::SharingPolicy policy) +LinkImpl* NetworkConstantModel::create_link(const std::string& name, double, double, s4u::Link::SharingPolicy) { xbt_die("Refusing to create the link %s: there is no link in the Constant network model. " @@ -59,9 +58,8 @@ void NetworkConstantModel::update_actions_state(double /*now*/, double delta) action.latency_ = 0.0; } } - action.update_remains(action.get_cost() * delta / action.initialLatency_); - if (action.get_max_duration() != NO_MAX_DURATION) - action.update_max_duration(delta); + action.update_remains(action.get_cost() * delta / action.initial_latency_); + action.update_max_duration(delta); if ((action.get_remains_no_update() <= 0) || ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { @@ -70,7 +68,7 @@ void NetworkConstantModel::update_actions_state(double /*now*/, double delta) } } -kernel::resource::Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) +kernel::resource::Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double) { NetworkConstantAction* action = new NetworkConstantAction(this, size, sg_latency_factor); @@ -82,7 +80,7 @@ kernel::resource::Action* NetworkConstantModel::communicate(s4u::Host* src, s4u: * Action * **********/ NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, double size, double latency) - : NetworkAction(model_, size, false), initialLatency_(latency) + : NetworkAction(model_, size, false), initial_latency_(latency) { latency_ = latency; if (latency_ <= 0.0)