X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/35bf9a4f41dc6d5f6796ab6382bd61b5b58d7b4a..824b99a5272ff8ce814336ab8bc9817eecd6de60:/src/surf/cpu.c

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index 47de2a4ee0..dd23290747 100644
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -155,11 +155,11 @@ static void action_use(surf_action_t action)
 
 static void action_cancel(surf_action_t action)
 {
-  surf_action_change_state(action, SURF_ACTION_FAILED);
+  surf_action_state_set(action, SURF_ACTION_FAILED);
   return;
 }
 
-static void action_change_state(surf_action_t action,
+static void cpu_action_state_set(surf_action_t action,
                                 e_surf_action_state_t state)
 {
 /*   if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
@@ -168,7 +168,7 @@ static void action_change_state(surf_action_t action,
 /*       ((surf_action_cpu_Cas01_t)action)->variable = NULL; */
 /*     } */
 
-  surf_action_change_state(action, state);
+  surf_action_state_set(action, state);
   return;
 }
 
@@ -199,11 +199,11 @@ static void update_actions_state(double now, double delta)
     if ((action->generic_action.remains <= 0) &&
         (lmm_get_variable_weight(action->variable) > 0)) {
       action->generic_action.finish = surf_get_clock();
-      action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+      cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
     } else if ((action->generic_action.max_duration != NO_MAX_DURATION) &&
                (action->generic_action.max_duration <= 0)) {
       action->generic_action.finish = surf_get_clock();
-      action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+      cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
     }
   }
 
@@ -233,11 +233,11 @@ static void update_resource_state(void *id,
       while ((var = lmm_get_var_from_cnst(cpu_maxmin_system, cnst, &elem))) {
         surf_action_t action = lmm_variable_id(var);
 
-        if (surf_action_get_state(action) == SURF_ACTION_RUNNING ||
-            surf_action_get_state(action) == SURF_ACTION_READY ||
-            surf_action_get_state(action) == SURF_ACTION_NOT_IN_THE_SYSTEM) {
+        if (surf_action_state_get(action) == SURF_ACTION_RUNNING ||
+            surf_action_state_get(action) == SURF_ACTION_READY ||
+            surf_action_state_get(action) == SURF_ACTION_NOT_IN_THE_SYSTEM) {
           action->finish = date;
-          action_change_state(action, SURF_ACTION_FAILED);
+          cpu_action_state_set(action, SURF_ACTION_FAILED);
         }
       }
     }
@@ -399,12 +399,12 @@ static void surf_cpu_model_init_internal(void)
   running_action_set_that_does_not_need_being_checked =
     xbt_swag_new(xbt_swag_offset(action, state_hookup));
 
+  surf_cpu_model->name = "CPU";
+
   surf_cpu_model->action_free = action_free;
   surf_cpu_model->action_use = action_use;
   surf_cpu_model->action_cancel = action_cancel;
-  surf_cpu_model->action_change_state = action_change_state;
-  surf_cpu_model->action_set_data = surf_action_set_data;
-  surf_cpu_model->name = "CPU";
+  surf_cpu_model->action_state_set = cpu_action_state_set;
 
   surf_cpu_model->model_private->resource_used = resource_used;
   surf_cpu_model->model_private->share_resources = share_resources;