Update workstation handling in SimDag. Change the prefix of SimDag functions with...

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

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index fbcf4f1..491847e 100644 (file)
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -7,7 +7,7 @@
 
 #include "cpu_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu, surf,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf,
                                "Logging specific to the SURF CPU module");
 
 surf_cpu_resource_t surf_cpu_resource = NULL;
@@ -60,16 +60,17 @@ static void parse_cpu(void)
   e_surf_cpu_state_t state_initial = SURF_CPU_OFF;
   tmgr_trace_t state_trace = NULL;
 
-  name = xbt_strdup(A_cpu_name);
-  surf_parse_get_double(&power_scale,A_cpu_power);
-  surf_parse_get_double(&power_initial,A_cpu_availability);
-  surf_parse_get_trace(&power_trace,A_cpu_availability_file);
+  name = xbt_strdup(A_surfxml_cpu_name);
+  surf_parse_get_double(&power_scale,A_surfxml_cpu_power);
+  surf_parse_get_double(&power_initial,A_surfxml_cpu_availability);
+  surf_parse_get_trace(&power_trace,A_surfxml_cpu_availability_file);
 
-  xbt_assert0((A_cpu_state==A_cpu_state_ON)||(A_cpu_state==A_cpu_state_OFF),
-             "Invalid state")
-  if (A_cpu_state==A_cpu_state_ON) state_initial = SURF_CPU_ON;
-  if (A_cpu_state==A_cpu_state_OFF) state_initial = SURF_CPU_OFF;
-  surf_parse_get_trace(&state_trace,A_cpu_state_file);
+  xbt_assert0((A_surfxml_cpu_state==A_surfxml_cpu_state_ON)||
+             (A_surfxml_cpu_state==A_surfxml_cpu_state_OFF),
+             "Invalid state");
+  if (A_surfxml_cpu_state==A_surfxml_cpu_state_ON) state_initial = SURF_CPU_ON;
+  if (A_surfxml_cpu_state==A_surfxml_cpu_state_OFF) state_initial = SURF_CPU_OFF;
+  surf_parse_get_trace(&state_trace,A_surfxml_cpu_state_file);
 
   cpu_new(name, power_scale, power_initial, power_trace, state_initial,
          state_trace);
@@ -78,7 +79,7 @@ static void parse_cpu(void)
 static void parse_file(const char *file)
 {
   surf_parse_reset_parser();
-  ETag_cpu_fun=parse_cpu;
+  ETag_surfxml_cpu_fun=parse_cpu;
   surf_parse_open(file);
   xbt_assert1((!surf_parse()),"Parse error in %s",file);
   surf_parse_close();
@@ -86,11 +87,7 @@ static void parse_file(const char *file)
 
 static void *name_service(const char *name)
 {
-  void *cpu = NULL;
-
-  xbt_dict_get(cpu_set, name, &cpu);
-
-  return cpu;
+  return xbt_dict_get_or_null(cpu_set, name);
 }
 
 static const char *get_resource_name(void *resource_id)
@@ -130,7 +127,7 @@ static void action_cancel(surf_action_t action)
 
 static void action_recycle(surf_action_t action)
 {
-  return;
+  DIE_IMPOSSIBLE;
 }
 
 static void action_change_state(surf_action_t action,
@@ -160,8 +157,10 @@ static void update_actions_state(double now, double delta)
   surf_action_cpu_Cas01_t next_action = NULL;
   xbt_swag_t running_actions =
       surf_cpu_resource->common_public->states.running_action_set;
+  /* FIXME: UNUSED
   xbt_swag_t failed_actions =
       surf_cpu_resource->common_public->states.failed_action_set;
+  */
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
     surf_double_update(&(action->generic_action.remains),
@@ -225,11 +224,13 @@ static surf_action_t execute(void *cpu, double size)
   surf_action_cpu_Cas01_t action = NULL;
   cpu_Cas01_t CPU = cpu;
 
+  XBT_IN2("(%s,%g)",CPU->name,size);
   action = xbt_new0(s_surf_action_cpu_Cas01_t, 1);
 
   action->generic_action.using = 1;
   action->generic_action.cost = size;
   action->generic_action.remains = size;
+  action->generic_action.priority = 1.0;
   action->generic_action.max_duration = NO_MAX_DURATION;
   action->generic_action.start = surf_get_clock();
   action->generic_action.finish = -1.0;
@@ -244,10 +245,11 @@ static surf_action_t execute(void *cpu, double size)
        surf_cpu_resource->common_public->states.failed_action_set;
   xbt_swag_insert(action, action->generic_action.state_set);
 
-  action->variable = lmm_variable_new(maxmin_system, action, 1.0, -1.0, 1);
+  action->variable = lmm_variable_new(maxmin_system, action, 
+                                     action->generic_action.priority, -1.0, 1);
   lmm_expand(maxmin_system, CPU->constraint, action->variable,
             1.0);
-
+  XBT_OUT;
   return (surf_action_t) action;
 }
 
@@ -255,23 +257,29 @@ static surf_action_t action_sleep(void *cpu, double duration)
 {
   surf_action_cpu_Cas01_t action = NULL;
 
+  XBT_IN2("(%s,%g)",((cpu_Cas01_t)cpu)->name,duration);
   action = (surf_action_cpu_Cas01_t) execute(cpu, 1.0);
   action->generic_action.max_duration = duration;
   lmm_update_variable_weight(maxmin_system, action->variable, 0.0);
-
+  XBT_OUT;
   return (surf_action_t) action;
 }
 
 static void action_suspend(surf_action_t action)
 {
+  XBT_IN1("(%p)",action);
   lmm_update_variable_weight(maxmin_system,
                             ((surf_action_cpu_Cas01_t) action)->variable, 0.0);
+  XBT_OUT;
 }
 
 static void action_resume(surf_action_t action)
 {
+  XBT_IN1("(%p)",action);
   lmm_update_variable_weight(maxmin_system,
-                            ((surf_action_cpu_Cas01_t) action)->variable, 1.0);
+                            ((surf_action_cpu_Cas01_t) action)->variable, 
+                            action->priority);
+  XBT_OUT;
 }
 
 static int action_is_suspended(surf_action_t action)
@@ -281,7 +289,16 @@ static int action_is_suspended(surf_action_t action)
 
 static void action_set_max_duration(surf_action_t action, double duration)
 {
+  XBT_IN2("(%p,%g)",action,duration);
   action->max_duration = duration;
+  XBT_OUT;
+}
+
+static void action_set_priority(surf_action_t action, double priority)
+{
+  XBT_IN2("(%p,%g)",action,priority);
+  action->priority = priority;
+  XBT_OUT;
 }
 
 static e_surf_cpu_state_t get_state(void *cpu)
@@ -358,7 +375,7 @@ static void surf_cpu_resource_init_internal(void)
   surf_cpu_resource->common_public->resume = action_resume;
   surf_cpu_resource->common_public->is_suspended = action_is_suspended;
   surf_cpu_resource->common_public->set_max_duration = action_set_max_duration;
-
+  surf_cpu_resource->common_public->set_priority = action_set_priority;
   surf_cpu_resource->extension_public->execute = execute;
   surf_cpu_resource->extension_public->sleep = action_sleep;