X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/824b99a5272ff8ce814336ab8bc9817eecd6de60..0efc803094915a5a68942f592e8ab4d222b7460b:/src/surf/network_gtnets.c

diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c
index 75df16ab85..2fba3bf451 100644
--- a/src/surf/network_gtnets.c
+++ b/src/surf/network_gtnets.c
@@ -28,13 +28,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_gtnets, surf,
 static int src_id = -1;
 static int dst_id = -1;
 
-/* Free memory for a network link */
-static void link_free(void *nw_link)
-{
-  xbt_dict_free(&(((network_link_GTNETS_t) nw_link)->properties));
-  surf_resource_free(nw_link);
-}
-
 /* Instantiate a new network link */
 /* name: some name for the link, from the XML */
 /* bw: The bandwidth value            */
@@ -45,7 +38,7 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props)
   network_link_GTNETS_t gtnets_link;
 
   /* If link already exists, nothing to do (FIXME: check that multiple definition match?) */
-  if (xbt_dict_get_or_null(link_set, name)) {
+  if (xbt_dict_get_or_null(surf_network_model->resource_set, name)) {
     return;
   }
 
@@ -77,13 +70,12 @@ 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->generic_resource.name = name;
+  gtnets_link->generic_resource.properties = props;
   gtnets_link->bw_current = bw;
   gtnets_link->lat_current = lat;
   gtnets_link->id = link_count;
-  /* Add the properties */
-  gtnets_link->properties = props;
 
-  xbt_dict_set(link_set, name, gtnets_link, link_free);
+  xbt_dict_set(surf_network_model->resource_set, name, gtnets_link, surf_resource_free);
 
   return;
 }
@@ -104,7 +96,7 @@ 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->generic_resource.name = xbt_strdup(name);
+    card->name = xbt_strdup(name);
     card->id = card_count;
     xbt_dict_set(surf_model_resource_set(surf_network_model), name, card,
                  surf_resource_free);
@@ -165,20 +157,20 @@ static void parse_link_init(void)
   char *name;
   double bw;
   double lat;
-  e_surf_link_state_t state;
+  e_surf_resource_state_t state;
 
   name = xbt_strdup(A_surfxml_link_id);
   surf_parse_get_double(&bw, A_surfxml_link_bandwidth);
   surf_parse_get_double(&lat, A_surfxml_link_latency);
-  state = SURF_LINK_ON;
+  state = SURF_RESOURCE_ON;
 
   tmgr_trace_t bw_trace;
   tmgr_trace_t state_trace;
   tmgr_trace_t lat_trace;
 
-  surf_parse_get_trace(&bw_trace, A_surfxml_link_bandwidth_file);
-  surf_parse_get_trace(&lat_trace, A_surfxml_link_latency_file);
-  surf_parse_get_trace(&state_trace, A_surfxml_link_state_file);
+  bw_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file);
+  lat_trace = tmgr_trace_new(A_surfxml_link_latency_file);
+  state_trace = tmgr_trace_new(A_surfxml_link_state_file);
 
   if (bw_trace)
     INFO0("The GTNetS network model doesn't support bandwidth state traces");
