Fix cluster without backbone.

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

diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c
index 327469d..7e06861 100644 (file)
--- a/src/surf/cpu_im.c
+++ b/src/surf/cpu_im.c
@@ -47,7 +47,7 @@ extern int sg_maxmin_selective_update;
 static xbt_swag_t
     cpu_im_running_action_set_that_does_not_need_being_checked = NULL;
 
-static cpu_Cas01_im_t cpu_im_new(char *name, double power_peak,
+static void* cpu_im_create_resource(char *name, double power_peak,
                                  double power_scale,
                                  tmgr_trace_t power_trace,
                                  int core,
@@ -92,32 +92,15 @@ static cpu_Cas01_im_t cpu_im_new(char *name, double power_peak,
 
 static void parse_cpu_im_init(void)
 {
-  double power_peak = 0.0;
-  double power_scale = 0.0;
-  int core = 0;
-  tmgr_trace_t power_trace = NULL;
-  e_surf_resource_state_t state_initial = SURF_RESOURCE_OFF;
-  tmgr_trace_t state_trace = NULL;
-
-  power_peak = get_cpu_power(A_surfxml_host_power);
-  surf_parse_get_double(&power_scale, A_surfxml_host_availability);
-  power_trace = tmgr_trace_new(A_surfxml_host_availability_file);
-  surf_parse_get_int(&core, A_surfxml_host_core);
-
-  xbt_assert((A_surfxml_host_state == A_surfxml_host_state_ON) ||
-              (A_surfxml_host_state == A_surfxml_host_state_OFF),
-              "Invalid state");
-  if (A_surfxml_host_state == A_surfxml_host_state_ON)
-    state_initial = SURF_RESOURCE_ON;
-  if (A_surfxml_host_state == A_surfxml_host_state_OFF)
-    state_initial = SURF_RESOURCE_OFF;
-  state_trace = tmgr_trace_new(A_surfxml_host_state_file);
-
-  cpu_im_new(xbt_strdup(A_surfxml_host_id), power_peak, power_scale,
-             power_trace, core, state_initial, state_trace,
-             current_property_set);
-  current_property_set = NULL;
-
+       cpu_im_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_core,
+                         struct_host->V_host_state_initial,
+                         struct_host->V_host_state_trace,
+                         current_property_set);
+       current_property_set = NULL;
 }
 
 static void cpu_im_add_traces_cpu(void)
@@ -234,7 +217,7 @@ static void cpu_im_update_remains(cpu_Cas01_im_t cpu, double now)
                                           (action).variable) * (now -
                                                                 cpu->last_update));
 #ifdef HAVE_TRACING
-      if (TRACE_is_active()) {
+      if (TRACE_is_enabled()) {
         TRACE_surf_host_set_utilization(cpu->generic_resource.name,
                                         action->
                                         generic_lmm_action.generic_action.
@@ -327,7 +310,7 @@ static void cpu_im_update_actions_state(double now, double delta)
     GENERIC_ACTION(action).finish = surf_get_clock();
     /* set the remains to 0 due to precision problems when updating the remaining amount */
 #ifdef HAVE_TRACING
-    if (TRACE_is_active()) {
+    if (TRACE_is_enabled()) {
       cpu_Cas01_im_t cpu = ((cpu_Cas01_im_t)(action->cpu));
       TRACE_surf_host_set_utilization(cpu->generic_resource.name,
           action->generic_lmm_action.generic_action.data,
@@ -342,7 +325,7 @@ static void cpu_im_update_actions_state(double now, double delta)
     cpu_im_update_remains(action->cpu, surf_get_clock());
   }
 #ifdef HAVE_TRACING
-  if (TRACE_is_active()) {
+  if (TRACE_is_enabled()) {
     //defining the last timestamp that we can safely dump to trace file
     //without losing the event ascending order (considering all CPU's)
     void **data;
@@ -580,18 +563,6 @@ static void cpu_im_action_update_index_heap(void *action, int i)
   ((surf_action_cpu_Cas01_im_t) action)->index_heap = i;
 }
 
-static void cpu_im_create_resource(char *name, double power_peak,
-                                   double power_scale,
-                                   tmgr_trace_t power_trace,
-                                   int core,
-                                   e_surf_resource_state_t state_initial,
-                                   tmgr_trace_t state_trace,
-                                   xbt_dict_t cpu_properties)
-{
-  cpu_im_new(name, power_peak, power_scale, power_trace, core,
-             state_initial, state_trace, cpu_properties);
-}
-
 static void cpu_im_finalize(void)
 {
   void **cpu;