get_model()->get_action_heap().remove(this);
if (modified_set_hook_.is_linked())
simgrid::xbt::intrusive_erase(*get_model()->get_modified_set(), *this);
-
- xbt_free(category_);
}
void Action::finish(Action::State state)
return Action::State::FAILED;
if (state_set_ == model_->get_finished_action_set())
return Action::State::FINISHED;
- return Action::State::IGNORED;
+ if (state_set_ == model_->get_ignored_action_set())
+ return Action::State::IGNORED;
+ THROW_IMPOSSIBLE;
}
void Action::set_state(Action::State state)
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;
break;
if (variable_)
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())
+ if (get_model()->get_update_algorithm() == Model::UpdateAlgo::LAZY && get_last_update() != surf_get_clock())
get_model()->get_action_heap().remove(this);
XBT_OUT();
}
-void Action::set_category(const char* category)
-{
- category_ = xbt_strdup(category);
-}
-
void Action::ref()
{
refcount_++;
void Action::set_max_duration(double duration)
{
max_duration_ = duration;
- if (get_model()->get_update_algorithm() == Model::UpdateAlgo::Lazy) // remove action from the heap
+ if (get_model()->get_update_algorithm() == Model::UpdateAlgo::LAZY) // remove action from the heap
get_model()->get_action_heap().remove(this);
}
sharing_priority_ = weight;
get_model()->get_maxmin_system()->update_variable_weight(get_variable(), weight);
- if (get_model()->get_update_algorithm() == Model::UpdateAlgo::Lazy)
+ if (get_model()->get_update_algorithm() == Model::UpdateAlgo::LAZY)
get_model()->get_action_heap().remove(this);
XBT_OUT();
}
void Action::cancel()
{
set_state(Action::State::FAILED);
- if (get_model()->get_update_algorithm() == Model::UpdateAlgo::Lazy) {
+ 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);
get_model()->get_action_heap().remove(this);
}
}
-int Action::unref()
+bool Action::unref()
{
refcount_--;
if (not refcount_) {
delete this;
- return 1;
+ return true;
}
- return 0;
+ return false;
}
void Action::suspend()
XBT_IN("(%p)", 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) {
+ if (get_model()->get_update_algorithm() == Model::UpdateAlgo::LAZY) {
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
if (suspended_ != SuspendStates::sleeping) {
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)
+ if (get_model()->get_update_algorithm() == Model::UpdateAlgo::LAZY)
get_model()->get_action_heap().remove(this);
}
XBT_OUT();
double Action::get_remains()
{
XBT_IN("(%p)", this);
- /* update remains before return it */
- if (get_model()->get_update_algorithm() == Model::UpdateAlgo::Lazy) /* update remains before return it */
+ /* update remains before returning it */
+ if (get_model()->get_update_algorithm() == Model::UpdateAlgo::LAZY) /* update remains before return it */
update_remains_lazy(surf_get_clock());
XBT_OUT();
return remains_;
}
} // namespace surf
-} // namespace simgrid
+} // namespace kernel
} // namespace simgrid