Ouups, forgot those two files, bummer

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

diff --git a/src/surf/network.c b/src/surf/network.c
index bcb3b7a..1f03ed3 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -39,9 +39,8 @@ static void create_routing_table(void)
 
 static void link_free(void *nw_link)
 {
-  free(((link_CM02_t) nw_link)->name);
   xbt_dict_free(&(((link_CM02_t) nw_link)->properties));
-  free(nw_link);
+  surf_resource_free(nw_link);
 }
 
 static link_CM02_t link_new(char *name,
@@ -59,8 +58,8 @@ 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_network_model;
-  nw_link->name = name;
+  nw_link->generic_resource.model = surf_network_model;
+  nw_link->generic_resource.name = name;
   nw_link->bw_current = bw_initial;
   if (bw_trace)
     nw_link->bw_event =
@@ -90,12 +89,6 @@ static link_CM02_t link_new(char *name,
   return nw_link;
 }
 
-static void network_card_free(void *nw_card)
-{
-  free(((network_card_CM02_t) nw_card)->name);
-  free(nw_card);
-}
-
 static int network_card_new(const char *card_name)
 {
   network_card_CM02_t card =
@@ -103,10 +96,10 @@ static int network_card_new(const char *card_name)
 
   if (!card) {
     card = xbt_new0(s_network_card_CM02_t, 1);
-    card->name = xbt_strdup(card_name);
+    card->generic_resource.name = xbt_strdup(card_name);
     card->id = host_number++;
     xbt_dict_set(surf_model_resource_set(surf_network_model), card_name, card,
-                 network_card_free);
+                 surf_resource_free);
   }
   return card->id;
 }
@@ -301,11 +294,6 @@ static void define_callbacks(const char *file)
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback);
 }
 
-static const char *get_resource_name(void *resource_id)
-{
-  return ((network_card_CM02_t) resource_id)->name;
-}
-
 static int resource_used(void *resource_id)
 {
   return lmm_constraint_used(network_maxmin_system,
@@ -358,8 +346,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;
+  xbt_swag_t running_actions = surf_network_model->states.running_action_set;
   double min;
 
   min = generic_maxmin_share_resources(running_actions,
@@ -386,11 +373,10 @@ static void update_actions_state(double now, double delta)
   double deltap = 0.0;
   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;
+  xbt_swag_t running_actions = surf_network_model->states.running_action_set;
   /*
      xbt_swag_t failed_actions =
-     surf_network_model->common_public.states.failed_action_set;
+     surf_network_model->states.failed_action_set;
    */
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
@@ -523,12 +509,12 @@ static surf_action_t communicate(void *src, void *dst, double size,
      total_route_size = route_size + src->link_nb + dst->nb */
   int i;
 
-  XBT_IN4("(%s,%s,%g,%g)", card_src->name, card_dst->name, size, rate);
+  XBT_IN4("(%s,%s,%g,%g)", card_src->generic_resource.name, card_dst->generic_resource.name, size, rate);
   /* LARGE PLATFORMS HACK:
      assert on total_route_size */
   xbt_assert2(route_size,
               "You're trying to send data from %s to %s but there is no connexion between these two cards.",
-              card_src->name, card_dst->name);
+              card_src->generic_resource.name, card_dst->generic_resource.name);
 
   action = xbt_new0(s_surf_action_network_CM02_t, 1);
 
@@ -542,11 +528,11 @@ static surf_action_t communicate(void *src, void *dst, double size,
   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->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->states.failed_action_set;
       break;
     }
 
@@ -618,11 +604,6 @@ static int get_route_size(void *src, void *dst)
   return ROUTE_SIZE(card_src->id, card_dst->id);
 }
 
-static const char *get_link_name(const void *link)
-{
-  return ((link_CM02_t) link)->name;
-}
-
 static double get_link_bandwidth(const void *link)
 {
   return ((link_CM02_t) link)->bw_current;
@@ -679,8 +660,6 @@ static void finalize(void)
   xbt_dict_free(&link_set);
 
   surf_model_exit(surf_network_model);
-
-  free(surf_network_model);
   surf_network_model = NULL;
 
   loopback = NULL;
@@ -698,47 +677,41 @@ static void finalize(void)
 
 static void surf_network_model_init_internal(void)
 {
-  surf_network_model = xbt_new0(s_surf_model_t, 1);
-
-  surf_model_init(surf_network_model);
-
-  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_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_private->resource_used = resource_used;
-  surf_network_model->common_private->share_resources = share_resources;
-  surf_network_model->common_private->update_actions_state =
+  surf_network_model = surf_model_init();
+
+  surf_network_model->action_get_state = surf_action_get_state;
+  surf_network_model->action_get_start_time = surf_action_get_start_time;
+  surf_network_model->action_get_finish_time = surf_action_get_finish_time;
+  surf_network_model->action_free = action_free;
+  surf_network_model->action_use = action_use;
+  surf_network_model->action_cancel = action_cancel;
+  surf_network_model->action_recycle = action_recycle;
+  surf_network_model->action_change_state = action_change_state;
+  surf_network_model->action_set_data = surf_action_set_data;
+  surf_network_model->name = "network";
+
+  surf_network_model->model_private->resource_used = resource_used;
+  surf_network_model->model_private->share_resources = share_resources;
+  surf_network_model->model_private->update_actions_state =
     update_actions_state;
-  surf_network_model->common_private->update_resource_state =
+  surf_network_model->model_private->update_resource_state =
     update_resource_state;
-  surf_network_model->common_private->finalize = finalize;
+  surf_network_model->model_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->suspend = action_suspend;
+  surf_network_model->resume = action_resume;
+  surf_network_model->is_suspended = action_is_suspended;
+  surf_cpu_model->set_max_duration = action_set_max_duration;
 
   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.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->get_properties = get_properties;
 
   link_set = xbt_dict_new();