Implement a generic resource; use it as ancestor to specific ones

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

diff --git a/src/surf/model.c b/src/surf/model.c
index 7979ca2..02104c2 100644 (file)
--- a/src/surf/model.c
+++ b/src/surf/model.c
@@ -18,42 +18,44 @@ static int int_die_impossible_paction(surf_action_t action)
 }
 
 /** @brief initialize common datastructures to all models */
-void surf_model_init(surf_model_t model)
+surf_model_t surf_model_init(void)
 {
   s_surf_action_t action;
+  surf_model_t model = xbt_new0(s_surf_model_t, 1);
 
+  model->model_private = xbt_new0(s_surf_model_private_t, 1);
 
-  model->common_private = xbt_new0(s_surf_model_private_t, 1);
-
-  model->common_public.states.ready_action_set =
+  model->states.ready_action_set =
     xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  model->common_public.states.running_action_set =
+  model->states.running_action_set =
     xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  model->common_public.states.failed_action_set =
+  model->states.failed_action_set =
     xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  model->common_public.states.done_action_set =
+  model->states.done_action_set =
     xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  model->common_public.resource_set = xbt_dict_new();
+  model->resource_set = xbt_dict_new();
 
-  model->common_public.action_free = int_die_impossible_paction;
-  model->common_public.action_cancel = void_die_impossible_paction;
-  model->common_public.action_recycle = void_die_impossible_paction;
+  model->action_free = int_die_impossible_paction;
+  model->action_cancel = void_die_impossible_paction;
+  model->action_recycle = void_die_impossible_paction;
 
+  return model;
+}
+/** @brief finalize common datastructures to all models */
+void surf_model_exit(surf_model_t model)
+{
+  xbt_swag_free(model->states.ready_action_set);
+  xbt_swag_free(model->states.running_action_set);
+  xbt_swag_free(model->states.failed_action_set);
+  xbt_swag_free(model->states.done_action_set);
+  xbt_dict_free(&model->resource_set);
+  free(model->model_private);
+  free(model);
 }
 
 void *surf_model_resource_by_name(surf_model_t model, const char *name)
 {
-  return xbt_dict_get_or_null(model->common_public.resource_set, name);
+  return xbt_dict_get_or_null(model->resource_set, name);
 }
 
 
-/** @brief finalize common datastructures to all models */
-void surf_model_exit(surf_model_t model)
-{
-  xbt_swag_free(model->common_public.states.ready_action_set);
-  xbt_swag_free(model->common_public.states.running_action_set);
-  xbt_swag_free(model->common_public.states.failed_action_set);
-  xbt_swag_free(model->common_public.states.done_action_set);
-  xbt_dict_free(&model->common_public.resource_set);
-  free(model->common_private);
-}