Use a mallocator for the Surf actions

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

diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c
index e2680c1..b5d2f87 100644 (file)
--- a/src/surf/cpu_im.c
+++ b/src/surf/cpu_im.c
@@ -156,8 +156,6 @@ static void cpu_im_add_traces_cpu(void)
 
 static void cpu_im_define_callbacks(const char *file)
 {
-
-  surf_parse_reset_parser();
   surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_im_init);
   surfxml_add_callback(ETag_surfxml_platform_cb_list,
                        &cpu_im_add_traces_cpu);
@@ -187,7 +185,7 @@ static int cpu_im_action_unref(surf_action_t action)
     if (action->category)
       xbt_free(action->category);
 #endif
-    free(action);
+    surf_action_free(&action);
     return 1;
   }
   return 0;
@@ -328,18 +326,15 @@ 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
-    TRACE_surf_host_set_utilization(((cpu_Cas01_im_t)
-                                     (action->cpu))->generic_resource.name,
-                                    action->
-                                    generic_lmm_action.generic_action.data,
-                                    (surf_action_t) action,
-                                    lmm_variable_getvalue
-                                    (GENERIC_LMM_ACTION(action).variable),
-                                    ((cpu_Cas01_im_t)
-                                     (action->cpu))->last_update,
-                                    now -
-                                    ((cpu_Cas01_im_t)
-                                     (action->cpu))->last_update);
+    {
+      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,
+          (surf_action_t) action,
+          lmm_variable_getvalue (GENERIC_LMM_ACTION(action).variable),
+          cpu->last_update,
+          now - cpu->last_update);
+    }
 #endif
     GENERIC_ACTION(action).remains = 0;
     cpu_im_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);