X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/472ee9182d83a0d686ead1761f3d7634660bb37d..8a76d5717862842060081d52f06c092250a9a573:/src/surf/network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index a230eaff8b..76411fb9a9 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -91,19 +91,10 @@ static int network_card_new(const char *card_name)
   return card->id;
 }
 
-static void route_new(int src_id, int dst_id, char **links, int nb_link)
+static void route_new(int src_id, int dst_id, network_link_CM02_t *link_list, int nb_link)
 {
-  network_link_CM02_t *link_list = NULL;
-  int i;
-
   ROUTE_SIZE(src_id, dst_id) = nb_link;
-  link_list = (ROUTE(src_id, dst_id) = xbt_new0(network_link_CM02_t, nb_link));
-  for (i = 0; i < nb_link; i++) {
-    link_list[i] = xbt_dict_get_or_null(network_link_set, links[i]);
-    xbt_assert1(link_list[i],"Invalid link name \"%s\"",links[i]);
-    free(links[i]);
-  }
-  free(links);
+  ROUTE(src_id, dst_id) = link_list = xbt_realloc(link_list, sizeof(network_link_CM02_t) * nb_link);
 }
 
 static void parse_network_link(void)
@@ -143,8 +134,9 @@ static void parse_network_link(void)
 		   policy_initial);
 }
 
-static int nb_link = 0;
-static char **link_name = NULL;
+static int nb_link;
+static int link_list_capacity;
+static network_link_CM02_t *link_list = NULL;
 static int src_id = -1;
 static int dst_id = -1;
 
@@ -153,19 +145,22 @@ 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_list_capacity = 20;
+  link_list = xbt_new(network_link_CM02_t, link_list_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_list_capacity) {
+    link_list_capacity *= 2;
+    link_list = xbt_realloc(link_list, (link_list_capacity) * sizeof(network_link_CM02_t));
+  }
+  link_list[nb_link++] = xbt_dict_get_or_null(network_link_set, A_surfxml_route_element_name);
 }
 
 static void parse_route_set_route(void)
 {
-  route_new(src_id, dst_id, link_name, nb_link);
+  route_new(src_id, dst_id, link_list, nb_link);
 }
 
 static void parse_file(const char *file)
@@ -203,7 +198,7 @@ static void parse_file(const char *file)
     if(!ROUTE_SIZE(i,i)) {
       if(!loopback)
 	loopback = network_link_new(xbt_strdup("__MSG_loopback__"), 
-				   498.00, NULL, 0.000015, NULL, 
+				   498000000, NULL, 0.000015, NULL, 
 				   SURF_NETWORK_LINK_ON, NULL,
 				   SURF_NETWORK_LINK_FATPIPE);
       ROUTE_SIZE(i,i)=1;
@@ -304,20 +299,20 @@ static void update_actions_state(double now, double delta)
     deltap = delta;
     if (action->latency > 0) {
       if (action->latency > deltap) {
-	surf_double_update(&(action->latency),deltap);
+	double_update(&(action->latency),deltap);
 	deltap = 0.0;
       } else {
-	surf_double_update(&(deltap), action->latency);
+	double_update(&(deltap), action->latency);
 	action->latency = 0.0;
       }
       if ((action->latency == 0.0) && !(action->suspended)) 
 	lmm_update_variable_weight(maxmin_system, action->variable, 
 				   action->lat_current);
     }
-    surf_double_update(&(action->generic_action.remains),
+    double_update(&(action->generic_action.remains),
 	lmm_variable_getvalue(action->variable) * deltap);
     if (action->generic_action.max_duration != NO_MAX_DURATION)
-      surf_double_update(&(action->generic_action.max_duration), delta);
+      double_update(&(action->generic_action.max_duration), delta);
 
     /*   if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
 
@@ -492,10 +487,12 @@ static void action_suspend(surf_action_t action)
 
 static void action_resume(surf_action_t action)
 {
-  lmm_update_variable_weight(maxmin_system,
-			     ((surf_action_network_CM02_t) action)->variable, 
-			     ((surf_action_network_CM02_t) action)->lat_current);
-  ((surf_action_network_CM02_t) action)->suspended = 0;
+  if(((surf_action_network_CM02_t) action)->suspended) {
+    lmm_update_variable_weight(maxmin_system,
+			       ((surf_action_network_CM02_t) action)->variable, 
+			       ((surf_action_network_CM02_t) action)->lat_current);
+    ((surf_action_network_CM02_t) action)->suspended = 0;
+  }
 }
 
 static int action_is_suspended(surf_action_t action)