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
rename simgrid::kernel::model into simgrid::kernel::resource
[simgrid.git]
/
src
/
surf
/
cpu_interface.cpp
diff --git
a/src/surf/cpu_interface.cpp
b/src/surf/cpu_interface.cpp
index
6708124
..
1fcf505
100644
(file)
--- a/
src/surf/cpu_interface.cpp
+++ b/
src/surf/cpu_interface.cpp
@@
-85,8
+85,8
@@
Cpu::Cpu(Model *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPs
{
}
-Cpu::Cpu(Model* model, simgrid::s4u::Host* host,
lmm_constraint_t constraint, std::vector<double>* speedPerPstate
,
- int core)
+Cpu::Cpu(Model* model, simgrid::s4u::Host* host,
kernel::lmm::Constraint* constraint
,
+
std::vector<double>* speedPerPstate,
int core)
: Resource(model, host->getCname(), constraint), coresAmount_(core), host_(host)
{
xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->getCname());
@@
-225,7
+225,8
@@
std::list<Cpu*> CpuAction::cpus() {
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*>(getVariable()->get_constraint(i)->get_id());
+ kernel::resource::Resource* resource =
+ static_cast<kernel::resource::Resource*>(getVariable()->get_constraint(i)->get_id());
Cpu* cpu = dynamic_cast<Cpu*>(resource);
if (cpu != nullptr)
retlist.push_back(cpu);