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
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
39c8b9d
..
b0007c1
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-137,7
+137,7
@@
std::ifstream* surf_ifsopen(std::string name)
}
/* search relative files in the path */
}
/* search relative files in the path */
- for (auto path_elm : surf_path) {
+ for (auto
const&
path_elm : surf_path) {
std::string buff = path_elm + FILE_DELIM + name;
fs->open(buff.c_str(), std::ifstream::in);
std::string buff = path_elm + FILE_DELIM + name;
fs->open(buff.c_str(), std::ifstream::in);
@@
-160,7
+160,7
@@
FILE *surf_fopen(const char *name, const char *mode)
return fopen(name, mode);
/* search relative files in the path */
return fopen(name, mode);
/* search relative files in the path */
- for (auto path_elm : surf_path) {
+ for (auto
const&
path_elm : surf_path) {
std::string buff = path_elm + FILE_DELIM + name;
file = fopen(buff.c_str(), mode);
std::string buff = path_elm + FILE_DELIM + name;
file = fopen(buff.c_str(), mode);
@@
-361,17
+361,17
@@
void surf_exit()
sg_host_exit();
sg_link_exit();
sg_host_exit();
sg_link_exit();
- for (auto e : storage_types) {
+ for (auto
const&
e : storage_types) {
simgrid::surf::StorageType* stype = e.second;
delete stype->properties;
delete stype->model_properties;
delete stype;
}
simgrid::surf::StorageType* stype = e.second;
delete stype->properties;
delete stype->model_properties;
delete stype;
}
- for (auto s : *simgrid::surf::StorageImpl::storagesMap())
+ for (auto
const&
s : *simgrid::surf::StorageImpl::storagesMap())
delete s.second;
delete simgrid::surf::StorageImpl::storagesMap();
delete s.second;
delete simgrid::surf::StorageImpl::storagesMap();
- for (auto model : *all_existing_models)
+ for (auto
const&
model : *all_existing_models)
delete model;
delete all_existing_models;
delete model;
delete all_existing_models;
@@
-549,7
+549,7
@@
void Model::updateActionsStateFull(double /*now*/, double /*delta*/)
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
-Resource::Resource(Model* model, const
char*
name, lmm_constraint_t constraint)
+Resource::Resource(Model* model, const
std::string&
name, lmm_constraint_t constraint)
: name_(name), model_(model), constraint_(constraint)
{}
: name_(name), model_(model), constraint_(constraint)
{}
@@
-634,8
+634,10
@@
Action::~Action() {
xbt_free(category_);
}
xbt_free(category_);
}
-void Action::finish() {
+void Action::finish(Action::State state)
+{
finishTime_ = surf_get_clock();
finishTime_ = surf_get_clock();
+ setState(state);
}
Action::State Action::getState()
}
Action::State Action::getState()
@@
-880,8
+882,7
@@
void Action::updateRemainingLazy(double now)
//FIXME: duplicated code
if (((remains_ <= 0) && (lmm_get_variable_weight(getVariable()) > 0)) ||
((maxDuration_ > NO_MAX_DURATION) && (maxDuration_ <= 0))) {
//FIXME: duplicated code
if (((remains_ <= 0) && (lmm_get_variable_weight(getVariable()) > 0)) ||
((maxDuration_ > NO_MAX_DURATION) && (maxDuration_ <= 0))) {
- finish();
- setState(Action::State::done);
+ finish(Action::State::done);
heapRemove(getModel()->getActionHeap());
}
}
heapRemove(getModel()->getActionHeap());
}
}