not all resources need a property set, only Host, Link and Storage

[simgrid.git] / src / surf / sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 8efd18d..b189642 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -60,6 +60,7 @@ 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,
         host->speed_peak,
@@ -68,11 +69,9 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host)
         host->speed_trace,
         host->core_amount,
         host->initial_state,
-        host->state_trace,
-        host->properties);
-  sg_host_surfcpu_register(sg_host_by_name(host->id), cpu);
-  surf_host_model->createHost(host->id, net, cpu);
-
+        host->state_trace);
+  cpu->plug(h);
+  surf_host_model->createHost(host->id, net, cpu, host->properties)->attach(h);
   if (TRACE_is_enabled() && TRACE_needs_platform())
     sg_instr_new_host(host);
 }
@@ -182,13 +181,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){