Parser cleanup: simplify structure's fields' names

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

diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c
index 01630f2..6adc2bc 100644 (file)
--- a/src/surf/cpu_im.c
+++ b/src/surf/cpu_im.c
@@ -90,15 +90,14 @@ static void* cpu_im_create_resource(const char *name, double power_peak,
 
 static void parse_cpu_im_init(sg_platf_host_cbarg_t host)
 {
-       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,
-                         current_property_set);
-       current_property_set = NULL;
+       cpu_im_create_resource(host->id,
+                         host->power_peak,
+                         host->power_scale,
+                         host->power_trace,
+                         host->core_amount,
+                         host->initial_state,
+                         host->state_trace,
+                         host->properties);
 }
 
 static void cpu_im_add_traces_cpu(void)
@@ -137,8 +136,7 @@ static void cpu_im_add_traces_cpu(void)
 static void cpu_im_define_callbacks()
 {
   sg_platf_host_add_cb(parse_cpu_im_init);
-  surfxml_add_callback(ETag_surfxml_platform_cb_list,
-                       &cpu_im_add_traces_cpu);
+  sg_platf_postparse_add_cb(cpu_im_add_traces_cpu);
 }
 
 static int cpu_im_resource_used(void *resource)