Rename model methods action_use/free to action_ref/unref

[simgrid.git] / src / simix / smx_action.c

diff --git a/src/simix/smx_action.c b/src/simix/smx_action.c
index a6a7054..310cad8 100644 (file)
--- a/src/simix/smx_action.c
+++ b/src/simix/smx_action.c
@@ -57,8 +57,7 @@ smx_action_t SIMIX_action_communicate(smx_host_t sender,
   simdata->surf_action =
     surf_workstation_model->extension.workstation.
     communicate(sender->simdata->host, receiver->simdata->host, size, rate);
-  surf_workstation_model->common_public.action_set_data(simdata->surf_action,
-                                                        act);
+  surf_workstation_model->action_data_set(simdata->surf_action, act);
 
   DEBUG1("Create communicate action %p", act);
   return act;
@@ -100,8 +99,7 @@ smx_action_t SIMIX_action_execute(smx_host_t host, const char *name,
     surf_workstation_model->extension.workstation.execute(host->simdata->host,
                                                           amount);
 
-  surf_workstation_model->common_public.action_set_data(simdata->surf_action,
-                                                        act);
+  surf_workstation_model->action_data_set(simdata->surf_action, act);
 
   DEBUG1("Create execute action %p", act);
   return act;
@@ -141,8 +139,7 @@ smx_action_t SIMIX_action_sleep(smx_host_t host, double duration)
     surf_workstation_model->extension.workstation.sleep(host->simdata->host,
                                                         duration);
 
-  surf_workstation_model->common_public.action_set_data(simdata->surf_action,
-                                                        act);
+  surf_workstation_model->action_data_set(simdata->surf_action, act);
 
   DEBUG1("Create sleep action %p", act);
   return act;
@@ -160,8 +157,7 @@ void SIMIX_action_cancel(smx_action_t action)
 
   DEBUG1("Cancel action %p", action);
   if (action->simdata->surf_action) {
-    surf_workstation_model->common_public.action_cancel(action->simdata->
-                                                        surf_action);
+    surf_workstation_model->action_cancel(action->simdata->surf_action);
   }
   return;
 }
@@ -178,8 +174,8 @@ void SIMIX_action_set_priority(smx_action_t action, double priority)
   xbt_assert0((action != NULL)
               && (action->simdata != NULL), "Invalid parameter");
 
-  surf_workstation_model->common_public.set_priority(action->simdata->
-                                                     surf_action, priority);
+  surf_workstation_model->set_priority(action->simdata->surf_action,
+                                       priority);
   return;
 }
 
@@ -209,8 +205,8 @@ int SIMIX_action_destroy(smx_action_t action)
   xbt_fifo_free(action->cond_list);
 
   if (action->simdata->surf_action)
-    action->simdata->surf_action->model_type->
-      common_public.action_free(action->simdata->surf_action);
+    action->simdata->surf_action->model_type->action_unref(action->
+                                                          simdata->surf_action);
 
   xbt_free(action->simdata);
   xbt_free(action);
@@ -331,8 +327,7 @@ smx_action_t SIMIX_action_parallel_execute(char *name, int host_nb,
                                       computation_amount,
                                       communication_amount, amount, rate);
 
-  surf_workstation_model->common_public.action_set_data(simdata->surf_action,
-                                                        act);
+  surf_workstation_model->action_data_set(simdata->surf_action, act);
 
   return act;
 }
@@ -340,9 +335,8 @@ smx_action_t SIMIX_action_parallel_execute(char *name, int host_nb,
 e_surf_action_state_t SIMIX_action_get_state(smx_action_t action)
 {
   xbt_assert0((action != NULL), "Invalid parameter");
-  return surf_workstation_model->common_public.action_get_state(action->
-                                                                simdata->
-                                                                surf_action);
+  return surf_workstation_model->action_state_get(action->simdata->
+                                                  surf_action);
 
 }