X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c54b74368b97bb0d0b42aea6857681d7ff9df910..86cd0192ed278be94c173e011ed9df47a555328a:/src/surf/network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index 1077cdbd66..6c2c6c1eb2 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -15,7 +15,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
 surf_network_model_t surf_network_model = NULL;
 static lmm_system_t network_maxmin_system = NULL;
 static void (*network_solve) (lmm_system_t) = NULL;
-
 xbt_dict_t link_set = NULL;
 xbt_dict_t network_card_set = NULL;
 
@@ -98,7 +97,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 +161,6 @@ 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);
 }
 
 static void parse_route_set_route(void)
@@ -217,6 +215,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 {
@@ -228,9 +227,6 @@ static void add_route(void)
     }
     route_new(src_id, dst_id, link_list, nb_link);
    }
-
-   xbt_dict_free(&route_table);
-
 }
 
 static void count_hosts(void)
@@ -294,9 +290,7 @@ static void define_callbacks(const char *file)
   surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
   surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
   surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
-  surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem);
   surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
-  surfxml_add_callback(STag_surfxml_platform_cb_list, &init_data);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback);
@@ -384,6 +378,8 @@ static double share_resources(double now)
 				       network_maxmin_system,
 				       network_solve);
 
+#define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + xbt_swag_offset(s_action, variable)  )))
+  
   xbt_swag_foreach(action, running_actions) {
     if (action->latency > 0) {
       if (min < 0)
@@ -435,21 +431,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;
-	}
-      }
     }
   }
 
@@ -500,8 +481,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();
@@ -546,7 +542,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;
 
@@ -688,14 +690,16 @@ 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;
+  lmm_system_free(network_maxmin_system);
+  network_maxmin_system = NULL;
 }
 
 static void surf_network_model_init_internal(void)
@@ -793,9 +797,8 @@ void surf_network_model_init_CM02(const char *filename)
   network_solve = lmm_solve;
 
   update_model_description(surf_network_model_description,
-			      surf_network_model_description_size,
-			      "CM02",
-			      (surf_model_t) surf_network_model);
+			   "CM02",
+			   (surf_model_t) surf_network_model);
 }
 
 void surf_network_model_init_Reno(const char *filename)
@@ -811,9 +814,26 @@ void surf_network_model_init_Reno(const char *filename)
   network_solve = lagrange_solve;
 
   update_model_description(surf_network_model_description,
-			      surf_network_model_description_size,
-			      "Reno",
-			      (surf_model_t) surf_network_model);
+			   "Reno",
+			   (surf_model_t) surf_network_model);
+}
+
+
+void surf_network_model_init_Reno2(const char *filename)
+{
+  if (surf_network_model)
+    return;
+  surf_network_model_init_internal();
+  define_callbacks(filename);
+
+  xbt_dynar_push(model_list, &surf_network_model);
+  lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp,
+				    func_reno2_fpi);
+  network_solve = lagrange_solve;
+
+  update_model_description(surf_network_model_description,
+			   "Reno2",
+			   (surf_model_t) surf_network_model);
 }
 
 void surf_network_model_init_Vegas(const char *filename)
@@ -829,9 +849,8 @@ void surf_network_model_init_Vegas(const char *filename)
   network_solve = lagrange_solve;
 
   update_model_description(surf_network_model_description,
-			      surf_network_model_description_size,
-			      "Vegas",
-			      (surf_model_t) surf_network_model);
+			   "Vegas",
+			   (surf_model_t) surf_network_model);
 }
 
 #ifdef HAVE_SDP
@@ -846,8 +865,22 @@ void surf_network_model_init_SDP(const char *filename)
   network_solve = sdp_solve;
 
   update_model_description(surf_network_model_description,
-			      surf_network_model_description_size,
-			      "SDP",
-			      (surf_model_t) surf_network_model);
+			   "SDP",
+			   (surf_model_t) surf_network_model);
+}
+#endif
+
+#ifdef HAVE_GTNETS
+void surf_network_model_init_GTNETS(const char *filename)
+{
+  if (surf_network_model)
+    return;
+  surf_network_model_init_internal();
+  define_callbacks(filename);
+  xbt_dynar_push(model_list, &surf_network_model);
+
+  update_model_description(surf_network_model_description,
+			   "GTNets",
+			   (surf_model_t) surf_network_model);
 }
 #endif