* Cleanup the DTD by renaming:

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

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index 0568742..1f01028 100644 (file)
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -13,7 +13,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf,
 surf_cpu_model_t surf_cpu_model = NULL;
 lmm_system_t cpu_maxmin_system = NULL;
 
-xbt_dict_t cpu_set = NULL;
+xbt_dict_t cpu_set;
 
 static void cpu_free(void *cpu)
 {
@@ -25,7 +25,8 @@ static cpu_Cas01_t cpu_new(char *name, double power_scale,
                           double power_initial,
                           tmgr_trace_t power_trace,
                           e_surf_cpu_state_t state_initial,
-                          tmgr_trace_t state_trace)
+                          tmgr_trace_t state_trace,
+                          xbt_dict_t cpu_properties)
 {
   cpu_Cas01_t cpu = xbt_new0(s_cpu_Cas01_t, 1);
 
@@ -47,42 +48,50 @@ static cpu_Cas01_t cpu_new(char *name, double power_scale,
       lmm_constraint_new(cpu_maxmin_system, cpu,
                         cpu->power_current * cpu->power_scale);
 
+  /*add the property set*/
+  cpu->properties = cpu_properties;
+
+  current_property_set = cpu_properties;
+
   xbt_dict_set(cpu_set, name, cpu, cpu_free);
 
   return cpu;
 }
 
-static void parse_cpu(void)
+
+static void parse_cpu_init(void)
 {
-  char *name = NULL;
   double power_scale = 0.0;
   double power_initial = 0.0;
   tmgr_trace_t power_trace = NULL;
   e_surf_cpu_state_t state_initial = SURF_CPU_OFF;
   tmgr_trace_t state_trace = NULL;
 
-  name = xbt_strdup(A_surfxml_cpu_name);
-  surf_parse_get_double(&power_scale, A_surfxml_cpu_power);
-  surf_parse_get_double(&power_initial, A_surfxml_cpu_availability);
-  surf_parse_get_trace(&power_trace, A_surfxml_cpu_availability_file);
+  surf_parse_get_double(&power_scale, A_surfxml_host_power);
+  surf_parse_get_double(&power_initial, A_surfxml_host_availability);
+  surf_parse_get_trace(&power_trace, A_surfxml_host_availability_file);
 
-  xbt_assert0((A_surfxml_cpu_state == A_surfxml_cpu_state_ON) ||
-             (A_surfxml_cpu_state == A_surfxml_cpu_state_OFF),
+  xbt_assert0((A_surfxml_host_state == A_surfxml_host_state_ON) ||
+             (A_surfxml_host_state == A_surfxml_host_state_OFF),
              "Invalid state");
-  if (A_surfxml_cpu_state == A_surfxml_cpu_state_ON)
+  if (A_surfxml_host_state == A_surfxml_host_state_ON)
     state_initial = SURF_CPU_ON;
-  if (A_surfxml_cpu_state == A_surfxml_cpu_state_OFF)
+  if (A_surfxml_host_state == A_surfxml_host_state_OFF)
     state_initial = SURF_CPU_OFF;
-  surf_parse_get_trace(&state_trace, A_surfxml_cpu_state_file);
+  surf_parse_get_trace(&state_trace, A_surfxml_host_state_file); 
+
+  current_property_set = xbt_dict_new();
+  cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace, state_initial,
+         state_trace, /*add the properties*/ current_property_set);
 
-  cpu_new(name, power_scale, power_initial, power_trace, state_initial,
-         state_trace);
 }
 
 static void parse_file(const char *file)
 {
   surf_parse_reset_parser();
-  ETag_surfxml_cpu_fun = parse_cpu;
+  surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_init);
+  surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
+
   surf_parse_open(file);
   xbt_assert1((!surf_parse()), "Parse error in %s", file);
   surf_parse_close();
@@ -93,15 +102,15 @@ static void *name_service(const char *name)
   return xbt_dict_get_or_null(cpu_set, name);
 }
 
