SURF: Unify the types of models in a uniq s_surf_model_t (using an union) +reindent...

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

diff --git a/src/surf/network.c b/src/surf/network.c
index 1b960b7..bcb3b7a 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -12,11 +12,10 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
                                 "Logging specific to the SURF network module");
 
-surf_network_model_t surf_network_model = NULL;
+surf_model_t surf_network_model = NULL;
 static lmm_system_t network_maxmin_system = NULL;
 static void (*network_solve) (lmm_system_t) = NULL;
 xbt_dict_t link_set = NULL;
-xbt_dict_t network_card_set = NULL;
 
 double latency_factor = 1.0;    /* default value */
 double bandwidth_factor = 1.0;  /* default value */
@@ -27,6 +26,8 @@ int host_number = 0;
 link_CM02_t **routing_table = NULL;
 int *routing_table_size = NULL;
 static link_CM02_t loopback = NULL;
+double sg_tcp_gamma = 0.0;
+
 
 static void create_routing_table(void)
 {
@@ -58,7 +59,7 @@ static link_CM02_t link_new(char *name,
   xbt_assert1(!xbt_dict_get_or_null(link_set, name),
               "Link '%s' declared several times in the platform file.", name);
 
-  nw_link->model = (surf_model_t) surf_network_model;
+  nw_link->model = surf_network_model;
   nw_link->name = name;
   nw_link->bw_current = bw_initial;
   if (bw_trace)
@@ -98,13 +99,14 @@ static void network_card_free(void *nw_card)
 static int network_card_new(const char *card_name)
 {
   network_card_CM02_t card =
-    xbt_dict_get_or_null(network_card_set, card_name);
+    surf_model_resource_by_name(surf_network_model, card_name);
 
   if (!card) {
     card = xbt_new0(s_network_card_CM02_t, 1);
     card->name = xbt_strdup(card_name);
     card->id = host_number++;
-    xbt_dict_set(network_card_set, card_name, card, network_card_free);
+    xbt_dict_set(surf_model_resource_set(surf_network_model), card_name, card,
+                 network_card_free);
   }
   return card->id;
 }
@@ -299,12 +301,6 @@ static void define_callbacks(const char *file)
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback);
 }
 
-static void *name_service(const char *name)
-{
-  network_card_CM02_t card = xbt_dict_get_or_null(network_card_set, name);
-  return card;
-}
-
 static const char *get_resource_name(void *resource_id)
 {
   return ((network_card_CM02_t) resource_id)->name;
@@ -363,7 +359,7 @@ static double share_resources(double now)
   s_surf_action_network_CM02_t s_action;
   surf_action_network_CM02_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;
 
   min = generic_maxmin_share_resources(running_actions,
@@ -391,10 +387,10 @@ static void update_actions_state(double now, double delta)
   surf_action_network_CM02_t action = NULL;
   surf_action_network_CM02_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_t failed_actions =
-     surf_network_model->common_public->states.failed_action_set;
+     surf_network_model->common_public.states.failed_action_set;
    */
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
@@ -473,13 +469,12 @@ static void update_resource_state(void *id,
       action->weight += delta;
       if (action->rate < 0)
         lmm_update_variable_bound(network_maxmin_system, action->variable,
-                                  SG_TCP_CTE_GAMMA / (2.0 *
-                                                      action->lat_current));
+                                  sg_tcp_gamma / (2.0 * action->lat_current));
       else
         lmm_update_variable_bound(network_maxmin_system, action->variable,
                                   min(action->rate,
-                                      SG_TCP_CTE_GAMMA / (2.0 *
-                                                          action->lat_current)));
+                                      sg_tcp_gamma / (2.0 *
+                                                      action->lat_current)));
       if (!(action->suspended))
         lmm_update_variable_weight(network_maxmin_system, action->variable,
                                    action->weight);
