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 NetCards to NetPoints
[simgrid.git]
/
src
/
surf
/
cpu_interface.cpp
diff --git
a/src/surf/cpu_interface.cpp
b/src/surf/cpu_interface.cpp
index
4873c12
..
e9fb0c7
100644
(file)
--- a/
src/surf/cpu_interface.cpp
+++ b/
src/surf/cpu_interface.cpp
@@
-113,18
+113,16
@@
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)
- : Resource(model, host->name().c_str(), constraint)
- , coresAmount_(core)
- , host_(host)
+Cpu::Cpu(Model* model, simgrid::s4u::Host* host, lmm_constraint_t constraint, std::vector<double>* speedPerPstate,
+ int core)
+ : Resource(model, host->cname(), constraint), coresAmount_(core), host_(host)
{
- xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->
name().c_str
());
+ xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->
cname
());
speed_.peak = speedPerPstate->front();
speed_.scale = 1;
host->pimpl_cpu = this;
- xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->
name().c_str
());
+ xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->
cname
());
// Copy the power peak array:
for (double value : *speedPerPstate) {
@@
-193,13
+191,13
@@
int Cpu::coreCount()
void Cpu::setStateTrace(tmgr_trace_t trace)
{
- xbt_assert(stateEvent_
==nullptr,"Cannot set a second state trace to Host %s", host_->name().c_str
());
+ xbt_assert(stateEvent_
== nullptr, "Cannot set a second state trace to Host %s", host_->cname
());
stateEvent_ = future_evt_set->add_trace(trace, 0.0, this);
}
void Cpu::setSpeedTrace(tmgr_trace_t trace)
{
- xbt_assert(speed_.event
==nullptr,"Cannot set a second speed trace to Host %s", host_->name().c_str
());
+ xbt_assert(speed_.event
== nullptr, "Cannot set a second speed trace to Host %s", host_->cname
());
speed_.event = future_evt_set->add_trace(trace, 0.0, this);
}
@@
-243,8
+241,14
@@
std::list<Cpu*> CpuAction::cpus() {
lmm_system_t sys = getModel()->getMaxminSystem();
int llen = lmm_get_number_of_cnst_from_var(sys, getVariable());
- for(int i = 0; i<llen; i++)
- retlist.push_back( (Cpu*)(lmm_constraint_id( lmm_get_cnst_from_var(sys, getVariable(), i) )) );
+ 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*>(lmm_constraint_id(lmm_get_cnst_from_var(sys, getVariable(), i)));
+ Cpu* cpu = dynamic_cast<Cpu*>(resource);
+ if (cpu != nullptr)
+ retlist.push_back(cpu);
+ }
return retlist;
}