Factorize some code in SURF

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

diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c
index 1561796..557e94a 100644 (file)
--- a/src/surf/network_constant.c
+++ b/src/surf/network_constant.c
@@ -138,7 +138,7 @@ static double share_resources(double now)
 {
   surf_action_network_Constant_t action = NULL;
   xbt_swag_t running_actions =
-    surf_network_model->common_public->states.running_action_set;
+    surf_network_model->common_public.states.running_action_set;
   double min = -1.0;
 
   xbt_swag_foreach(action, running_actions) {
@@ -158,7 +158,7 @@ static void update_actions_state(double now, double delta)
   surf_action_network_Constant_t action = NULL;
   surf_action_network_Constant_t next_action = NULL;
   xbt_swag_t running_actions =
-    surf_network_model->common_public->states.running_action_set;
+    surf_network_model->common_public.states.running_action_set;
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
     if (action->latency > 0) {
@@ -218,10 +218,10 @@ static surf_action_t communicate(void *src, void *dst, double size,
 
   if (action->latency <= 0.0)
     action->generic_action.state_set =
-      surf_network_model->common_public->states.done_action_set;
+      surf_network_model->common_public.states.done_action_set;
   else
     action->generic_action.state_set =
-      surf_network_model->common_public->states.running_action_set;
+      surf_network_model->common_public.states.running_action_set;
 
   xbt_swag_insert(action, action->generic_action.state_set);
 
@@ -293,12 +293,9 @@ static void action_set_max_duration(surf_action_t action, double duration)
 static void finalize(void)
 {
   xbt_dict_free(&network_card_set);
-  xbt_swag_free(surf_network_model->common_public->states.ready_action_set);
-  xbt_swag_free(surf_network_model->common_public->states.running_action_set);
-  xbt_swag_free(surf_network_model->common_public->states.failed_action_set);
-  xbt_swag_free(surf_network_model->common_public->states.done_action_set);
-  free(surf_network_model->common_public);
-  free(surf_network_model->common_private);
+
+  surf_model_exit((surf_model_t)surf_network_model);
+
   free(surf_network_model->extension_public);
 
   free(surf_network_model);
@@ -309,39 +306,28 @@ static void finalize(void)
 
 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_network_model->common_private = xbt_new0(s_surf_model_private_t, 1);
-  surf_network_model->common_public = xbt_new0(s_surf_model_public_t, 1);
+  surf_model_init((surf_model_t)surf_network_model);
+
   surf_network_model->extension_public =
     xbt_new0(s_surf_network_model_extension_public_t, 1);
 
-  surf_network_model->common_public->states.ready_action_set =
-    xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  surf_network_model->common_public->states.running_action_set =
-    xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  surf_network_model->common_public->states.failed_action_set =
-    xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  surf_network_model->common_public->states.done_action_set =
-    xbt_swag_new(xbt_swag_offset(action, state_hookup));
-
-  surf_network_model->common_public->name_service = name_service;
-  surf_network_model->common_public->get_resource_name = get_resource_name;
-  surf_network_model->common_public->action_get_state = surf_action_get_state;
-  surf_network_model->common_public->action_get_start_time =
+  surf_network_model->common_public.name_service = name_service;
+  surf_network_model->common_public.get_resource_name = get_resource_name;
+  surf_network_model->common_public.action_get_state = surf_action_get_state;
+  surf_network_model->common_public.action_get_start_time =
     surf_action_get_start_time;
-  surf_network_model->common_public->action_get_finish_time =
+  surf_network_model->common_public.action_get_finish_time =
     surf_action_get_finish_time;
-  surf_network_model->common_public->action_free = action_free;
-  surf_network_model->common_public->action_use = action_use;
-  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 =
+  surf_network_model->common_public.action_free = action_free;
+  surf_network_model->common_public.action_use = action_use;
+  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->common_public.action_set_data = surf_action_set_data;
+  surf_network_model->common_public.name = "network";
 
   surf_network_model->common_private->resource_used = resource_used;
   surf_network_model->common_private->share_resources = share_resources;
@@ -351,10 +337,10 @@ static void surf_network_model_init_internal(void)
     update_resource_state;
   surf_network_model->common_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_cpu_model->common_public->set_max_duration = action_set_max_duration;
+  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_cpu_model->common_public.set_max_duration = action_set_max_duration;
 
   surf_network_model->extension_public->communicate = communicate;
   surf_network_model->extension_public->get_route = get_route;
@@ -365,7 +351,7 @@ static void surf_network_model_init_internal(void)
   surf_network_model->extension_public->get_link_latency = get_link_latency;
   surf_network_model->extension_public->link_shared = link_shared;
 
-  surf_network_model->common_public->get_properties = get_properties;
+  surf_network_model->common_public.get_properties = get_properties;
 
   network_card_set = xbt_dict_new();