X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/685040f3a8779f848f54d8bc8f8d1d1bf003a622..96cedde3cdbc0b8ffc3f096a1b65d021b0226f99:/src/surf/network_constant.cpp?ds=sidebyside diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index e8365de065..9a9adb77e8 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. */ @@ -16,12 +16,16 @@ void surf_network_model_init_Constant() { xbt_assert(surf_network_model == nullptr); surf_network_model = new simgrid::kernel::resource::NetworkConstantModel(); - all_existing_models.push_back(surf_network_model); } namespace simgrid { namespace kernel { namespace resource { +NetworkConstantModel::NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::FULL) +{ + all_existing_models.push_back(this); +} + LinkImpl* NetworkConstantModel::create_link(const std::string& name, double bw, double lat, s4u::Link::SharingPolicy policy) { @@ -55,7 +59,7 @@ void NetworkConstantModel::update_actions_state(double /*now*/, double delta) action.latency_ = 0.0; } } - action.update_remains(action.get_cost() * delta / action.initialLatency_); + action.update_remains(action.get_cost() * delta / action.initial_latency_); if (action.get_max_duration() != NO_MAX_DURATION) action.update_max_duration(delta); @@ -78,7 +82,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)