A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into adrien
[simgrid.git]
/
src
/
surf
/
cpu_interface.cpp
diff --git
a/src/surf/cpu_interface.cpp
b/src/surf/cpu_interface.cpp
index
8325194
..
6cbbe10
100644
(file)
--- a/
src/surf/cpu_interface.cpp
+++ b/
src/surf/cpu_interface.cpp
@@
-1,9
+1,10
@@
-/* Copyright (c) 2013-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-20
20
. 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"
/* 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"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
@@
-24,8
+25,7
@@
namespace resource {
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)) {
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);
XBT_CDEBUG(surf_kernel, "Something happened to action %p", action);
action->finish(kernel::resource::Action::State::FINISHED);
@@
-36,13
+36,13
@@
void CpuModel::update_actions_state_lazy(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());) {
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);
++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);
}
((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
action.finish(Action::State::FINISHED);
}
@@
-72,6
+72,14
@@
Cpu::Cpu(Model* model, s4u::Host* host, lmm::Constraint* constraint, const std::
xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->get_cname());
}
xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->get_cname());
}
+void Cpu::reset_vcpu(Cpu* that)
+{
+ this->pstate_ = that->pstate_;
+ this->speed_ = that->speed_;
+ this->speed_per_pstate_.clear();
+ this->speed_per_pstate_.assign(that->speed_per_pstate_.begin(), that->speed_per_pstate_.end());
+}
+
int Cpu::get_pstate_count() const
{
return speed_per_pstate_.size();
int Cpu::get_pstate_count() const
{
return speed_per_pstate_.size();
@@
-129,7
+137,7
@@
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());
{
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);
}
}
@@
-141,7
+149,7
@@
void CpuAction::update_remains_lazy(double now)
{
xbt_assert(get_state_set() == get_model()->get_started_action_set(),
"You're updating an action that is not running.");
{
xbt_assert(get_state_set() == get_model()->get_started_action_set(),
"You're updating an action that is not running.");
- xbt_assert(get_
priori
ty() > 0, "You're updating an action that seems suspended.");
+ xbt_assert(get_
sharing_penal
ty() > 0, "You're updating an action that seems suspended.");
double delta = now - get_last_update();
double delta = now - get_last_update();
@@
-187,7
+195,7
@@
std::list<Cpu*> CpuAction::cpus() const
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*...
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);
Cpu* cpu = dynamic_cast<Cpu*>(resource);
if (cpu != nullptr)
retlist.push_back(cpu);