Rename model methods action_use/free to action_ref/unref

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

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 4a33095..54f40fa 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -68,12 +68,12 @@ static void parallel_action_use(surf_action_t action)
   THROW_UNIMPLEMENTED;          /* This model does not implement parallel tasks */
 }
 
-static int action_free(surf_action_t action)
+static int action_unref(surf_action_t action)
 {
   if (action->model_type == surf_network_model)
-    return surf_network_model->action_free(action);
+    return surf_network_model->action_unref(action);
   else if (action->model_type == surf_cpu_model)
-    return surf_cpu_model->action_free(action);
+    return surf_cpu_model->action_unref(action);
   else if (action->model_type == surf_workstation_model)
     return parallel_action_free(action);
   else
@@ -81,12 +81,12 @@ 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)
 {
   if (action->model_type == surf_network_model)
-    surf_network_model->action_use(action);
+    surf_network_model->action_ref(action);
   else if (action->model_type == surf_cpu_model)
-    surf_cpu_model->action_use(action);
+    surf_cpu_model->action_ref(action);
   else if (action->model_type == surf_workstation_model)
     parallel_action_use(action);
   else
@@ -107,15 +107,15 @@ static void action_cancel(surf_action_t action)
   return;
 }
 
-static void action_change_state(surf_action_t action,
+static void ws_action_state_set(surf_action_t action,
                                 e_surf_action_state_t state)
 {
   if (action->model_type == surf_network_model)
-    surf_network_model->action_change_state(action, state);
+    surf_network_model->action_state_set(action, state);
   else if (action->model_type == surf_cpu_model)
-    surf_cpu_model->action_change_state(action, state);
+    surf_cpu_model->action_state_set(action, state);
   else if (action->model_type == surf_workstation_model)
-    surf_action_change_state(action, state);
+    surf_action_state_set(action, state);
   else
     DIE_IMPOSSIBLE;
   return;
@@ -288,18 +288,12 @@ static void finalize(void)
 static void surf_workstation_model_init_internal(void)
 {
   surf_workstation_model = surf_model_init();
-/*   surf_workstation_model->extension_private = xbt_new0(s_surf_workstation_model_extension_private_t,1); */
-
-  surf_workstation_model->action_get_state = surf_action_get_state;
-  surf_workstation_model->action_get_start_time = surf_action_get_start_time;
-  surf_workstation_model->action_get_finish_time =
-    surf_action_get_finish_time;
-  surf_workstation_model->action_free = action_free;
-  surf_workstation_model->action_use = action_use;
-  surf_workstation_model->action_cancel = action_cancel;
-  surf_workstation_model->action_change_state = action_change_state;
-  surf_workstation_model->action_set_data = surf_action_set_data;
+
   surf_workstation_model->name = "Workstation";
+  surf_workstation_model->action_unref = action_unref;
+  surf_workstation_model->action_ref = action_ref;
+  surf_workstation_model->action_cancel = action_cancel;
+  surf_workstation_model->action_state_set = ws_action_state_set;
 
   surf_workstation_model->model_private->resource_used = resource_used;
   surf_workstation_model->model_private->share_resources = share_resources;