X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/70388188c97f56fbe2b645c9b00dcb05d0b86509..d549f28334d919c9efe4cca11076418a3280bdec:/src/surf/cpu_ti.c

diff --git a/src/surf/cpu_ti.c b/src/surf/cpu_ti.c
index fe6e4f446e..0b9f2624d9 100644
--- a/src/surf/cpu_ti.c
+++ b/src/surf/cpu_ti.c
@@ -14,6 +14,7 @@
 #include "trace_mgr_private.h"
 #include "cpu_ti_private.h"
 #include "xbt/heap.h"
+#include "surf/surf_resource.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf,
                                 "Logging specific to the SURF CPU TRACE INTEGRATION module");
@@ -49,10 +50,8 @@ static int surf_cpu_ti_binary_search(double *array, double a, int low,
 
 static void surf_cpu_ti_free_trace(surf_cpu_ti_trace_t trace)
 {
-  if (trace->time_points)
-    xbt_free(trace->time_points);
-  if (trace->integral)
-    xbt_free(trace->integral);
+  xbt_free(trace->time_points);
+  xbt_free(trace->integral);
   xbt_free(trace);
 }
 
@@ -190,17 +189,16 @@ static void* cpu_ti_create_resource(const char *name, double power_peak,
 }
 
 
-static void parse_cpu_ti_init(surf_parsing_host_arg_t host)
+static void parse_cpu_ti_init(sg_platf_host_cbarg_t host)
 {
-  cpu_ti_create_resource(host->V_host_id,
-			  host->V_host_power_peak,
-			  host->V_host_power_scale,
-			  host->V_host_power_trace,
-			  host->V_host_core,
-			  host->V_host_state_initial,
-			  host->V_host_state_trace,
-			  current_property_set);
-  current_property_set = NULL;
+  cpu_ti_create_resource(host->id,
+			  host->power_peak,
+			  host->power_scale,
+			  host->power_trace,
+			  host->core_amount,
+			  host->initial_state,
+			  host->state_trace,
+			  host->properties);
 
 }
 
@@ -263,8 +261,8 @@ static void add_traces_cpu_ti(void)
 
 static void cpu_ti_define_callbacks()
 {
-  surf_parse_host_add_cb(parse_cpu_ti_init);
-  surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu_ti);
+  sg_platf_host_add_cb(parse_cpu_ti_init);
+  sg_platf_postparse_add_cb(add_traces_cpu_ti);
 }
 
 static int cpu_ti_resource_used(void *resource_id)
@@ -683,8 +681,8 @@ static double cpu_ti_action_get_remains(surf_action_t action)
   cpu_ti_update_remaining_amount((cpu_ti_t)
                                  ((surf_action_cpu_ti_t) action)->cpu,
                                  surf_get_clock());
-  return action->remains;
   XBT_OUT();
+  return action->remains;
 }
 
 static e_surf_resource_state_t cpu_ti_get_state(void *cpu)
@@ -767,7 +765,7 @@ static void surf_cpu_ti_model_init_internal(void)
   cpu_ti_modified_cpu =
       xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup));
 
-  surf_cpu_model->name = "CPU_TI";
+  surf_cpu_model->name = "cpu_ti";
 
   surf_cpu_model->action_unref = cpu_ti_action_unref;
   surf_cpu_model->action_cancel = cpu_ti_action_cancel;