-static const char *get_model_name(void *model_id)
+static const char *get_resource_name(void *resource_id)
 {
-  return ((cpu_Cas01_t) model_id)->name;
+  return ((cpu_Cas01_t) resource_id)->name;
 }
 
-static int model_used(void *model_id)
+static int resource_used(void *resource_id)
 {
   return lmm_constraint_used(cpu_maxmin_system,
-                            ((cpu_Cas01_t) model_id)->constraint);
+                            ((cpu_Cas01_t) resource_id)->constraint);
 }
 
 static int action_free(surf_action_t action)
@@ -147,13 +156,13 @@ static void action_change_state(surf_action_t action,
   return;
 }
 
-static double share_models(double now)
+static double share_resources(double now)
 {
   s_surf_action_cpu_Cas01_t action;
-  return generic_maxmin_share_models2(surf_cpu_model->common_public->
-                                        states.running_action_set,
-                                        xbt_swag_offset(action, variable),
-                                        cpu_maxmin_system, lmm_solve);
+  return generic_maxmin_share_resources(surf_cpu_model->common_public->
+                                       states.running_action_set,
+                                       xbt_swag_offset(action, variable),
+                                       cpu_maxmin_system, lmm_solve);
 }
 
 static void update_actions_state(double now, double delta)
@@ -201,7 +210,7 @@ static void update_actions_state(double now, double delta)
   return;
 }
 
-static void update_model_state(void *id,
+static void update_resource_state(void *id,
                                  tmgr_trace_event_t event_type,
                                  double value)
 {
@@ -334,6 +343,11 @@ static double get_available_speed(void *cpu)
   return ((cpu_Cas01_t) cpu)->power_current;
 }
 
+static xbt_dict_t get_properties(void *cpu)
+{
+ return ((cpu_Cas01_t) cpu)->properties;
+}
+
 static void finalize(void)
 {
   xbt_dict_free(&cpu_set);
@@ -374,7 +388,7 @@ static void surf_cpu_model_init_internal(void)
       xbt_swag_new(xbt_swag_offset(action, state_hookup));
 
   surf_cpu_model->common_public->name_service = name_service;
-  surf_cpu_model->common_public->get_model_name = get_model_name;
+  surf_cpu_model->common_public->get_resource_name = get_resource_name;
   surf_cpu_model->common_public->action_get_state =
       surf_action_get_state;
   surf_cpu_model->common_public->action_get_start_time =
@@ -390,12 +404,12 @@ static void surf_cpu_model_init_internal(void)
   surf_cpu_model->common_public->action_set_data = surf_action_set_data;
   surf_cpu_model->common_public->name = "CPU";
 
-  surf_cpu_model->common_private->model_used = model_used;
-  surf_cpu_model->common_private->share_models = share_models;
+  surf_cpu_model->common_private->resource_used = resource_used;
+  surf_cpu_model->common_private->share_resources = share_resources;
   surf_cpu_model->common_private->update_actions_state =
       update_actions_state;
-  surf_cpu_model->common_private->update_model_state =
-      update_model_state;
+  surf_cpu_model->common_private->update_resource_state =
+      update_resource_state;
   surf_cpu_model->common_private->finalize = finalize;
 
   surf_cpu_model->common_public->suspend = action_suspend;
@@ -411,11 +425,11 @@ static void surf_cpu_model_init_internal(void)
   surf_cpu_model->extension_public->get_speed = get_speed;
   surf_cpu_model->extension_public->get_available_speed =
       get_available_speed;
+  /*manage the properties of the cpu*/
+  surf_cpu_model->common_public->get_cpu_properties = get_properties;
 
-  cpu_set = xbt_dict_new();
-
-  if (!cpu_maxmin_system)
-    cpu_maxmin_system = lmm_system_new();
+  if(!cpu_set) cpu_set = xbt_dict_new();
+  if (!cpu_maxmin_system) cpu_maxmin_system = lmm_system_new();
 }
 
 /*********************************************************************/