Create current_property_set only if it is required.

[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 de1fa51..093256a 100644 (file)
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -145,14 +145,14 @@ static void ptask_action_cancel(surf_action_t action)
 
 static void ptask_action_suspend(surf_action_t action)
 {
-  XBT_IN_F("(%p))", action);
+  XBT_IN("(%p))", action);
   if (((surf_action_workstation_L07_t) action)->suspended != 2) {
     ((surf_action_workstation_L07_t) action)->suspended = 1;
     lmm_update_variable_weight(ptask_maxmin_system,
                                ((surf_action_workstation_L07_t)
                                 action)->variable, 0.0);
   }
-  XBT_OUT;
+  XBT_OUT();
 }
 
 static void ptask_action_resume(surf_action_t action)
@@ -160,12 +160,12 @@ static void ptask_action_resume(surf_action_t action)
   surf_action_workstation_L07_t act =
       (surf_action_workstation_L07_t) action;
 
-  XBT_IN_F("(%p)", act);
+  XBT_IN("(%p)", act);
   if (act->suspended != 2) {
     lmm_update_variable_weight(ptask_maxmin_system, act->variable, 1.0);
     act->suspended = 0;
   }
-  XBT_OUT;
+  XBT_OUT();
 }
 
 static int ptask_action_is_suspended(surf_action_t action)
@@ -176,25 +176,25 @@ static int ptask_action_is_suspended(surf_action_t action)
 static void ptask_action_set_max_duration(surf_action_t action,
                                           double duration)
 {                               /* FIXME: should inherit */
-  XBT_IN_F("(%p,%g)", action, duration);
+  XBT_IN("(%p,%g)", action, duration);
   action->max_duration = duration;
-  XBT_OUT;
+  XBT_OUT();
 }
 
 
 static void ptask_action_set_priority(surf_action_t action,
                                       double priority)
 {                               /* FIXME: should inherit */
-  XBT_IN_F("(%p,%g)", action, priority);
+  XBT_IN("(%p,%g)", action, priority);
   action->priority = priority;
-  XBT_OUT;
+  XBT_OUT();
 }
 
 static double ptask_action_get_remains(surf_action_t action)
 {
-  XBT_IN_F("(%p)", action);
+  XBT_IN("(%p)", action);
   return action->remains;
-  XBT_OUT;
+  XBT_OUT();
 }
 
 /**************************************/
@@ -578,14 +578,14 @@ static surf_action_t ptask_action_sleep(void *cpu, double duration)
 {
   surf_action_workstation_L07_t action = NULL;
 
-  XBT_IN_F("(%s,%g)", surf_resource_name(cpu), duration);
+  XBT_IN("(%s,%g)", surf_resource_name(cpu), duration);
 
   action = (surf_action_workstation_L07_t) ptask_execute(cpu, 1.0);
   action->generic_action.max_duration = duration;
   action->suspended = 2;
   lmm_update_variable_weight(ptask_maxmin_system, action->variable, 0.0);
 
-  XBT_OUT;
+  XBT_OUT();
   return (surf_action_t) action;
 }
 
@@ -629,7 +629,7 @@ static cpu_L07_t ptask_cpu_new(const char *name, double power_scale,
   cpu->generic_resource.model = surf_workstation_model;
   cpu->type = SURF_WORKSTATION_RESOURCE_CPU;
   cpu->generic_resource.name = xbt_strdup(name);
-  cpu->generic_resource.properties = current_property_set;
+  cpu->generic_resource.properties = cpu_properties;
   cpu->id = ptask_host_count++;
 
   cpu->power_scale = power_scale;
@@ -676,9 +676,9 @@ static void ptask_parse_cpu_init(void)
     state_initial = SURF_RESOURCE_OFF;
   state_trace = tmgr_trace_new(A_surfxml_host_state_file);
 
-  current_property_set = xbt_dict_new();
   ptask_cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace,
                 state_initial, state_trace, current_property_set);
+  current_property_set=NULL;
 }
 
 static void ptask_cpu_create_resource(char *name, double power_peak,
@@ -783,8 +783,6 @@ static void ptask_parse_link_init(void)
 
   state_trace = tmgr_trace_new(A_surfxml_link_state_file);
 
-  current_property_set = xbt_dict_new();
-
   if(policy_initial_link == SURF_LINK_FULLDUPLEX)
   {
          ptask_link_new(name_link_up, bw_initial, bw_trace, lat_initial, lat_trace,
@@ -792,7 +790,7 @@ static void ptask_parse_link_init(void)
                         current_property_set);
          ptask_link_new(name_link_down, bw_initial, bw_trace, lat_initial, lat_trace,
                         state_initial_link, state_trace, policy_initial_link,
-                        xbt_dict_new());
+                        current_property_set);
   }
   else
   {
@@ -800,6 +798,7 @@ static void ptask_parse_link_init(void)
                                         state_initial_link, state_trace, policy_initial_link,
                                         current_property_set);
   }
+  current_property_set = NULL;
 }
 
 static void ptask_link_create_resource(char *name,
@@ -813,10 +812,9 @@ static void ptask_link_create_resource(char *name,
                                        e_surf_link_sharing_policy_t
                                        policy, xbt_dict_t properties)
 {
-
   ptask_link_new(name, bw_initial, bw_trace,
                  lat_initial, lat_trace, state_initial, state_trace,
-                 policy, xbt_dict_new());
+                 policy, properties);
 }
 
 
@@ -892,8 +890,8 @@ static void ptask_add_traces(void)
 static void ptask_define_callbacks(const char *file)
 {
   /* Adding callback functions */
-  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_host_cb_list, &ptask_parse_cpu_init);
+  surfxml_add_callback(ETag_surfxml_link_cb_list, &ptask_parse_link_init);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &ptask_add_traces);
 }