-/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2020. 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. */
namespace resource {
Model::Model(Model::UpdateAlgo algo) : update_algorithm_(algo) {}
-Model::~Model() = default;
+Model::~Model() = default; // Don't move this declaration to the header, or it will break external projects such as SimGrid-FMI
Action::ModifiedSet* Model::get_modified_set() const
{
while (not maxmin_system_->modified_set_->empty()) {
Action* action = &(maxmin_system_->modified_set_->front());
maxmin_system_->modified_set_->pop_front();
- bool max_duration_flag = false;
+ ActionHeap::Type action_type = ActionHeap::Type::normal;
if (action->get_state_set() != &started_action_set_)
continue;
(min <= -1 || action->get_start_time() + action->get_max_duration() < min)) {
// when the task will complete anyway because of the deadline if any
min = action->get_start_time() + action->get_max_duration();
- max_duration_flag = true;
+ action_type = ActionHeap::Type::max_duration;
}
XBT_DEBUG("Action(%p) corresponds to variable %d", action, action->get_variable()->rank_);
action->get_start_time(), min, share, action->get_max_duration());
if (min > -1) {
- action_heap_.update(action, min, max_duration_flag ? ActionHeap::Type::max_duration : ActionHeap::Type::normal);
+ action_heap_.update(action, min, action_type);
XBT_DEBUG("Insert at heap action(%p) min %f now %f", action, min, now);
} else
DIE_IMPOSSIBLE;
{
if (list->empty())
return nullptr;
- simgrid::kernel::resource::Action* res = &list->front();
+ Action* res = &list->front();
list->pop_front();
return res;
}
THROW_UNIMPLEMENTED;
}
-} // namespace surf
+} // namespace resource
} // namespace kernel
} // namespace simgrid