-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2019. 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. */
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)
{
// FIXME: set the good function once and for all
- if (update_algorithm_ == Model::UpdateAlgo::Lazy)
+ if (update_algorithm_ == Model::UpdateAlgo::LAZY)
return next_occuring_event_lazy(now);
- else if (update_algorithm_ == Model::UpdateAlgo::Full)
+ else if (update_algorithm_ == Model::UpdateAlgo::FULL)
return next_occuring_event_full(now);
else
xbt_die("Invalid cpu update mechanism!");
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 */
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;
}
- 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());
void Model::update_actions_state(double now, double delta)
{
- if (update_algorithm_ == Model::UpdateAlgo::Full)
+ if (update_algorithm_ == Model::UpdateAlgo::FULL)
update_actions_state_full(now, delta);
- else if (update_algorithm_ == Model::UpdateAlgo::Lazy)
+ else if (update_algorithm_ == Model::UpdateAlgo::LAZY)
update_actions_state_lazy(now, delta);
else
xbt_die("Invalid cpu update mechanism!");
}
+/** Pops and returns the first action of that state set (or nullptr if none exist) */
+Action* Model::extract_action(Action::StateSet* list)
+{
+ if (list->empty())
+ return nullptr;
+ simgrid::kernel::resource::Action* res = &list->front();
+ list->pop_front();
+ return res;
+}
+
+/** Pops and returns the first finished action (or nullptr if none exist) */
+Action* Model::extract_done_action()
+{
+ return extract_action(get_finished_action_set());
+}
+
+/** Pops and returns the failed finished action (or nullptr if none exist) */
+Action* Model::extract_failed_action()
+{
+ return extract_action(get_failed_action_set());
+}
+
void Model::update_actions_state_lazy(double /*now*/, double /*delta*/)
{
THROW_UNIMPLEMENTED;
}
} // namespace surf
-} // namespace simgrid
+} // namespace kernel
} // namespace simgrid