fix the last broken tests by sanitizing the way properties are handled during the...

[simgrid.git] / src / surf / cpu_im.c

diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c
index caa3a9d..ada8774 100644 (file)
--- a/src/surf/cpu_im.c
+++ b/src/surf/cpu_im.c
@@ -88,17 +88,16 @@ static void* cpu_im_create_resource(const char *name, double power_peak,
 }
 
 
-static void parse_cpu_im_init(void)
+static void parse_cpu_im_init(sg_platf_host_cbarg_t host)
 {
-       cpu_im_create_resource(struct_host->V_host_id,
-                         struct_host->V_host_power_peak,
-                         struct_host->V_host_power_scale,
-                         struct_host->V_host_power_trace,
-                         struct_host->V_host_core,
-                         struct_host->V_host_state_initial,
-                         struct_host->V_host_state_trace,
-                         current_property_set);
-       current_property_set = NULL;
+       cpu_im_create_resource(host->V_host_id,
+                         host->V_host_power_peak,
+                         host->V_host_power_scale,
+                         host->V_host_power_trace,
+                         host->V_host_core,
+                         host->V_host_state_initial,
+                         host->V_host_state_trace,
+                         host->properties);
 }
 
 static void cpu_im_add_traces_cpu(void)
@@ -136,7 +135,7 @@ static void cpu_im_add_traces_cpu(void)
 
 static void cpu_im_define_callbacks()
 {
-  surfxml_add_callback(ETag_surfxml_host_cb_list, parse_cpu_im_init);
+  sg_platf_host_add_cb(parse_cpu_im_init);
   surfxml_add_callback(ETag_surfxml_platform_cb_list,
                        &cpu_im_add_traces_cpu);
 }