merging branch 5018:5083 into trunk

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

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index eb6ca05..5abfc22 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;
+xbt_dict_t cpu_set = NULL;
 
 static void cpu_free(void *cpu)
 {
@@ -29,9 +29,11 @@ static cpu_Cas01_t cpu_new(char *name, double power_scale,
                           xbt_dict_t cpu_properties)
 {
   cpu_Cas01_t cpu = xbt_new0(s_cpu_Cas01_t, 1);
-
+  xbt_assert1(!xbt_dict_get_or_null(cpu_set, name),
+             "Host '%s' declared several times in the platform file",name);
+   
   cpu->model = (surf_model_t) surf_cpu_model;
-  cpu->name = xbt_strdup(name);
+  cpu->name = name;
   cpu->power_scale = power_scale;
   xbt_assert0(cpu->power_scale > 0, "Power has to be >0");
   cpu->power_current = power_initial;
@@ -67,7 +69,7 @@ static void parse_cpu_init(void)
   e_surf_cpu_state_t state_initial = SURF_CPU_OFF;
   tmgr_trace_t state_trace = NULL;
 
-  surf_parse_get_double(&power_scale, A_surfxml_host_power);
+  power_scale = get_cpu_power(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);
 
@@ -81,20 +83,53 @@ static void parse_cpu_init(void)
   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(xbt_strdup(A_surfxml_host_id), power_scale, power_initial, power_trace, state_initial,
+         state_trace,  current_property_set);
+
+}
 
+static int called = 0;
+
+static void add_traces(void)
+{
+   xbt_dynar_t trace_connect = NULL;
+   unsigned int cpt;
+   int connect_element, connect_kind;
+   char *value, *trace_id, *connector_id;
+   cpu_Cas01_t host = NULL;
+   tmgr_trace_t trace;
+   
+   if (called) return;
+   called = 1;
+
+   /*for all trace connects parse them and update traces for hosts */
+   xbt_dynar_foreach (traces_connect_list, cpt, value) {
+     trace_connect = xbt_str_split_str(value, "##");
+     trace_id        = xbt_dynar_get_as(trace_connect, 0, char*);
+     connect_element = atoi(xbt_dynar_get_as(trace_connect, 1, char*)); 
+     connect_kind    = atoi(xbt_dynar_get_as(trace_connect, 2, char*));
+     connector_id    = xbt_dynar_get_as(trace_connect, 3, char*);
+
+     xbt_assert1((trace = xbt_dict_get_or_null(traces_set_list, trace_id)), "Trace %s undefined", trace_id);
+
+     if (connect_element == A_surfxml_trace_c_connect_element_HOST) {
+        xbt_assert1((host = xbt_dict_get_or_null(cpu_set, connector_id)), "Host %s undefined", connector_id);
+        switch (connect_kind) {
+           case A_surfxml_trace_c_connect_kind_AVAILABILITY: host->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, host); break;
+           case A_surfxml_trace_c_connect_kind_POWER: host->power_event = tmgr_history_add_trace(history, trace, 0.0, 0, host); break;
+        }
+     }
+   }
 }
 
-static void parse_file(const char *file)
+static void define_callbacks(const char *file)
 {
   surf_parse_reset_parser();
   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();
+  surfxml_add_callback(STag_surfxml_prop_cb_list, parse_properties);
+  surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces);
+  surfxml_add_callback(STag_surfxml_random_cb_list, &init_randomness);
+  surfxml_add_callback(ETag_surfxml_random_cb_list, &add_randomness);
 }
 
 static void *name_service(const char *name)
@@ -426,7 +461,7 @@ static void surf_cpu_model_init_internal(void)
   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;
+  surf_cpu_model->common_public->get_properties = get_properties;
 
   if(!cpu_set) cpu_set = xbt_dict_new();
   if (!cpu_maxmin_system) cpu_maxmin_system = lmm_system_new();
@@ -452,6 +487,6 @@ void surf_cpu_model_init_Cas01(const char *filename)
   if (surf_cpu_model)
     return;
   surf_cpu_model_init_internal();
-  parse_file(filename);
+  define_callbacks(filename);
   xbt_dynar_push(model_list, &surf_cpu_model);
 }