Factorize some code in SURF

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

diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c
index aeecdd6..063d56e 100644 (file)
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -176,12 +176,6 @@ static void action_cancel(surf_action_t action)
   return;
 }
 
-static void action_recycle(surf_action_t action)
-{
-  DIE_IMPOSSIBLE;
-  return;
-}
-
 /* action_change_state is inherited from the surf module */
 /* action_set_data is inherited from the surf module */
 
@@ -248,7 +242,7 @@ static double share_resources(double now)
   surf_action_workstation_L07_t action = NULL;
 
   xbt_swag_t running_actions =
-    surf_workstation_model->common_public->states.running_action_set;
+    surf_workstation_model->common_public.states.running_action_set;
   double min = generic_maxmin_share_resources(running_actions,
                                               xbt_swag_offset(s_action,
                                                               variable),
@@ -280,7 +274,7 @@ static void update_actions_state(double now, double delta)
   surf_action_workstation_L07_t action = NULL;
   surf_action_workstation_L07_t next_action = NULL;
   xbt_swag_t running_actions =
-    surf_workstation_model->common_public->states.running_action_set;
+    surf_workstation_model->common_public.states.running_action_set;
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
     deltap = delta;
@@ -429,17 +423,9 @@ static void finalize(void)
   if (parallel_task_link_set != NULL) {
     xbt_dict_free(&parallel_task_link_set);
   }
-  xbt_swag_free(surf_workstation_model->common_public->
-                states.ready_action_set);
-  xbt_swag_free(surf_workstation_model->common_public->
-                states.running_action_set);
-  xbt_swag_free(surf_workstation_model->common_public->
-                states.failed_action_set);
-  xbt_swag_free(surf_workstation_model->common_public->
-                states.done_action_set);
-
-  free(surf_workstation_model->common_public);
-  free(surf_workstation_model->common_private);
+
+  surf_model_exit((surf_model_t)surf_workstation_model);
+
   free(surf_workstation_model->extension_public);
 
   free(surf_workstation_model);
@@ -538,7 +524,7 @@ static surf_action_t execute_parallel_task(int workstation_nb,
   action->communication_amount = communication_amount;
   action->latency = latency;
   action->generic_action.state_set =
-    surf_workstation_model->common_public->states.running_action_set;
+    surf_workstation_model->common_public.states.running_action_set;
 
   xbt_swag_insert(action, action->generic_action.state_set);
   action->rate = rate;
@@ -1049,49 +1035,35 @@ static void define_callbacks(const char *file)
 
 static void model_init_internal(void)
 {
-  s_surf_action_t action;
-
   surf_workstation_model = xbt_new0(s_surf_workstation_model_t, 1);
 
-  surf_workstation_model->common_private =
-    xbt_new0(s_surf_model_private_t, 1);
-  surf_workstation_model->common_public = xbt_new0(s_surf_model_public_t, 1);
+  surf_model_init((surf_model_t)surf_workstation_model);
   surf_workstation_model->extension_public =
     xbt_new0(s_surf_workstation_model_extension_public_t, 1);
 
-  surf_workstation_model->common_public->states.ready_action_set =
-    xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  surf_workstation_model->common_public->states.running_action_set =
-    xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  surf_workstation_model->common_public->states.failed_action_set =
-    xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  surf_workstation_model->common_public->states.done_action_set =
-    xbt_swag_new(xbt_swag_offset(action, state_hookup));
-
-  surf_workstation_model->common_public->name_service = name_service;
-  surf_workstation_model->common_public->get_resource_name =
+  surf_workstation_model->common_public.name_service = name_service;
+  surf_workstation_model->common_public.get_resource_name =
     get_resource_name;
-  surf_workstation_model->common_public->action_get_state =
+  surf_workstation_model->common_public.action_get_state =
     surf_action_get_state;
-  surf_workstation_model->common_public->action_get_start_time =
+  surf_workstation_model->common_public.action_get_start_time =
     surf_action_get_start_time;
-  surf_workstation_model->common_public->action_get_finish_time =
+  surf_workstation_model->common_public.action_get_finish_time =
     surf_action_get_finish_time;
-  surf_workstation_model->common_public->action_use = action_use;
-  surf_workstation_model->common_public->action_free = action_free;
-  surf_workstation_model->common_public->action_cancel = action_cancel;
-  surf_workstation_model->common_public->action_recycle = action_recycle;
-  surf_workstation_model->common_public->action_change_state =
+  surf_workstation_model->common_public.action_use = action_use;
+  surf_workstation_model->common_public.action_free = action_free;
+  surf_workstation_model->common_public.action_cancel = action_cancel;
+  surf_workstation_model->common_public.action_change_state =
     surf_action_change_state;
-  surf_workstation_model->common_public->action_set_data =
+  surf_workstation_model->common_public.action_set_data =
     surf_action_set_data;
-  surf_workstation_model->common_public->suspend = action_suspend;
-  surf_workstation_model->common_public->resume = action_resume;
-  surf_workstation_model->common_public->is_suspended = action_is_suspended;
-  surf_workstation_model->common_public->set_max_duration =
+  surf_workstation_model->common_public.suspend = action_suspend;
+  surf_workstation_model->common_public.resume = action_resume;
+  surf_workstation_model->common_public.is_suspended = action_is_suspended;
+  surf_workstation_model->common_public.set_max_duration =
     action_set_max_duration;
-  surf_workstation_model->common_public->set_priority = action_set_priority;
-  surf_workstation_model->common_public->name = "Workstation ptask_L07";
+  surf_workstation_model->common_public.set_priority = action_set_priority;
+  surf_workstation_model->common_public.name = "Workstation ptask_L07";
 
   surf_workstation_model->common_private->resource_used = resource_used;
   surf_workstation_model->common_private->share_resources = share_resources;
@@ -1119,7 +1091,7 @@ static void model_init_internal(void)
     get_link_latency;
   surf_workstation_model->extension_public->link_shared = link_shared;
 
-  surf_workstation_model->common_public->get_properties = get_properties;
+  surf_workstation_model->common_public.get_properties = get_properties;
 
   workstation_set = xbt_dict_new();
   link_set = xbt_dict_new();