X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/08ddd90ede6ae87880ab6aefe213001b224de841..010f71b687b464c4765b980251300bb6007ae3a6:/src/surf/network_constant.cpp diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index 71c87a1c4c..9a582d7a6f 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -52,12 +52,12 @@ void NetworkConstantModel::updateActionsState(double /*now*/, double delta) action.latency_ = 0.0; } } - action.updateRemains(action.getCost() * delta / action.initialLatency_); - if (action.getMaxDuration() != NO_MAX_DURATION) - action.updateMaxDuration(delta); + action.update_remains(action.get_cost() * delta / action.initialLatency_); + if (action.get_max_duration() != NO_MAX_DURATION) + action.update_max_duration(delta); - if ((action.getRemainsNoUpdate() <= 0) || - ((action.getMaxDuration() != NO_MAX_DURATION) && (action.getMaxDuration() <= 0))) { + if ((action.get_remains_no_update() <= 0) || + ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { action.finish(kernel::resource::Action::State::done); } } @@ -78,10 +78,8 @@ NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, doubl : NetworkAction(model_, size, false), initialLatency_(latency) { latency_ = latency; - if (latency_ <= 0.0) { - stateSet_ = model_->getDoneActionSet(); - stateSet_->push_back(*this); - } + if (latency_ <= 0.0) + set_state(Action::State::done); }; NetworkConstantAction::~NetworkConstantAction() = default;