- xbt_swag_free(surf_timer_resource->common_public->states.ready_action_set);
- xbt_swag_free(surf_timer_resource->common_public->states.
- running_action_set);
- xbt_swag_free(surf_timer_resource->common_public->states.
- failed_action_set);
- xbt_swag_free(surf_timer_resource->common_public->states.done_action_set);
- free(surf_timer_resource->common_public);
- free(surf_timer_resource->common_private);
- free(surf_timer_resource->extension_public);
-
- free(surf_timer_resource);
- surf_timer_resource = NULL;
-}
-
-static void surf_timer_resource_init_internal(void)
-{
- s_surf_action_t action;
-
- surf_timer_resource = xbt_new0(s_surf_timer_resource_t, 1);
-
- surf_timer_resource->common_private =
- xbt_new0(s_surf_resource_private_t, 1);
- surf_timer_resource->common_public = xbt_new0(s_surf_resource_public_t, 1);
-
- surf_timer_resource->extension_public =
- xbt_new0(s_surf_timer_resource_extension_public_t, 1);
-
- surf_timer_resource->common_public->states.ready_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_timer_resource->common_public->states.running_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_timer_resource->common_public->states.failed_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_timer_resource->common_public->states.done_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
-
- surf_timer_resource->common_public->name_service = name_service;
- surf_timer_resource->common_public->get_resource_name = get_resource_name;
- surf_timer_resource->common_public->action_get_state =
- surf_action_get_state;
- surf_timer_resource->common_public->action_free = action_free;
- surf_timer_resource->common_public->action_cancel = action_cancel;
- surf_timer_resource->common_public->action_recycle = action_recycle;
- surf_timer_resource->common_public->action_change_state =
- action_change_state;
- surf_timer_resource->common_public->action_set_data = surf_action_set_data;
- surf_timer_resource->common_public->name = "TIMER";
-
- surf_timer_resource->common_private->resource_used = resource_used;
- surf_timer_resource->common_private->share_resources = share_resources;
- surf_timer_resource->common_private->update_actions_state =
- update_actions_state;
- surf_timer_resource->common_private->update_resource_state =
- update_resource_state;
- surf_timer_resource->common_private->finalize = finalize;
-
- surf_timer_resource->common_public->suspend = action_suspend;
- surf_timer_resource->common_public->resume = action_resume;
- surf_timer_resource->common_public->is_suspended = action_is_suspended;
-
- surf_timer_resource->extension_public->set = set;
- surf_timer_resource->extension_public->get = get;
+ surf_model_exit((surf_model_t)surf_timer_model);
+
+ free(surf_timer_model->extension_public);
+
+ free(surf_timer_model);
+ surf_timer_model = NULL;
+}
+
+static void surf_timer_model_init_internal(void)
+{
+ surf_timer_model = xbt_new0(s_surf_timer_model_t, 1);
+
+ surf_model_init((surf_model_t)surf_timer_model);
+
+ surf_timer_model->extension_public =
+ xbt_new0(s_surf_timer_model_extension_public_t, 1);
+
+ surf_timer_model->common_public.name_service = name_service;
+ surf_timer_model->common_public.get_resource_name = get_resource_name;
+ surf_timer_model->common_public.action_get_state = surf_action_get_state;
+ surf_timer_model->common_public.action_change_state = action_change_state;
+ surf_timer_model->common_public.action_set_data = surf_action_set_data;
+ surf_timer_model->common_public.name = "TIMER";
+
+ surf_timer_model->common_private->resource_used = resource_used;
+ surf_timer_model->common_private->share_resources = share_resources;
+ surf_timer_model->common_private->update_actions_state =
+ update_actions_state;
+ surf_timer_model->common_private->update_resource_state =
+ update_resource_state;
+ surf_timer_model->common_private->finalize = finalize;
+
+ surf_timer_model->common_public.suspend = action_suspend;
+ surf_timer_model->common_public.resume = action_resume;
+ surf_timer_model->common_public.is_suspended = action_is_suspended;
+
+ surf_timer_model->extension_public->set = set;
+ surf_timer_model->extension_public->get = get;