@@ -250,7 +242,7 @@ static void add_route()
 
     xbt_dynar_foreach(links, cpt, link) {
       TRY {
-        link_list[nb_link++] = xbt_dict_get(link_set, link);
+        link_list[nb_link++] = xbt_dict_get(surf_network_model->resource_set, link);
       }
       CATCH(e) {
         RETHROW1("Link %s not found (dict raised this exception: %s)", link);
@@ -275,7 +267,7 @@ static void add_route()
 
     xbt_dynar_foreach(links, cpt, link) {
       TRY {
-        link_list[nb_link++] = xbt_dict_get(link_set, link);
+        link_list[nb_link++] = xbt_dict_get(surf_network_model->resource_set, link);
       }
       CATCH(e) {
         RETHROW1("Link %s not found (dict raised this exception: %s)", link);
@@ -301,19 +293,13 @@ static void define_callbacks(const char *file)
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route);
 }
 
-static xbt_dict_t get_properties(void *link)
-{
-  return ((network_card_GTNETS_t) link)->properties;
-}
-
-
 /* We do not care about this: only used for traces */
 static int resource_used(void *resource_id)
 {
   return 0;                     /* We don't care */
 }
 
-static int action_free(surf_action_t action)
+static int action_unref(surf_action_t action)
 {
   action->refcount--;
   if (!action->refcount) {
@@ -325,24 +311,19 @@ static int action_free(surf_action_t action)
   return 0;
 }
 
-static void action_use(surf_action_t action)
-{
-  action->refcount++;
-}
-
 static void action_cancel(surf_action_t action)
 {
-  xbt_assert0(0, "Cannot cancel GTNetS flow");
+  xbt_die("Cannot cancel GTNetS flow");
   return;
 }
 
 static void action_recycle(surf_action_t action)
 {
-  xbt_assert0(0, "Cannot recycle GTNetS flow");
+  xbt_die("Cannot recycle GTNetS flow");
   return;
 }
 
-static void action_change_state(surf_action_t action,
+static void action_state_set(surf_action_t action,
                                 e_surf_action_state_t state)
 {
 /*   if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
@@ -360,7 +341,7 @@ static void action_change_state(surf_action_t action,
 static double share_resources(double now)
 {
   xbt_swag_t running_actions =
-    surf_network_model->common_public.states.running_action_set;
+    surf_network_model->states.running_action_set;
 
   //get the first relevant value from the running_actions list
   if (!xbt_swag_size(running_actions))
@@ -386,7 +367,7 @@ static void update_actions_state(double now, double delta)
   surf_action_network_GTNETS_t action = NULL;
   //  surf_action_network_GTNETS_t next_action = NULL;
   xbt_swag_t running_actions =
-    surf_network_model->common_public.states.running_action_set;
+    surf_network_model->states.running_action_set;
 
   /* If there are no renning flows, just return */
   if (time_to_next_flow_completion < 0.0) {
@@ -428,7 +409,7 @@ static void update_actions_state(double now, double delta)
       action = (surf_action_network_GTNETS_t) (metadata[i]);
 
       action->generic_action.finish = now + time_to_next_flow_completion;
-      action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+      action_state_set((surf_action_t) action, SURF_ACTION_DONE);
       DEBUG1("----> Action (%p) just terminated", action);
     }
 
@@ -452,42 +433,18 @@ static void update_resource_state(void *id,
 }
 
 /* KF: Rate not supported */
-static surf_action_t communicate(void *src, void *dst, double size,
+/* Max durations are not supported */
+static surf_action_t communicate(const char *src_name, const char *dst_name,int src, int dst, double size,
                                  double rate)
 {
   surf_action_network_GTNETS_t action = NULL;
-  network_card_GTNETS_t card_src = src;
-  network_card_GTNETS_t card_dst = dst;
-/*
-  int route_size = ROUTE_SIZE(card_src->id, card_dst->id);
-  network_link_GTNETS_t *route = ROUTE(card_src->id, card_dst->id);
-*/
-
-/*
-  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);
-*/
-
-  action = xbt_new0(s_surf_action_network_GTNETS_t, 1);
 
-  action->generic_action.refcount = 1;
-  action->generic_action.cost = size;
-  action->generic_action.remains = size;
-  /* Max durations are not supported */
-  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_network_model;
-
-  action->generic_action.state_set =
-    surf_network_model->common_public.states.running_action_set;
-
-  xbt_swag_insert(action, action->generic_action.state_set);
+  action = surf_action_new(sizeof(s_surf_action_network_GTNETS_t),size,surf_network_model,0);
 
   /* 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->generic_resource.name,
-                card_dst->generic_resource.name);
+  if (gtnets_create_flow(src, dst, size, (void *) action) < 0) {
+    xbt_assert2(0, "Not route between host %s and host %s", src_name,
+                dst_name);
   }
 
   return (surf_action_t) action;
@@ -513,7 +470,7 @@ static int action_is_suspended(surf_action_t action)
 
 static void finalize(void)
 {
-  xbt_dict_free(&link_set);
+  xbt_dict_free(&surf_network_model->resource_set);
 
   surf_model_exit(surf_network_model);
 
@@ -525,16 +482,13 @@ static void finalize(void)
 
 static void surf_network_model_init_internal(void)
 {
-  s_surf_action_t action;
-
   surf_network_model = surf_model_init();
 
   surf_network_model->name = "network GTNetS";
-  surf_network_model->action_use = action_use;
-  surf_network_model->action_free = action_free;
+  surf_network_model->action_unref = action_unref;
   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_state_set = action_state_set;
 
   surf_network_model->model_private->resource_used = resource_used;
   surf_network_model->model_private->share_resources = share_resources;
@@ -550,11 +504,6 @@ static void surf_network_model_init_internal(void)
 
   surf_network_model->extension.network.communicate = communicate;
 
-  /*for the props of the link */
-  surf_network_model->get_properties = get_properties;
-
-  link_set = xbt_dict_new();
-
   /* KF: Added the initialization for GTNetS interface */
   if (gtnets_initialize()) {
     xbt_assert0(0, "impossible to initialize GTNetS interface");