Use a mallocator for the Surf actions

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

diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c
index d1fc646..a5581e0 100644 (file)
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -128,7 +128,7 @@ static int ptask_action_unref(surf_action_t action)
     free(((surf_action_workstation_L07_t) action)->workstation_list);
     free(((surf_action_workstation_L07_t) action)->communication_amount);
     free(((surf_action_workstation_L07_t) action)->computation_amount);
-    free(action);
+    surf_action_free(&action);
     return 1;
   }
   return 0;
@@ -754,14 +754,12 @@ static void ptask_parse_link_init(void)
   char *name_link_down = NULL;
   char *name_link = NULL;
 
-  if(A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
-  {
-  name_link_up = xbt_strdup(bprintf("%s_UP",A_surfxml_link_id));
-  name_link_down = xbt_strdup(bprintf("%s_DOWN",A_surfxml_link_id));
-  }
-  else
-  {
-  name_link = xbt_strdup(A_surfxml_link_id);
+  if(A_surfxml_link_sharing_policy ==
+     A_surfxml_link_sharing_policy_FULLDUPLEX) {
+    name_link_up = bprintf("%s_UP", A_surfxml_link_id);
+    name_link_down = bprintf("%s_DOWN", A_surfxml_link_id);
+  } else {
+    name_link = xbt_strdup(A_surfxml_link_id);
   }
   surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth);
   bw_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file);
@@ -894,7 +892,6 @@ static void ptask_add_traces(void)
 static void ptask_define_callbacks(const char *file)
 {
   /* Adding callback functions */
-  surf_parse_reset_parser();
   surfxml_add_callback(STag_surfxml_host_cb_list, &ptask_parse_cpu_init);
   surfxml_add_callback(STag_surfxml_link_cb_list, &ptask_parse_link_init);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &ptask_add_traces);