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

[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 3994355..087e1a7 100644 (file)
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -614,22 +614,22 @@ static int ptask_link_shared(const void *link)
 /*** Resource Creation & Destruction **/
 /**************************************/
 
-static void* ptask_cpu_create_resource(char *name, double power_scale,
+static void* ptask_cpu_create_resource(const char *name, double power_scale,
                                double power_initial,
                                tmgr_trace_t power_trace,
                                e_surf_resource_state_t state_initial,
                                tmgr_trace_t state_trace,
                                xbt_dict_t cpu_properties)
 {
-  cpu_L07_t cpu = xbt_new0(s_cpu_L07_t, 1);
+  cpu_L07_t cpu = NULL;
   xbt_assert(!surf_workstation_resource_by_name(name),
               "Host '%s' declared several times in the platform file.",
               name);
 
-  cpu->generic_resource.model = surf_workstation_model;
+  cpu = (cpu_L07_t) surf_resource_new(sizeof(s_cpu_L07_t),
+          surf_workstation_model, name,cpu_properties);
+
   cpu->type = SURF_WORKSTATION_RESOURCE_CPU;
-  cpu->generic_resource.name = xbt_strdup(name);
-  cpu->generic_resource.properties = cpu_properties;
   cpu->id = ptask_host_count++;
 
   cpu->power_scale = power_scale;
@@ -654,20 +654,19 @@ static void* ptask_cpu_create_resource(char *name, double power_scale,
   return cpu;
 }
 
-static void ptask_parse_cpu_init(void)
+static void ptask_parse_cpu_init(sg_platf_host_cbarg_t host)
 {
   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);
-  current_property_set=NULL;
+                 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,
+                 host->properties);
 }
 
-static void* ptask_link_create_resource(char *name,
+static void* ptask_link_create_resource(const char *name,
                                  double bw_initial,
                                  tmgr_trace_t bw_trace,
                                  double lat_initial,
@@ -685,7 +684,7 @@ static void* ptask_link_create_resource(char *name,
 
   nw_link->generic_resource.model = surf_workstation_model;
   nw_link->generic_resource.properties = properties;
-  nw_link->generic_resource.name = name;
+  nw_link->generic_resource.name = xbt_strdup(name);
   nw_link->type = SURF_WORKSTATION_RESOURCE_LINK;
   nw_link->bw_current = bw_initial;
   if (bw_trace)
@@ -799,10 +798,10 @@ static void ptask_add_traces(void)
   }
 }
 
-static void ptask_define_callbacks(const char *file)
+static void ptask_define_callbacks()
 {
   /* Adding callback functions */
-  surfxml_add_callback(ETag_surfxml_host_cb_list, &ptask_parse_cpu_init);
+  sg_platf_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);
 }
@@ -881,13 +880,13 @@ static void ptask_model_init_internal(void)
 /**************************************/
 /*************** Generic **************/
 /**************************************/
-void surf_workstation_model_init_ptask_L07(const char *filename)
+void surf_workstation_model_init_ptask_L07(void)
 {
   XBT_INFO("surf_workstation_model_init_ptask_L07");
   xbt_assert(!surf_cpu_model, "CPU model type already defined");
   xbt_assert(!surf_network_model, "network model type already defined");
   surf_network_model = surf_model_init();
-  ptask_define_callbacks(filename);
+  ptask_define_callbacks();
   ptask_model_init_internal();
 
   update_model_description(surf_workstation_model_description,