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

diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c
index e30d059be7..c8c9557a07 100644
--- a/src/surf/network_gtnets.c
+++ b/src/surf/network_gtnets.c
@@ -24,7 +24,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_gtnets, surf,
 /* Free memory for a network link */
 static void link_free(void *nw_link)
 {
-  free(((link_GTNETS_t) nw_link)->name);
+  free(((network_link_GTNETS_t) nw_link)->name);
   free(nw_link);
 }
 
@@ -35,7 +35,7 @@ static void link_free(void *nw_link)
 static void link_new(char *name, double bw, double lat, xbt_dict_t props)
 {
   static int link_count = -1;
-  link_GTNETS_t gtnets_link;
+  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)) {
@@ -68,7 +68,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_link_GTNETS_t, 1);
+  gtnets_link = xbt_new0(s_network_link_GTNETS_t, 1);
   gtnets_link->name = name;
   gtnets_link->bw_current = bw;
   gtnets_link->lat_current = lat;
@@ -116,12 +116,12 @@ static int network_card_new(const char *name)
 static void route_new(int src_id, int dst_id, char **links, int nb_link)
 {
 #if 0
-  link_GTNETS_t *link_list = NULL;
+  network_link_GTNETS_t *link_list = NULL;
   int i;
 
   ROUTE_SIZE(src_id, dst_id) = nb_link;
   link_list = (ROUTE(src_id, dst_id) =
-	       xbt_new0(link_GTNETS_t, nb_link));
+	       xbt_new0(network_link_GTNETS_t, nb_link));
   for (i = 0; i < nb_link; i++) {
     link_list[i] = xbt_dict_get_or_null(link_set, links[i]);
     free(links[i]);
@@ -135,7 +135,7 @@ static void route_new(int src_id, int dst_id, char **links, int nb_link)
   gtnets_links = (int *) calloc(nb_link, sizeof(int));
   for (i = 0; i < nb_link; i++) {
     gtnets_links[i] =
-	((link_GTNETS_t)
+	((network_link_GTNETS_t)
 	 (xbt_dict_get(link_set, links[i])))->id;
   }
 
@@ -157,7 +157,7 @@ static void route_onehop_new(int src_id, int dst_id, char **links,
 
   /* KF: Build the list of gtnets link IDs */
   linkid =
-      ((link_GTNETS_t)
+      ((network_link_GTNETS_t)
        (xbt_dict_get(link_set, links[0])))->id;
 
   /* KF: Create the GTNets route */
@@ -223,7 +223,7 @@ static void parse_route_set_endpoints(void)
 /*  nb_link = 0;
   link_name = NULL;
 */
-  route_link_list = xbt_dynar_new(sizeof(char *), &free_string);
+  route_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
 }
 
 /* KF*/
@@ -272,7 +272,7 @@ static void add_route()
   unsigned int cpt = 0;    
   int i = 0;
   xbt_dict_cursor_t cursor = NULL;
-  char *key,*data;
+  char *key,*data, *end;
   const char *sep = "#";
   xbt_dynar_t links, keys;
 
@@ -284,8 +284,8 @@ static void add_route()
     nb_link = xbt_dynar_length(links);
     link_name = xbt_realloc(link_name, (nb_link) * sizeof(char *));
 
-    src_id = atoi(xbt_dynar_get_as(keys, 0, char*));
-    dst_id = atoi(xbt_dynar_get_as(keys, 1, char*));
+    src_id = strtol(xbt_dynar_get_as(keys, 0, char*), &end, 16);
+    dst_id = strtol(xbt_dynar_get_as(keys, 1, char*), &end, 16);
   
     i = 0;
     char* link = NULL;
@@ -301,7 +301,6 @@ static void add_route()
       route_new(src_id, dst_id, link_name, nb_link);
     if (nb_link == 1)
       route_onehop_new(src_id, dst_id, link_name, nb_link);
-    xbt_dynar_free(&links);
    }
 
    xbt_dict_free(&route_table);
@@ -480,7 +479,7 @@ static surf_action_t communicate(void *src, void *dst, double size,
   network_card_GTNETS_t card_dst = dst;
 /*
   int route_size = ROUTE_SIZE(card_src->id, card_dst->id);
-  link_GTNETS_t *route = ROUTE(card_src->id, card_dst->id);
+  network_link_GTNETS_t *route = ROUTE(card_src->id, card_dst->id);
 */
 
 /*