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
Start cleaning up the log channel hierarchy
[simgrid.git]
/
src
/
surf
/
cpu_interface.cpp
diff --git
a/src/surf/cpu_interface.cpp
b/src/surf/cpu_interface.cpp
index
606961a
..
0c33ed9
100644
(file)
--- a/
src/surf/cpu_interface.cpp
+++ b/
src/surf/cpu_interface.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-20
21
. 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. */
/* 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. */
@@
-8,8
+8,7
@@
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
-XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, "Logging specific to the SURF cpu module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu, resource, "CPU resource");
simgrid::kernel::resource::CpuModel* surf_cpu_model_pm;
simgrid::kernel::resource::CpuModel* surf_cpu_model_vm;
simgrid::kernel::resource::CpuModel* surf_cpu_model_pm;
simgrid::kernel::resource::CpuModel* surf_cpu_model_vm;
@@
-25,12
+24,11
@@
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)) {
-
auto* 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);
+ XBT_
DEBUG(
"Something happened to action %p", action);
action->finish(kernel::resource::Action::State::FINISHED);
action->finish(kernel::resource::Action::State::FINISHED);
- XBT_
CDEBUG(surf_kernel,
"Action %p finished", action);
+ XBT_
DEBUG(
"Action %p finished", action);
}
}
}
}
@@
-73,6
+71,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();
@@
-147,11
+153,11
@@
void CpuAction::update_remains_lazy(double now)
double delta = now - get_last_update();
if (get_remains_no_update() > 0) {
double delta = now - get_last_update();
if (get_remains_no_update() > 0) {
- XBT_
CDEBUG(surf_kernel,
"Updating action(%p): remains was %f, last_update was: %f", this, get_remains_no_update(),
-
get_last_update());
+ XBT_
DEBUG(
"Updating action(%p): remains was %f, last_update was: %f", this, get_remains_no_update(),
+ get_last_update());
update_remains(get_last_value() * delta);
update_remains(get_last_value() * delta);
- XBT_
CDEBUG(surf_kernel,
"Updating action(%p): remains is now %f", this, get_remains_no_update());
+ XBT_
DEBUG(
"Updating action(%p): remains is now %f", this, get_remains_no_update());
}
set_last_update();
}
set_last_update();
@@
-189,7
+195,7
@@
std::list<Cpu*> CpuAction::cpus() const
/* Beware of composite actions: ptasks put links and cpus together */
// extra pb: we cannot dynamic_cast from void*...
Resource* resource = get_variable()->get_constraint(i)->get_id();
/* Beware of composite actions: ptasks put links and cpus together */
// extra pb: we cannot dynamic_cast from void*...
Resource* resource = get_variable()->get_constraint(i)->get_id();
-
Cpu* cpu
= dynamic_cast<Cpu*>(resource);
+
auto* cpu
= dynamic_cast<Cpu*>(resource);
if (cpu != nullptr)
retlist.push_back(cpu);
}
if (cpu != nullptr)
retlist.push_back(cpu);
}