move action_ref one layer up: not a model method anymore, but function surf_action_re...

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

diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c
index 21f23c7..c00a72e 100644 (file)
--- a/src/surf/network_gtnets.c
+++ b/src/surf/network_gtnets.c
@@ -313,7 +313,7 @@ static int resource_used(void *resource_id)
   return 0;                     /* We don't care */
 }
 
-static int action_free(surf_action_t action)
+static int action_unref(surf_action_t action)
 {
   action->refcount--;
   if (!action->refcount) {
@@ -325,20 +325,15 @@ static int action_free(surf_action_t action)
   return 0;
 }
 
-static void action_use(surf_action_t action)
-{
-  action->refcount++;
-}
-
 static void action_cancel(surf_action_t action)
 {
-  xbt_assert0(0, "Cannot cancel GTNetS flow");
+  xbt_die("Cannot cancel GTNetS flow");
   return;
 }
 
 static void action_recycle(surf_action_t action)
 {
-  xbt_assert0(0, "Cannot recycle GTNetS flow");
+  xbt_die("Cannot recycle GTNetS flow");
   return;
 }
 
@@ -351,7 +346,7 @@ static void action_change_state(surf_action_t action,
 /*       ((surf_action_network_GTNETS_t)action)->variable = NULL; */
 /*     } */
 
-  surf_action_change_state(action, state);
+  surf_action_state_set(action, state);
   return;
 }
 
@@ -527,18 +522,13 @@ static void surf_network_model_init_internal(void)
 {
   s_surf_action_t action;
 
-  surf_network_model = xbt_new0(s_surf_network_model_t, 1);
-
-  surf_model_init(surf_network_model);
+  surf_network_model = surf_model_init();
 
-  surf_network_model->common_public.action_get_state = surf_action_get_state;
-  surf_network_model->common_public.action_use = action_use;
-  surf_network_model->common_public.action_free = action_free;
-  surf_network_model->common_public.action_cancel = action_cancel;
-  surf_network_model->common_public.action_recycle = action_recycle;
-  surf_network_model->common_public.action_change_state = action_change_state;
-  surf_network_model->common_public.action_set_data = surf_action_set_data;
-  surf_network_model->common_public.name = "network";
+  surf_network_model->name = "network GTNetS";
+  surf_network_model->action_unref = action_unref;
+  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->model_private->resource_used = resource_used;
   surf_network_model->model_private->share_resources = share_resources;
@@ -548,14 +538,14 @@ static void surf_network_model_init_internal(void)
     update_resource_state;
   surf_network_model->model_private->finalize = finalize;
 
-  surf_network_model->common_public.suspend = action_suspend;
-  surf_network_model->common_public.resume = action_resume;
-  surf_network_model->common_public.is_suspended = action_is_suspended;
+  surf_network_model->suspend = action_suspend;
+  surf_network_model->resume = action_resume;
+  surf_network_model->is_suspended = action_is_suspended;
 
   surf_network_model->extension.network.communicate = communicate;
 
   /*for the props of the link */
-  surf_network_model->common_public.get_properties = get_properties;
+  surf_network_model->get_properties = get_properties;
 
   link_set = xbt_dict_new();