Clean callbacks for the host parsing.

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

diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c
index 1878ea4..726ecb5 100644 (file)
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -654,16 +654,16 @@ static void* ptask_cpu_create_resource(const char *name, double power_scale,
   return cpu;
 }
 
   return cpu;
 }
 

-static void ptask_parse_cpu_init(void)
+static void ptask_parse_cpu_init(surf_parsing_host_arg_t host)

 {
   ptask_cpu_create_resource(
 {
   ptask_cpu_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_state_initial,
-                 struct_host->V_host_state_trace,
-          current_property_set);
+                 host->V_host_id,
+                 host->V_host_power_peak,
+                 host->V_host_power_scale,
+                 host->V_host_power_trace,
+                 host->V_host_state_initial,
+                 host->V_host_state_trace,
+                 current_property_set);

   current_property_set=NULL;
 }
 
   current_property_set=NULL;
 }
 


@@ -802,7 +802,7 @@ static void ptask_add_traces(void)
 static void ptask_define_callbacks()
 {
   /* Adding callback functions */
 static void ptask_define_callbacks()
 {
   /* Adding callback functions */

-  surfxml_add_callback(ETag_surfxml_host_cb_list, &ptask_parse_cpu_init);
+  surf_parse_host_add_cb(ptask_parse_cpu_init);

   surfxml_add_callback(ETag_surfxml_link_cb_list, &ptask_parse_link_init);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &ptask_add_traces);
 }
   surfxml_add_callback(ETag_surfxml_link_cb_list, &ptask_parse_link_init);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &ptask_add_traces);
 }