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
Use default destructor for resource::Model.
[simgrid.git]
/
src
/
kernel
/
resource
/
Model.cpp
diff --git
a/src/kernel/resource/Model.cpp
b/src/kernel/resource/Model.cpp
index
d7c6645
..
c0f2721
100644
(file)
--- a/
src/kernel/resource/Model.cpp
+++ b/
src/kernel/resource/Model.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-201
9
. 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. */
/* 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. */
@@
-14,19
+14,15
@@
namespace resource {
Model::Model(Model::UpdateAlgo algo) : update_algorithm_(algo) {}
Model::Model(Model::UpdateAlgo algo) : update_algorithm_(algo) {}
-Model::~Model()
+Action::ModifiedSet* Model::get_modified_set() const
{
{
- delete inited_action_set_;
- delete started_action_set_;
- delete failed_action_set_;
- delete finished_action_set_;
- delete ignored_action_set_;
- delete maxmin_system_;
+ return maxmin_system_->modified_set_;
}
}
-Action::ModifiedSet* Model::get_modified_set() const
+void Model::set_maxmin_system(lmm::System* system)
{
{
- return maxmin_system_->modified_set_;
+ maxmin_system_.release(); // ugly...
+ maxmin_system_.reset(system);
}
double Model::next_occuring_event(double now)
}
double Model::next_occuring_event(double now)
@@
-51,7
+47,7
@@
double Model::next_occuring_event_lazy(double now)
maxmin_system_->modified_set_->pop_front();
bool max_duration_flag = false;
maxmin_system_->modified_set_->pop_front();
bool max_duration_flag = false;
- if (action->get_state_set() != started_action_set_)
+ if (action->get_state_set() !=
&
started_action_set_)
continue;
/* bogus priority, skip it */
continue;
/* bogus priority, skip it */
@@
-73,7
+69,7
@@
double Model::next_occuring_event_lazy(double now)
min = now + time_to_completion; // when the task will complete if nothing changes
}
min = now + time_to_completion; // when the task will complete if nothing changes
}
- if ((action->get_max_duration()
>
NO_MAX_DURATION) &&
+ if ((action->get_max_duration()
!=
NO_MAX_DURATION) &&
(min <= -1 || action->get_start_time() + action->get_max_duration() < min)) {
// when the task will complete anyway because of the deadline if any
min = action->get_start_time() + action->get_max_duration();
(min <= -1 || action->get_start_time() + action->get_max_duration() < min)) {
// when the task will complete anyway because of the deadline if any
min = action->get_start_time() + action->get_max_duration();
@@
-174,5
+170,5
@@
void Model::update_actions_state_full(double /*now*/, double /*delta*/)
}
} // namespace surf
}
} // namespace surf
-} // namespace
simgrid
+} // namespace
kernel
} // namespace simgrid
} // namespace simgrid