X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/368be7990cfe509e3c7715d9ad28f5ca1b3d62ef..c94898122fc054483e0e4b0313cd52f385582d2a:/src/surf/network_gtnets.c

diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c
index 32a30ba08c..21f23c7a07 100644
--- a/src/surf/network_gtnets.c
+++ b/src/surf/network_gtnets.c
@@ -31,9 +31,8 @@ static int dst_id = -1;
 /* Free memory for a network link */
 static void link_free(void *nw_link)
 {
-  free(((network_link_GTNETS_t) nw_link)->name);
   xbt_dict_free(&(((network_link_GTNETS_t) nw_link)->properties));
-  free(nw_link);
+  surf_resource_free(nw_link);
 }
 
 /* Instantiate a new network link */
@@ -54,7 +53,7 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props)
   link_count++;
 
 /*
-  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)
@@ -77,7 +76,7 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props)
 
   /* KF: Insert entry in the dictionary */
   gtnets_link = xbt_new0(s_network_link_GTNETS_t, 1);
-  gtnets_link->name = name;
+  gtnets_link->generic_resource.name = name;
   gtnets_link->bw_current = bw;
   gtnets_link->lat_current = lat;
   gtnets_link->id = link_count;
@@ -89,13 +88,6 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props)
   return;
 }
 
-/* free the network card */
-static void network_card_free(void *nw_card)
-{
-  free(((network_card_GTNETS_t) nw_card)->name);
-  free(nw_card);
-}
-
 /* Instantiate a new network card: MODIFYED BY KF */
 static int network_card_new(const char *name)
 {
@@ -103,7 +95,8 @@ static int network_card_new(const char *name)
 
   XBT_IN1("(%s)", name);
   /* KF: Check that we haven't seen the network card before */
-  network_card_GTNETS_t card = surf_model_resource_by_name(surf_network_model, name);
+  network_card_GTNETS_t card =
+    surf_model_resource_by_name(surf_network_model, name);
 
   if (!card) {
     /* KF: Increment the card counter for GTNetS */
@@ -111,9 +104,10 @@ static int network_card_new(const char *name)
 
     /* KF: just use the dictionary to map link names to link indices */
     card = xbt_new0(s_network_card_GTNETS_t, 1);
-    card->name = xbt_strdup(name);
+    card->generic_resource.name = xbt_strdup(name);
     card->id = card_count;
-    xbt_dict_set(surf_model_resource_set(surf_network_model), name, card, network_card_free);
+    xbt_dict_set(surf_model_resource_set(surf_network_model), name, card,
+                 surf_resource_free);
   }
 
   LOG1(xbt_log_priority_trace, "   return %d", card->id);
@@ -307,11 +301,6 @@ static void define_callbacks(const char *file)
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route);
 }
 
-static const char *get_resource_name(void *resource_id)
-{
-  return ((network_card_GTNETS_t) resource_id)->name;
-}
-
 static xbt_dict_t get_properties(void *link)
 {
   return ((network_card_GTNETS_t) link)->properties;
@@ -487,7 +476,7 @@ 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->generic_action.model_type = surf_network_model;
 
   action->generic_action.state_set =
     surf_network_model->common_public.states.running_action_set;
@@ -497,8 +486,8 @@ static surf_action_t communicate(void *src, void *dst, double size,
   /* KF: Add a flow to the GTNets Simulation, associated to this action */
   if (gtnets_create_flow(card_src->id, card_dst->id, size, (void *) action)
       < 0) {
-    xbt_assert2(0, "Not route between host %s and host %s", card_src->name,
-                card_dst->name);
+    xbt_assert2(0, "Not route between host %s and host %s", card_src->generic_resource.name,
+                card_dst->generic_resource.name);
   }
 
   return (surf_action_t) action;
@@ -507,15 +496,13 @@ static surf_action_t communicate(void *src, void *dst, double size,
 /* Suspend a flow() */
 static void action_suspend(surf_action_t action)
 {
-  xbt_assert0(0,
-              "action_suspend() not supported for the GTNets network model");
+  THROW_UNIMPLEMENTED;
 }
 
 /* Resume a flow() */
 static void action_resume(surf_action_t action)
 {
-  xbt_assert0(0,
-              "action_resume() not supported for the GTNets network model");
+  THROW_UNIMPLEMENTED;
 }
 
 /* Test whether a flow is suspended */
@@ -528,9 +515,7 @@ static void finalize(void)
 {
   xbt_dict_free(&link_set);
 
-  surf_model_exit((surf_model_t)surf_network_model);
-
-  free(surf_network_model->extension_public);
+  surf_model_exit(surf_network_model);
 
   free(surf_network_model);
   surf_network_model = NULL;
@@ -544,36 +529,30 @@ static void surf_network_model_init_internal(void)
 
   surf_network_model = xbt_new0(s_surf_network_model_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_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_use = action_use;
   surf_network_model->common_public.action_free = action_free;
   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_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->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_network_model->extension_public->communicate = communicate;
+  surf_network_model->extension.network.communicate = communicate;
 
   /*for the props of the link */
   surf_network_model->common_public.get_properties = get_properties;
@@ -596,6 +575,6 @@ void surf_network_model_init_GTNETS(const char *filename)
   xbt_dynar_push(model_list, &surf_network_model);
 
   update_model_description(surf_network_model_description,
-                           "GTNets", (surf_model_t) surf_network_model);
+                           "GTNets", surf_network_model);
 }
 #endif