adding a priority mechanism

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

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index 1cb46ba..f3d7fe4 100644 (file)
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -86,11 +86,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)
@@ -124,6 +120,7 @@ static void action_use(surf_action_t action)
 
 static void action_cancel(surf_action_t action)
 {
+  surf_action_change_state(action, SURF_ACTION_FAILED);
   return;
 }
 
@@ -159,8 +156,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),
@@ -229,6 +228,7 @@ static surf_action_t execute(void *cpu, double size)
   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;
@@ -243,7 +243,8 @@ 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);
 
@@ -270,7 +271,8 @@ static void action_suspend(surf_action_t action)
 static void action_resume(surf_action_t 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);
 }
 
 static int action_is_suspended(surf_action_t action)
@@ -283,11 +285,21 @@ static void action_set_max_duration(surf_action_t action, double duration)
   action->max_duration = duration;
 }
 
+static void action_set_priority(surf_action_t action, double priority)
+{
+  action->priority = priority;
+}
+
 static e_surf_cpu_state_t get_state(void *cpu)
 {
   return ((cpu_Cas01_t) cpu)->state_current;
 }
 
+static double get_speed(void *cpu, double load)
+{
+  return load*(((cpu_Cas01_t) cpu)->power_scale);
+}
+
 static void finalize(void)
 {
   xbt_dict_free(&cpu_set);
@@ -352,11 +364,12 @@ 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;
 
   surf_cpu_resource->extension_public->get_state = get_state;
+  surf_cpu_resource->extension_public->get_speed = get_speed;
 
   cpu_set = xbt_dict_new();