X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6aee8176bcb1a32402d11424b1f2c027ceec1b6e..803db5b144024a4e2fd78b35744ebc1dba549a21:/src/surf/cpu.c?ds=sidebyside

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index 491847e567..240ee5352c 100644
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -163,10 +163,10 @@ static void update_actions_state(double now, double delta)
   */
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
-    surf_double_update(&(action->generic_action.remains),
+    double_update(&(action->generic_action.remains),
 	lmm_variable_getvalue(action->variable) * delta);
     if (action->generic_action.max_duration != NO_MAX_DURATION)
-      surf_double_update(&(action->generic_action.max_duration), delta);
+      double_update(&(action->generic_action.max_duration), delta);
     if ((action->generic_action.remains <= 0) && 
 	(lmm_get_variable_weight(action->variable)>0)) {
       action->generic_action.finish = surf_get_clock();
@@ -311,6 +311,12 @@ static double get_speed(void *cpu, double load)
   return load*(((cpu_Cas01_t) cpu)->power_scale);
 }
 
+static double get_available_speed(void *cpu)
+{
+  /* number between 0 and 1 */
+  return ((cpu_Cas01_t) cpu)->power_current;
+}
+
 static void finalize(void)
 {
   xbt_dict_free(&cpu_set);
@@ -354,6 +360,10 @@ static void surf_cpu_resource_init_internal(void)
   surf_cpu_resource->common_public->get_resource_name = get_resource_name;
   surf_cpu_resource->common_public->action_get_state =
       surf_action_get_state;
+  surf_cpu_resource->common_public->action_get_start_time =
+      surf_action_get_start_time;
+  surf_cpu_resource->common_public->action_get_finish_time =
+      surf_action_get_finish_time;
   surf_cpu_resource->common_public->action_free = action_free;
   surf_cpu_resource->common_public->action_use = action_use;
   surf_cpu_resource->common_public->action_cancel = action_cancel;
@@ -381,6 +391,7 @@ static void surf_cpu_resource_init_internal(void)
 
   surf_cpu_resource->extension_public->get_state = get_state;
   surf_cpu_resource->extension_public->get_speed = get_speed;
+  surf_cpu_resource->extension_public->get_available_speed = get_available_speed;
 
   cpu_set = xbt_dict_new();