A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Action::finish() is never used without setState().
[simgrid.git]
/
src
/
surf
/
storage_n11.cpp
diff --git
a/src/surf/storage_n11.cpp
b/src/surf/storage_n11.cpp
index
5ae236e
..
d8bfca3
100644
(file)
--- a/
src/surf/storage_n11.cpp
+++ b/
src/surf/storage_n11.cpp
@@
-17,11
+17,11
@@
extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
static void check_disk_attachment()
{
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)
simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s.second->getHost().c_str());
if (not host_elm)
- surf_parse_error(
"Unable to attach storage %s: host %s does not exist.", s.second->cname(),
-
s.second->getHost().c_str()
);
+ surf_parse_error(
std::string("Unable to attach storage ") + s.second->cname() + ": host " + s.second->getHost() +
+
" does not exist."
);
else
s.second->piface_.attached_to_ = sg_host_by_name(s.second->getHost().c_str());
}
else
s.second->piface_.attached_to_ = sg_host_by_name(s.second->getHost().c_str());
}
@@
-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()) {
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))) {
} 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);
}
}
}
}
}
}