There was too many reallocs

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2702 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/surf/network.c b/src/surf/network.c
index a230eaf..3acd722 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -143,7 +143,8 @@ static void parse_network_link(void)
                   policy_initial);
 }
 
-static int nb_link = 0;
+static int nb_link;
+static int link_name_capacity;
 static char **link_name = NULL;
 static int src_id = -1;
 static int dst_id = -1;
@@ -153,14 +154,17 @@ static void parse_route_set_endpoints(void)
   src_id = network_card_new(A_surfxml_route_src);
   dst_id = network_card_new(A_surfxml_route_dst);
   nb_link = 0;
-  link_name = NULL;
+  link_name_capacity = 16;
+  link_name = xbt_new(char*, link_name_capacity);
 }
 
 static void parse_route_elem(void)
 {
-  nb_link++;
-  link_name = xbt_realloc(link_name, (nb_link) * sizeof(char *));
-  link_name[(nb_link) - 1] = xbt_strdup(A_surfxml_route_element_name);
+  if (nb_link == link_name_capacity) {
+    link_name_capacity *= 2;
+    link_name = xbt_realloc(link_name, (link_name_capacity) * sizeof(char *));
+  }
+  link_name[nb_link++] = xbt_strdup(A_surfxml_route_element_name);
 }
 
 static void parse_route_set_route(void)

diff --git a/src/surf/network_dassf.c b/src/surf/network_dassf.c
index 8046397..3d31515 100644 (file)
--- a/src/surf/network_dassf.c
+++ b/src/surf/network_dassf.c
@@ -129,7 +129,8 @@ static void parse_network_link(void)
                   lat_initial, lat_trace, state_initial, state_trace);
 }
 
-static int nb_link = 0;
+static int nb_link;
+static int link_name_capacity;
 static char **link_name = NULL;
 static int src_id = -1;
 static int dst_id = -1;
@@ -139,14 +140,17 @@ static void parse_route_set_endpoints(void)
   src_id = network_card_new(A_surfxml_route_src);
   dst_id = network_card_new(A_surfxml_route_dst);
   nb_link = 0;
-  link_name = NULL;
+  link_name_capacity = 16;
+  link_name = xbt_new(char*, link_name_capacity);
 }
 
 static void parse_route_elem(void)
 {
-  nb_link++;
-  link_name = xbt_realloc(link_name, (nb_link) * sizeof(char *));
-  link_name[(nb_link) - 1] = xbt_strdup(A_surfxml_route_element_name);
+  if (nb_link == link_name_capacity) {
+    link_name_capacity *= 2;
+    link_name = xbt_realloc(link_name, (link_name_capacity) * sizeof(char *));
+  }
+  link_name[nb_link++] = xbt_strdup(A_surfxml_route_element_name);
 }
 
 static void parse_route_set_route(void)

diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index 894ffa3..c0d27c5 100644 (file)
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -881,7 +881,8 @@ static void route_new(int src_id, int dst_id, char **links, int nb_link,
   route->impact_on_dst_with_other_send = impact_on_dst_with_other_send;
 }
 
-static int nb_link = 0;
+static int nb_link;
+static int link_name_capacity;
 static char **link_name = NULL;
 static int src_id = -1;
 static int dst_id = -1;
@@ -902,14 +903,17 @@ static void parse_route_set_endpoints(void)
                        A_surfxml_route_impact_on_dst_with_other_send);
 
   nb_link = 0;
-  link_name = NULL;
+  link_name_capacity = 16;
+  link_name = xbt_new(char*, link_name_capacity);
 }
 
 static void parse_route_elem(void)
 {
-  nb_link++;
-  link_name = xbt_realloc(link_name, (nb_link) * sizeof(char *));
-  link_name[(nb_link) - 1] = xbt_strdup(A_surfxml_route_element_name);
+  if (nb_link == link_name_capacity) {
+    link_name_capacity *= 2;
+    link_name = xbt_realloc(link_name, (link_name_capacity) * sizeof(char *));
+  }
+  link_name[nb_link++] = xbt_strdup(A_surfxml_route_element_name);
 }
 
 static void parse_route_set_route(void)