#include "simgrid/kernel/resource/Model.hpp"
#include "src/kernel/lmm/maxmin.hpp"
#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
XBT_LOG_NEW_CATEGORY(kernel, "Logging specific to the internals of SimGrid");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(resource, kernel, "Logging specific to the resources");
if (failed)
state_set_ = get_model()->get_failed_action_set();
else
- state_set_ = get_model()->get_running_action_set();
+ state_set_ = get_model()->get_started_action_set();
state_set_->push_back(*this);
}
get_model()->get_maxmin_system()->variable_free(get_variable());
/* remove from heap on need (ie, if selective update) */
- heapRemove();
+ get_model()->get_action_heap().remove(this);
if (modified_set_hook_.is_linked())
simgrid::xbt::intrusive_erase(*get_model()->get_modified_set(), *this);
Action::State Action::get_state() const
{
- if (state_set_ == model_->get_ready_action_set())
- return Action::State::ready;
- if (state_set_ == model_->get_running_action_set())
- return Action::State::running;
+ if (state_set_ == model_->get_inited_action_set())
+ return Action::State::INITED;
+ if (state_set_ == model_->get_started_action_set())
+ return Action::State::STARTED;
if (state_set_ == model_->get_failed_action_set())
- return Action::State::failed;
- if (state_set_ == model_->get_done_action_set())
- return Action::State::done;
- return Action::State::not_in_the_system;
+ return Action::State::FAILED;
+ if (state_set_ == model_->get_finished_action_set())
+ return Action::State::FINISHED;
+ if (state_set_ == model_->get_ignored_action_set())
+ return Action::State::IGNORED;
+ THROW_IMPOSSIBLE;
}
void Action::set_state(Action::State state)
{
simgrid::xbt::intrusive_erase(*state_set_, *this);
switch (state) {
- case Action::State::ready:
- state_set_ = model_->get_ready_action_set();
+ case Action::State::INITED:
+ state_set_ = model_->get_inited_action_set();
break;
- case Action::State::running:
- state_set_ = model_->get_running_action_set();
+ case Action::State::STARTED:
+ state_set_ = model_->get_started_action_set();
break;
- case Action::State::failed:
+ case Action::State::FAILED:
state_set_ = model_->get_failed_action_set();
break;
- case Action::State::done:
- state_set_ = model_->get_done_action_set();
+ case Action::State::FINISHED:
+ state_set_ = model_->get_finished_action_set();
+ break;
+ case Action::State::IGNORED:
+ state_set_ = model_->get_ignored_action_set();
break;
default:
state_set_ = nullptr;
get_model()->get_maxmin_system()->update_variable_bound(variable_, bound);
if (get_model()->get_update_algorithm() == Model::UpdateAlgo::Lazy && get_last_update() != surf_get_clock())
- heapRemove();
+ get_model()->get_action_heap().remove(this);
XBT_OUT();
}
{
max_duration_ = duration;
if (get_model()->get_update_algorithm() == Model::UpdateAlgo::Lazy) // remove action from the heap
- heapRemove();
+ get_model()->get_action_heap().remove(this);
}
void Action::set_priority(double weight)
get_model()->get_maxmin_system()->update_variable_weight(get_variable(), weight);
if (get_model()->get_update_algorithm() == Model::UpdateAlgo::Lazy)
- heapRemove();
+ get_model()->get_action_heap().remove(this);
XBT_OUT();
}
void Action::cancel()
{
- set_state(Action::State::failed);
+ set_state(Action::State::FAILED);
if (get_model()->get_update_algorithm() == Model::UpdateAlgo::Lazy) {
if (modified_set_hook_.is_linked())
simgrid::xbt::intrusive_erase(*get_model()->get_modified_set(), *this);
- heapRemove();
+ get_model()->get_action_heap().remove(this);
}
}
if (suspended_ != SuspendStates::sleeping) {
get_model()->get_maxmin_system()->update_variable_weight(get_variable(), 0.0);
if (get_model()->get_update_algorithm() == Model::UpdateAlgo::Lazy) {
- heapRemove();
- if (state_set_ == get_model()->get_running_action_set() && sharing_priority_ > 0) {
+ get_model()->get_action_heap().remove(this);
+ if (state_set_ == get_model()->get_started_action_set() && sharing_priority_ > 0) {
// If we have a lazy model, we need to update the remaining value accordingly
update_remains_lazy(surf_get_clock());
}
get_model()->get_maxmin_system()->update_variable_weight(get_variable(), get_priority());
suspended_ = SuspendStates::not_suspended;
if (get_model()->get_update_algorithm() == Model::UpdateAlgo::Lazy)
- heapRemove();
+ get_model()->get_action_heap().remove(this);
}
XBT_OUT();
}
{
return suspended_ == SuspendStates::suspended;
}
-/* insert action on heap using a given key and a type */
-void Action::heapInsert(double key, Action::Type type)
-{
- type_ = type;
- heap_hook_ = get_model()->get_action_heap().emplace(std::make_pair(key, this));
-}
-
-void Action::heapRemove()
-{
- type_ = Action::Type::unset;
- if (heap_hook_) {
- get_model()->get_action_heap().erase(*heap_hook_);
- heap_hook_ = boost::none;
- }
-}
-void Action::heap_clear_handle()
-{
- heap_hook_ = boost::none;
-}
-
-void Action::heapUpdate(double key, Action::Type type)
-{
- type_ = type;
- if (heap_hook_) {
- get_model()->get_action_heap().update(*heap_hook_, std::make_pair(key, this));
- } else {
- heap_hook_ = get_model()->get_action_heap().emplace(std::make_pair(key, this));
- }
-}
double Action::get_remains()
{
last_update_ = surf_get_clock();
}
+double ActionHeap::top_date() const
+{
+ return top().first;
+}
+void ActionHeap::insert(Action* action, double date, ActionHeap::Type type)
+{
+ action->type_ = type;
+ action->heap_hook_ = emplace(std::make_pair(date, action));
+}
+void ActionHeap::remove(Action* action)
+{
+ action->type_ = ActionHeap::Type::unset;
+ if (action->heap_hook_) {
+ erase(*action->heap_hook_);
+ action->heap_hook_ = boost::none;
+ }
+}
+void ActionHeap::update(Action* action, double date, ActionHeap::Type type)
+{
+ action->type_ = type;
+ if (action->heap_hook_) {
+ heap_type::update(*action->heap_hook_, std::make_pair(date, action));
+ } else {
+ action->heap_hook_ = emplace(std::make_pair(date, action));
+ }
+}
+Action* ActionHeap::pop()
+{
+ Action* action = top().second;
+ heap_type::pop();
+ action->heap_hook_ = boost::none;
+ return action;
+}
+
} // namespace surf
} // namespace simgrid
} // namespace simgrid
