X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..d2d941a9e68e4389cd4148ccbe1cb35da63e54e4:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 206a1ee60c..208484b51b 100644 --- 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); + sg_host_t h = simgrid::Host::by_name_or_create(host->id); 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->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); } @@ -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->properties); + storage->properties); 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){