-/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-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 CpuModel::update_actions_state_full(double now, double delta)
+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);
++it; // increment iterator here since the following calls to action.finish() may invalidate it
action.update_remains(action.get_variable()->get_value() * delta);
-
- if (action.get_max_duration() != NO_MAX_DURATION)
- action.update_max_duration(delta);
+ action.update_max_duration(delta);
if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_weight() > 0)) ||
((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
return core_count_;
}
-void Cpu::set_state_trace(tmgr_trace_t trace)
-{
- xbt_assert(state_event_ == nullptr, "Cannot set a second state trace to Host %s", host_->get_cname());
-
- state_event_ = future_evt_set->add_trace(trace, this);
-}
-void Cpu::set_speed_trace(tmgr_trace_t trace)
+void Cpu::set_speed_profile(kernel::profile::Profile* profile)
{
xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->get_cname());
- speed_.event = future_evt_set->add_trace(trace, this);
+ speed_.event = profile->schedule(&future_evt_set, this);
}
set_last_value(get_variable()->get_value());
}
-simgrid::xbt::signal<void(simgrid::surf::CpuAction*)> CpuAction::on_state_change;
+simgrid::xbt::signal<void(simgrid::surf::CpuAction*, kernel::resource::Action::State)> CpuAction::on_state_change;
void CpuAction::suspend(){
- on_state_change(this);
+ Action::State previous = get_state();
+ on_state_change(this, previous);
Action::suspend();
}
void CpuAction::resume(){
- on_state_change(this);
+ Action::State previous = get_state();
+ on_state_change(this, previous);
Action::resume();
}
void CpuAction::set_state(Action::State state)
{
+ Action::State previous = get_state();
Action::set_state(state);
- on_state_change(this);
+ on_state_change(this, previous);
}
/** @brief returns a list of all CPUs that this action is using */