Corrected small bug in network model host_number is used instead of card_number.

[simgrid.git] / src / surf / network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index c678242..50de0dd 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -98,7 +98,7 @@ static int network_card_new(const char *card_name)
   if (!card) {
     card = xbt_new0(s_network_card_CM02_t, 1);
     card->name = xbt_strdup(card_name);
-    card->id = card_number++;
+    card->id = host_number++;
     xbt_dict_set(network_card_set, card_name, card, network_card_free);
   }
   return card->id;
@@ -162,7 +162,7 @@ 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);
   route_action = A_surfxml_route_action;
-  route_link_list = xbt_dynar_new(sizeof(char *), &free_string);
+  route_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
 }
 
 static void parse_route_set_route(void)
@@ -217,6 +217,7 @@ static void add_route(void)
 
     src_id = strtol(xbt_dynar_get_as(keys, 0, char*), &end, 16);
     dst_id = strtol(xbt_dynar_get_as(keys, 1, char*), &end, 16);
+    xbt_dynar_free(&keys);
  
     xbt_dynar_foreach (links, cpt, link) {
       TRY {
@@ -435,21 +436,6 @@ static void update_actions_state(double now, double delta)
               (action->generic_action.max_duration <= 0)) {
       action->generic_action.finish = surf_get_clock();
       action_change_state((surf_action_t) action, SURF_ACTION_DONE);
-    } else {                   /* Need to check that none of the model has failed */
-      lmm_constraint_t cnst = NULL;
-      int i = 0;
-      link_CM02_t nw_link = NULL;
-
-      while ((cnst =
-             lmm_get_cnst_from_var(network_maxmin_system,
-                                   action->variable, i++))) {
-       nw_link = lmm_constraint_id(cnst);
-       if (nw_link->state_current == SURF_LINK_OFF) {
-         action->generic_action.finish = surf_get_clock();
-         action_change_state((surf_action_t) action, SURF_ACTION_FAILED);
-         break;
-       }
-      }
     }
   }
 
@@ -458,7 +444,7 @@ static void update_actions_state(double now, double delta)
 
 static void update_resource_state(void *id,
                                  tmgr_trace_event_t event_type,
-                                 double value)
+                                 double value, double date)
 {
   link_CM02_t nw_link = id;
   /*   printf("[" "%lg" "] Asking to update network card \"%s\" with value " */
@@ -472,11 +458,12 @@ static void update_resource_state(void *id,
   } else if (event_type == nw_link->lat_event) {
     double delta = value - nw_link->lat_current;
     lmm_variable_t var = NULL;
+    lmm_element_t elem = NULL;
     surf_action_network_CM02_t action = NULL;
 
     nw_link->lat_current = value;
-    while (lmm_get_var_from_cnst
-          (network_maxmin_system, nw_link->constraint, &var)) {
+    while ((var= lmm_get_var_from_cnst
+          (network_maxmin_system, nw_link->constraint, &elem))) {
       action = lmm_variable_id(var);
       action->lat_current += delta;
       if (action->rate < 0)
@@ -499,8 +486,23 @@ static void update_resource_state(void *id,
   } else if (event_type == nw_link->state_event) {
     if (value > 0)
       nw_link->state_current = SURF_LINK_ON;
-    else
+    else {
+      lmm_constraint_t cnst = nw_link->constraint;
+      lmm_variable_t var = NULL;
+      lmm_element_t elem = NULL;
+
       nw_link->state_current = SURF_LINK_OFF;
+      while ((var= lmm_get_var_from_cnst
+             (network_maxmin_system, cnst, &elem))) {
+       surf_action_t action = lmm_variable_id(var) ;
+
+       if(surf_action_get_state(action)==SURF_ACTION_RUNNING ||
+          surf_action_get_state(action)==SURF_ACTION_READY) {
+         action->finish = date;
+         action_change_state( action, SURF_ACTION_FAILED);
+       }
+      }
+    }
   } else {
     CRITICAL0("Unknown event ! \n");
     xbt_abort();
@@ -545,7 +547,13 @@ static surf_action_t communicate(void *src, void *dst, double size,
                                   calloc but it seems to help valgrind... */
   action->generic_action.state_set =
       surf_network_model->common_public->states.running_action_set;
-
+  for (i = 0; i < route_size; i++) 
+    if(route[i]->state_current == SURF_LINK_OFF) {
+      action->generic_action.state_set =
+       surf_network_model->common_public->states.failed_action_set;
+      break;
+    }
+  
   xbt_swag_insert(action, action->generic_action.state_set);
   action->rate = rate;
 
@@ -687,14 +695,14 @@ static void finalize(void)
   surf_network_model = NULL;
 
   loopback = NULL;
-  for (i = 0; i < card_number; i++)
-    for (j = 0; j < card_number; j++)
+  for (i = 0; i < host_number; i++)
+    for (j = 0; j < host_number; j++)
       free(ROUTE(i, j));
   free(routing_table);
   routing_table = NULL;
   free(routing_table_size);
   routing_table_size = NULL;
-  card_number = 0;
+  host_number = 0;
 }
 
 static void surf_network_model_init_internal(void)