-/* 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. */
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)
{
finish_time_ = surf_get_clock();
- set_state(state);
set_remains(0);
+ set_state(state);
}
Action::State Action::get_state() const
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);
}
-void Action::set_priority(double weight)
+void Action::set_sharing_penalty(double sharing_penalty)
{
- XBT_IN("(%p,%g)", this, weight);
- sharing_priority_ = weight;
- get_model()->get_maxmin_system()->update_variable_weight(get_variable(), weight);
+ XBT_IN("(%p,%g)", this, sharing_penalty);
+ sharing_penalty_ = sharing_penalty;
+ get_model()->get_maxmin_system()->update_variable_penalty(get_variable(), sharing_penalty);
- 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 (suspended_ != SuspendStates::SLEEPING) {
+ get_model()->get_maxmin_system()->update_variable_penalty(get_variable(), 0.0);
+ 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 (state_set_ == get_model()->get_started_action_set() && sharing_penalty_ > 0) {
// If we have a lazy model, we need to update the remaining value accordingly
update_remains_lazy(surf_get_clock());
}
}
- suspended_ = SuspendStates::suspended;
+ suspended_ = SuspendStates::SUSPENDED;
}
XBT_OUT();
}
void Action::resume()
{
XBT_IN("(%p)", this);
- 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 (suspended_ != SuspendStates::SLEEPING) {
+ get_model()->get_maxmin_system()->update_variable_penalty(get_variable(), get_sharing_penalty());
+ suspended_ = SuspendStates::RUNNING;
+ if (get_model()->get_update_algorithm() == Model::UpdateAlgo::LAZY)
get_model()->get_action_heap().remove(this);
}
XBT_OUT();
}
-bool Action::is_suspended()
-{
- return suspended_ == SuspendStates::suspended;
-}
-
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_;
void Action::update_max_duration(double delta)
{
- double_update(&max_duration_, delta, sg_surf_precision);
+ if (max_duration_ != NO_MAX_DURATION)
+ double_update(&max_duration_, delta, sg_surf_precision);
}
void Action::update_remains(double delta)
{
}
} // namespace surf
-} // namespace simgrid
+} // namespace kernel
} // namespace simgrid