-/* 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. */
#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");
: remains_(cost), start_time_(surf_get_clock()), cost_(cost), model_(model), variable_(var)
{
if (failed)
- state_set_ = get_model()->getFailedActionSet();
+ state_set_ = get_model()->get_failed_action_set();
else
- state_set_ = get_model()->getRunningActionSet();
+ state_set_ = get_model()->get_started_action_set();
state_set_->push_back(*this);
}
if (state_set_hook_.is_linked())
simgrid::xbt::intrusive_erase(*state_set_, *this);
if (get_variable())
- get_model()->getMaxminSystem()->variable_free(get_variable());
- if (get_model()->getUpdateMechanism() == UM_LAZY) {
- /* remove from heap */
- heapRemove();
- if (modified_set_hook_.is_linked())
- simgrid::xbt::intrusive_erase(*get_model()->getModifiedSet(), *this);
- }
+ get_model()->get_maxmin_system()->variable_free(get_variable());
- xbt_free(category_);
+ /* remove from heap on need (ie, if selective update) */
+ get_model()->get_action_heap().remove(this);
+ if (modified_set_hook_.is_linked())
+ simgrid::xbt::intrusive_erase(*get_model()->get_modified_set(), *this);
}
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 (state_set_ == model_->getReadyActionSet())
- return Action::State::ready;
- if (state_set_ == model_->getRunningActionSet())
- return Action::State::running;
- if (state_set_ == model_->getFailedActionSet())
- return Action::State::failed;
- if (state_set_ == model_->getDoneActionSet())
- return Action::State::done;
- return Action::State::not_in_the_system;
+ 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_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_->getReadyActionSet();
+ case Action::State::INITED:
+ state_set_ = model_->get_inited_action_set();
+ break;
+ case Action::State::STARTED:
+ state_set_ = model_->get_started_action_set();
break;
- case Action::State::running:
- state_set_ = model_->getRunningActionSet();
+ case Action::State::FAILED:
+ state_set_ = model_->get_failed_action_set();
break;
- case Action::State::failed:
- state_set_ = model_->getFailedActionSet();
+ case Action::State::FINISHED:
+ state_set_ = model_->get_finished_action_set();
break;
- case Action::State::done:
- state_set_ = model_->getDoneActionSet();
+ case Action::State::IGNORED:
+ state_set_ = model_->get_ignored_action_set();
break;
default:
state_set_ = nullptr;
{
XBT_IN("(%p,%g)", this, bound);
if (variable_)
- get_model()->getMaxminSystem()->update_variable_bound(variable_, bound);
+ get_model()->get_maxmin_system()->update_variable_bound(variable_, bound);
- if (get_model()->getUpdateMechanism() == UM_LAZY && get_last_update() != surf_get_clock())
- heapRemove();
+ 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()->getUpdateMechanism() == UM_LAZY) // remove action from the heap
- heapRemove();
+ 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)
{
XBT_IN("(%p,%g)", this, weight);
sharing_priority_ = weight;
- get_model()->getMaxminSystem()->update_variable_weight(get_variable(), weight);
+ get_model()->get_maxmin_system()->update_variable_weight(get_variable(), weight);
- if (get_model()->getUpdateMechanism() == UM_LAZY)
- heapRemove();
+ 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()->getUpdateMechanism() == UM_LAZY) {
+ 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()->getModifiedSet(), *this);
- heapRemove();
+ 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()->getMaxminSystem()->update_variable_weight(get_variable(), 0.0);
- if (get_model()->getUpdateMechanism() == UM_LAZY) {
- heapRemove();
- if (state_set_ == get_model()->getRunningActionSet() && sharing_priority_ > 0) {
+ get_model()->get_maxmin_system()->update_variable_weight(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 we have a lazy model, we need to update the remaining value accordingly
update_remains_lazy(surf_get_clock());
}
{
XBT_IN("(%p)", this);
if (suspended_ != SuspendStates::sleeping) {
- get_model()->getMaxminSystem()->update_variable_weight(get_variable(), get_priority());
+ get_model()->get_maxmin_system()->update_variable_weight(get_variable(), get_priority());
suspended_ = SuspendStates::not_suspended;
- if (get_model()->getUpdateMechanism() == UM_LAZY)
- heapRemove();
+ if (get_model()->get_update_algorithm() == Model::UpdateAlgo::LAZY)
+ get_model()->get_action_heap().remove(this);
}
XBT_OUT();
}
{
return suspended_ == SuspendStates::suspended;
}
-/* insert action on heap using a given key and a hat (heap_action_type)
- * a hat can be of three types for communications:
- *
- * NORMAL = this is a normal heap entry stating the date to finish transmitting
- * LATENCY = this is a heap entry to warn us when the latency is payed
- * MAX_DURATION =this is a heap entry to warn us when the max_duration limit is reached
- */
-void Action::heapInsert(double key, Action::Type hat)
-{
- type_ = hat;
- heap_hook_ = get_model()->getActionHeap().emplace(std::make_pair(key, this));
-}
-
-void Action::heapRemove()
-{
- type_ = Action::Type::NOTSET;
- if (heap_hook_) {
- get_model()->getActionHeap().erase(*heap_hook_);
- clearHeapHandle();
- }
-}
-
-void Action::heapUpdate(double key, Action::Type hat)
-{
- type_ = hat;
- if (heap_hook_) {
- get_model()->getActionHeap().update(*heap_hook_, std::make_pair(key, this));
- } else {
- heap_hook_ = get_model()->getActionHeap().emplace(std::make_pair(key, this));
- }
-}
double Action::get_remains()
{
XBT_IN("(%p)", this);
- /* update remains before return it */
- if (get_model()->getUpdateMechanism() == UM_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)
{
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 kernel
} // namespace simgrid
