-/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-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. */
#include "cpu_interface.hpp"
+#include "src/kernel/resource/profile/Profile.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
void CpuModel::update_actions_state_lazy(double now, double /*delta*/)
{
while (not get_action_heap().empty() && double_equals(get_action_heap().top_date(), now, sg_surf_precision)) {
-
- CpuAction* action = static_cast<CpuAction*>(get_action_heap().pop());
+ auto* action = static_cast<CpuAction*>(get_action_heap().pop());
XBT_CDEBUG(surf_kernel, "Something happened to action %p", action);
action->finish(kernel::resource::Action::State::FINISHED);
void CpuModel::update_actions_state_full(double /*now*/, double delta)
{
for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
- CpuAction& action = static_cast<CpuAction&>(*it);
+ auto& action = static_cast<CpuAction&>(*it);
++it; // increment iterator here since the following calls to action.finish() may invalidate it
action.update_remains(action.get_variable()->get_value() * delta);
action.update_max_duration(delta);
- if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_weight() > 0)) ||
+ if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_penalty() > 0)) ||
((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
action.finish(Action::State::FINISHED);
}
{
xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->get_cname());
- speed_.event = profile->schedule(&future_evt_set, this);
+ speed_.event = profile->schedule(&profile::future_evt_set, this);
}
{
xbt_assert(get_state_set() == get_model()->get_started_action_set(),
"You're updating an action that is not running.");
- xbt_assert(get_priority() > 0, "You're updating an action that seems suspended.");
+ xbt_assert(get_sharing_penalty() > 0, "You're updating an action that seems suspended.");
double delta = now - get_last_update();
for (int i = 0; i < llen; i++) {
/* Beware of composite actions: ptasks put links and cpus together */
// extra pb: we cannot dynamic_cast from void*...
- Resource* resource = static_cast<Resource*>(get_variable()->get_constraint(i)->get_id());
+ Resource* resource = get_variable()->get_constraint(i)->get_id();
Cpu* cpu = dynamic_cast<Cpu*>(resource);
if (cpu != nullptr)
retlist.push_back(cpu);