@@ -543,15 +538,15 @@ static surf_action_t communicate(void *src, void *dst, double size,
   action->generic_action.max_duration = NO_MAX_DURATION;
   action->generic_action.start = surf_get_clock();
   action->generic_action.finish = -1.0;
-  action->generic_action.model_type = (surf_model_t) surf_network_model;
-  action->suspended = 0;        /* Should be useless because of the 
+  action->generic_action.model_type = surf_network_model;
+  action->suspended = 0;        /* Should be useless because of the
                                    calloc but it seems to help valgrind... */
   action->generic_action.state_set =
-    surf_network_model->common_public->states.running_action_set;
+    surf_network_model->common_public.states.running_action_set;
   for (i = 0; i < route_size; i++)
     if (route[i]->state_current == SURF_LINK_OFF) {
       action->generic_action.state_set =
-        surf_network_model->common_public->states.failed_action_set;
+        surf_network_model->common_public.states.failed_action_set;
       break;
     }
 
@@ -582,8 +577,7 @@ static surf_action_t communicate(void *src, void *dst, double size,
   if (action->rate < 0) {
     if (action->lat_current > 0)
       lmm_update_variable_bound(network_maxmin_system, action->variable,
-                                SG_TCP_CTE_GAMMA / (2.0 *
-                                                    action->lat_current));
+                                sg_tcp_gamma / (2.0 * action->lat_current));
     else
       lmm_update_variable_bound(network_maxmin_system, action->variable,
                                 -1.0);
@@ -591,8 +585,8 @@ static surf_action_t communicate(void *src, void *dst, double size,
     if (action->lat_current > 0)
       lmm_update_variable_bound(network_maxmin_system, action->variable,
                                 min(action->rate,
-                                    SG_TCP_CTE_GAMMA / (2.0 *
-                                                        action->lat_current)));
+                                    sg_tcp_gamma / (2.0 *
+                                                    action->lat_current)));
     else
       lmm_update_variable_bound(network_maxmin_system, action->variable,
                                 action->rate);
@@ -682,15 +676,9 @@ static void finalize(void)
 {
   int i, j;
 
-  xbt_dict_free(&network_card_set);
   xbt_dict_free(&link_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);
-  free(surf_network_model->extension_public);
+
+  surf_model_exit(surf_network_model);
 
   free(surf_network_model);
   surf_network_model = NULL;
@@ -710,39 +698,23 @@ 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_network_model->extension_public =
-    xbt_new0(s_surf_network_model_extension_public_t, 1);
+  surf_network_model = xbt_new0(s_surf_model_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_model_init(surf_network_model);
 
-  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.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 =
-    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_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_private->resource_used = resource_used;
   surf_network_model->common_private->share_resources = share_resources;
@@ -752,24 +724,23 @@ 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;
-  surf_network_model->extension_public->get_route_size = get_route_size;
-  surf_network_model->extension_public->get_link_name = get_link_name;
-  surf_network_model->extension_public->get_link_bandwidth =
+  surf_network_model->extension.network.communicate = communicate;
+  surf_network_model->extension.network.get_route = get_route;
+  surf_network_model->extension.network.get_route_size = get_route_size;
+  surf_network_model->extension.network.get_link_name = get_link_name;
+  surf_network_model->extension.network.get_link_bandwidth =
     get_link_bandwidth;
-  surf_network_model->extension_public->get_link_latency = get_link_latency;
-  surf_network_model->extension_public->link_shared = link_shared;
+  surf_network_model->extension.network.get_link_latency = get_link_latency;
+  surf_network_model->extension.network.link_shared = link_shared;
 
-  surf_network_model->common_public->get_properties = get_properties;
+  surf_network_model->common_public.get_properties = get_properties;
 
   link_set = xbt_dict_new();
-  network_card_set = xbt_dict_new();
 
   if (!network_maxmin_system)
     network_maxmin_system = lmm_system_new();
@@ -793,7 +764,7 @@ void surf_network_model_init_LegrandVelho(const char *filename)
   weight_S_parameter = 8775;
 
   update_model_description(surf_network_model_description,
-                           "LegrandVelho", (surf_model_t) surf_network_model);
+                           "LegrandVelho", surf_network_model);
 }
 
 /***************************************************************************/
@@ -818,7 +789,7 @@ void surf_network_model_init_CM02(const char *filename)
   network_solve = lmm_solve;
 
   update_model_description(surf_network_model_description,
-                           "CM02", (surf_model_t) surf_network_model);
+                           "CM02", surf_network_model);
 }
 
 void surf_network_model_init_Reno(const char *filename)
@@ -837,7 +808,7 @@ void surf_network_model_init_Reno(const char *filename)
   weight_S_parameter = 8775;
 
   update_model_description(surf_network_model_description,
-                           "Reno", (surf_model_t) surf_network_model);
+                           "Reno", surf_network_model);
 }
 
 
@@ -858,7 +829,7 @@ void surf_network_model_init_Reno2(const char *filename)
   weight_S_parameter = 8775;
 
   update_model_description(surf_network_model_description,
-                           "Reno2", (surf_model_t) surf_network_model);
+                           "Reno2", surf_network_model);
 }
 
 void surf_network_model_init_Vegas(const char *filename)
@@ -878,7 +849,7 @@ void surf_network_model_init_Vegas(const char *filename)
   weight_S_parameter = 8775;
 
   update_model_description(surf_network_model_description,
-                           "Vegas", (surf_model_t) surf_network_model);
+                           "Vegas", surf_network_model);
 }
 
 #ifdef HAVE_SDP
@@ -893,6 +864,6 @@ void surf_network_model_init_SDP(const char *filename)
   network_solve = sdp_solve;
 
   update_model_description(surf_network_model_description,
-                           "SDP", (surf_model_t) surf_network_model);
+                           "SDP", surf_network_model);
 }
 #endif