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
fix a stupid error: actually plug the CPU into the host...
[simgrid.git]
/
src
/
surf
/
sg_platf.cpp
diff --git
a/src/surf/sg_platf.cpp
b/src/surf/sg_platf.cpp
index
206a1ee
..
208484b
100644
(file)
--- a/
src/surf/sg_platf.cpp
+++ b/
src/surf/sg_platf.cpp
@@
-60,18
+60,17
@@
void sg_platf_new_host(sg_platf_host_cbarg_t host)
if (current_routing)
net = routing_add_host(current_routing, host);
if (current_routing)
net = routing_add_host(current_routing, host);
+ sg_host_t h = simgrid::Host::by_name_or_create(host->id);
simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu(
simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu(
-
host->id
,
+
h
,
host->speed_peak,
host->pstate,
host->speed_scale,
host->speed_trace,
host->core_amount,
host->initial_state,
host->speed_peak,
host->pstate,
host->speed_scale,
host->speed_trace,
host->core_amount,
host->initial_state,
- host->state_trace,
- host->properties);
- surf_host_model->createHost(host->id, net, cpu);
-
+ host->state_trace);
+ surf_host_model->createHost(host->id, net, cpu, host->properties)->attach(h);
if (TRACE_is_enabled() && TRACE_needs_platform())
sg_instr_new_host(host);
}
if (TRACE_is_enabled() && TRACE_needs_platform())
sg_instr_new_host(host);
}
@@
-181,13
+180,13
@@
void sg_platf_new_storage(sg_platf_storage_cbarg_t storage)
((storage_type_t) stype)->type_id,
storage->content,
storage->content_type,
((storage_type_t) stype)->type_id,
storage->content,
storage->content_type,
- storage->properties);
+
storage->properties);
surf_storage_model->createStorage(storage->id,
((storage_type_t) stype)->type_id,
storage->content,
storage->content_type,
surf_storage_model->createStorage(storage->id,
((storage_type_t) stype)->type_id,
storage->content,
storage->content_type,
- storage->properties,
+
storage->properties,
storage->attach);
}
void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){
storage->attach);
}
void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){