-/* 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. */
delete started_action_set_;
delete failed_action_set_;
delete finished_action_set_;
+ delete ignored_action_set_;
delete maxmin_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!");
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