X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/28188d631e99c52551b652335b31ec6c48d0e000..19cd5a52131b50275fa26e0e53c4a8bd333f2937:/src/surf/storage_n11.cpp diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index f026497dfb..d8bfca3039 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -17,7 +17,7 @@ extern std::map storage_types; static void check_disk_attachment() { - for (auto s : *simgrid::surf::StorageImpl::storagesMap()) { + for (auto const& s : *simgrid::surf::StorageImpl::storagesMap()) { simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s.second->getHost().c_str()); if (not host_elm) surf_parse_error(std::string("Unable to attach storage ") + s.second->cname() + ": host " + s.second->getHost() + @@ -98,12 +98,10 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) if (action->getRemainsNoUpdate() > 0 && lmm_get_variable_weight(action->getVariable()) > 0 && action->storage_->usedSize_ == action->storage_->getSize()) { - action->finish(); - action->setState(Action::State::failed); + action->finish(Action::State::failed); } else if (((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) || ((action->getMaxDuration() > NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) { - action->finish(); - action->setState(Action::State::done); + action->finish(Action::State::done); } } }