-/* 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. */
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
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)
get_model()->get_action_heap().remove(this);
void Action::suspend()
{
XBT_IN("(%p)", this);
- if (suspended_ != SuspendStates::sleeping) {
- get_model()->get_maxmin_system()->update_variable_weight(get_variable(), 0.0);
+ 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 (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);
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)
{