Rename model methods action_use/free to action_ref/unref

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

diff --git a/src/surf/network.c b/src/surf/network.c
index 1f03ed3..f0c5e32 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -300,7 +300,7 @@ static int resource_used(void *resource_id)
                              ((link_CM02_t) resource_id)->constraint);
 }
 
-static int action_free(surf_action_t action)
+static int action_unref(surf_action_t action)
 {
   action->refcount--;
   if (!action->refcount) {
@@ -314,7 +314,7 @@ static int action_free(surf_action_t action)
   return 0;
 }
 
-static void action_use(surf_action_t action)
+static void action_ref(surf_action_t action)
 {
   action->refcount++;
 }
@@ -329,19 +329,6 @@ static void action_recycle(surf_action_t action)
   return;
 }
 
-static void action_change_state(surf_action_t action,
-                                e_surf_action_state_t state)
-{
-/*   if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
-/*     if(((surf_action_network_CM02_t)action)->variable) { */
-/*       lmm_variable_disable(network_maxmin_system, ((surf_action_network_CM02_t)action)->variable); */
-/*       ((surf_action_network_CM02_t)action)->variable = NULL; */
-/*     } */
-
-  surf_action_change_state(action, state);
-  return;
-}
-
 static double share_resources(double now)
 {
   s_surf_action_network_CM02_t s_action;
@@ -401,11 +388,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);
+      surf_network_model->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);
+      surf_network_model->action_state_set((surf_action_t) action, SURF_ACTION_DONE);
     }
   }
 
@@ -479,10 +466,10 @@ static void update_resource_state(void *id,
               (network_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) {
+        if (surf_action_state_get(action) == SURF_ACTION_RUNNING ||
+            surf_action_state_get(action) == SURF_ACTION_READY) {
           action->finish = date;
-          action_change_state(action, SURF_ACTION_FAILED);
+          surf_network_model->action_state_set(action, SURF_ACTION_FAILED);
         }
       }
     }
@@ -679,16 +666,11 @@ static void surf_network_model_init_internal(void)
 {
   surf_network_model = surf_model_init();
 
-  surf_network_model->action_get_state = surf_action_get_state;
-  surf_network_model->action_get_start_time = surf_action_get_start_time;
-  surf_network_model->action_get_finish_time = surf_action_get_finish_time;
-  surf_network_model->action_free = action_free;
-  surf_network_model->action_use = action_use;
+  surf_network_model->name = "network";
+  surf_network_model->action_unref = action_unref;
+  surf_network_model->action_ref = action_ref;
   surf_network_model->action_cancel = action_cancel;
   surf_network_model->action_recycle = action_recycle;
-  surf_network_model->action_change_state = action_change_state;
-  surf_network_model->action_set_data = surf_action_set_data;
-  surf_network_model->name = "network";
 
   surf_network_model->model_private->resource_used = resource_used;
   surf_network_model->model_private->share_resources = share_resources;