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
cosmetics
[simgrid.git]
/
src
/
kernel
/
resource
/
Model.cpp
diff --git
a/src/kernel/resource/Model.cpp
b/src/kernel/resource/Model.cpp
index
d7c6645
..
4357714
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. */
@@
-13,34
+13,31
@@
namespace kernel {
namespace resource {
Model::Model(Model::UpdateAlgo algo) : update_algorithm_(algo) {}
namespace resource {
Model::Model(Model::UpdateAlgo algo) : update_algorithm_(algo) {}
+Model::~Model() = default;
-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_occur
r
ing_event(double now)
{
// FIXME: set the good function once and for all
if (update_algorithm_ == Model::UpdateAlgo::LAZY)
{
// FIXME: set the good function once and for all
if (update_algorithm_ == Model::UpdateAlgo::LAZY)
- return next_occuring_event_lazy(now);
+ return next_occur
r
ing_event_lazy(now);
else if (update_algorithm_ == Model::UpdateAlgo::FULL)
else if (update_algorithm_ == Model::UpdateAlgo::FULL)
- return next_occuring_event_full(now);
+ return next_occur
r
ing_event_full(now);
else
xbt_die("Invalid cpu update mechanism!");
}
else
xbt_die("Invalid cpu update mechanism!");
}
-double Model::next_occuring_event_lazy(double now)
+double Model::next_occur
r
ing_event_lazy(double now)
{
XBT_DEBUG("Before share resources, the size of modified actions set is %zu", maxmin_system_->modified_set_->size());
maxmin_system_->lmm_solve();
{
XBT_DEBUG("Before share resources, the size of modified actions set is %zu", maxmin_system_->modified_set_->size());
maxmin_system_->lmm_solve();
@@
-51,11
+48,11
@@
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 */
- if (action->get_
priori
ty() <= 0 || action->get_type() == ActionHeap::Type::latency)
+ if (action->get_
sharing_penal
ty() <= 0 || action->get_type() == ActionHeap::Type::latency)
continue;
action->update_remains_lazy(now);
continue;
action->update_remains_lazy(now);
@@
-73,14
+70,14
@@
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();
max_duration_flag = true;
}
(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();
max_duration_flag = true;
}
- XBT_DEBUG("Action(%p) corresponds to variable %d", action, action->get_variable()->
id_int
);
+ XBT_DEBUG("Action(%p) corresponds to variable %d", action, action->get_variable()->
rank_
);
XBT_DEBUG("Action(%p) Start %f. May finish at %f (got a share of %f). Max_duration %f", action,
action->get_start_time(), min, share, action->get_max_duration());
XBT_DEBUG("Action(%p) Start %f. May finish at %f (got a share of %f). Max_duration %f", action,
action->get_start_time(), min, share, action->get_max_duration());
@@
-103,7
+100,7
@@
double Model::next_occuring_event_lazy(double now)
}
}
}
}
-double Model::next_occuring_event_full(double /*now*/)
+double Model::next_occur
r
ing_event_full(double /*now*/)
{
maxmin_system_->solve();
{
maxmin_system_->solve();
@@
-173,6
+170,6
@@
void Model::update_actions_state_full(double /*now*/, double /*delta*/)
THROW_UNIMPLEMENTED;
}
THROW_UNIMPLEMENTED;
}
-} // namespace
surf
-} // namespace
simgrid
+} // namespace
resource
+} // namespace
kernel
} // namespace simgrid
} // namespace simgrid