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

diff --git a/src/surf/network.c b/src/surf/network.c
index 4bcb3da4bd..42f6aae03f 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -19,6 +19,7 @@ xbt_dict_t link_set = NULL;
 xbt_dict_t network_card_set = NULL;
 
 int card_number = 0;
+int host_number = 0;
 link_CM02_t **routing_table = NULL;
 int *routing_table_size = NULL;
 static link_CM02_t loopback = NULL;
@@ -26,8 +27,8 @@ static link_CM02_t loopback = NULL;
 static void create_routing_table(void)
 {
   routing_table =
-      xbt_new0(link_CM02_t *, card_number * card_number);
-  routing_table_size = xbt_new0(int, card_number * card_number);
+      xbt_new0(link_CM02_t *, /*card_number * card_number */ host_number * host_number);
+  routing_table_size = xbt_new0(int, /*card_number * card_number*/ host_number * host_number);
 }
 
 static void link_free(void *nw_link)
@@ -37,18 +38,19 @@ static void link_free(void *nw_link)
 }
 
 static link_CM02_t link_new(char *name,
-					    double bw_initial,
-					    tmgr_trace_t bw_trace,
-					    double lat_initial,
-					    tmgr_trace_t lat_trace,
-					    e_surf_link_state_t
-					    state_initial,
-					    tmgr_trace_t state_trace,
-					    e_surf_link_sharing_policy_t
-					    policy, xbt_dict_t properties)
+			    double bw_initial,
+			    tmgr_trace_t bw_trace,
+			    double lat_initial,
+			    tmgr_trace_t lat_trace,
+			    e_surf_link_state_t
+			    state_initial,
+			    tmgr_trace_t state_trace,
+			    e_surf_link_sharing_policy_t
+			    policy, xbt_dict_t properties)
 {
   link_CM02_t nw_link = xbt_new0(s_link_CM02_t, 1);
-
+  xbt_assert1(!xbt_dict_get_or_null(link_set, name), 
+	      "Link '%s' declared several times in the platform file.", name);   
 
   nw_link->model = (surf_model_t) surf_network_model;
   nw_link->name = name;
@@ -151,82 +153,32 @@ static void parse_link_init(void)
 
 }
 
-static int nb_link;
-static int link_list_capacity;
-static link_CM02_t *link_list = NULL;
 static int src_id = -1;
 static int dst_id = -1;
-/*
-static int is_first = 0;
-*/
 
 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_list_capacity = 20;
-  link_list = xbt_new(link_CM02_t, link_list_capacity);
-}
-
-static void parse_route_elem(void)
-{
-
-  if (nb_link == link_list_capacity) {
-    link_list_capacity *= 2;
-    link_list =
-	xbt_realloc(link_list,
-		    (link_list_capacity) * sizeof(link_CM02_t));
-  }
-  link_list[nb_link++] =
-      xbt_dict_get_or_null(link_set, A_surfxml_link_c_ctn_id);
+  route_action = A_surfxml_route_action;
+  route_link_list = xbt_dynar_new(sizeof(char *), &free_string);
 }
 
 static void parse_route_set_route(void)
 {
-  route_new(src_id, dst_id, link_list, nb_link);
+  char *name;
+  if (src_id != -1 && dst_id != -1) {
+    name = bprintf("%x#%x",src_id, dst_id);
+    manage_route(route_table, name, route_action, 0);
+    free(name);    
+  }
 }
 
-static void parse_file(const char *file)
+static void add_loopback(void)
 {
   int i;
-/*
-  surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
-  surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
-  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);
-*/
-  /* Figuring out the network links */
-  surf_parse_reset_parser();
-  surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
-  surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
-  surf_parse_open(file);
-  xbt_assert1((!surf_parse()), "Parse error in %s", file);
-  surf_parse_close();
-
-  /* Figuring out the network cards used */
-  surf_parse_reset_parser();
-  surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
-  surf_parse_open(file);
-  xbt_assert1((!surf_parse()), "Parse error in %s", file);
-  surf_parse_close();
-
-  create_routing_table();
-
-  /* Building the routes */
-  surf_parse_reset_parser();
-  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);
-  surf_parse_open(file);
-  xbt_assert1((!surf_parse()), "Parse error in %s", file);
-  surf_parse_close();
-
   /* Adding loopback if needed */
-
-  for (i = 0; i < card_number; i++)
+  for (i = 0; i < host_number; i++)
     if (!ROUTE_SIZE(i, i)) {
       if (!loopback)
 	loopback = link_new(xbt_strdup("__MSG_loopback__"),
@@ -239,6 +191,115 @@ static void parse_file(const char *file)
     }
 }
 
+static void add_route(void)
+{
+  xbt_ex_t e;
+  int nb_link = 0;
+  unsigned int cpt = 0;    
+  int link_list_capacity = 0;
+  link_CM02_t *link_list = NULL;
+  xbt_dict_cursor_t cursor = NULL;
+  char *key,*data, *end;
+  const char *sep = "#";
+  xbt_dynar_t links, keys;
+
+  if (routing_table == NULL) create_routing_table();
+
+  xbt_dict_foreach(route_table, cursor, key, data) {
+	  char* link = NULL;
+    nb_link = 0;
+    links = (xbt_dynar_t)data;
+    keys = xbt_str_split_str(key, sep);
+
+    link_list_capacity = xbt_dynar_length(links);
+    link_list = xbt_new(link_CM02_t, link_list_capacity);
+
+    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_foreach (links, cpt, link) {
+      TRY {
+	link_list[nb_link++] = xbt_dict_get(link_set, link);
+      }
+      CATCH(e) {
+        RETHROW1("Link %s not found (dict raised this exception: %s)", link);
+      }     
+    }
+    route_new(src_id, dst_id, link_list, nb_link);
+   }
+
+   xbt_dict_free(&route_table);
+
+}
+
+static void count_hosts(void)
+{
+   host_number++;
+}
+
+static int called = 0;
+
+static void add_traces(void)
+{
+   xbt_dynar_t trace_connect = NULL;
+   unsigned int cpt;
+   int connect_element, connect_kind;
+   char *value, *trace_id, *connector_id;
+   link_CM02_t link;
+   tmgr_trace_t trace;
+   
+   if (called) return;
+   called = 1;
+
+   /*for all trace connects parse them and update traces for hosts or links */
+   xbt_dynar_foreach (traces_connect_list, cpt, value) {
+     trace_connect = xbt_str_split_str(value, "#");
+     trace_id        = xbt_dynar_get_as(trace_connect, 0, char*);
+     connect_element = atoi(xbt_dynar_get_as(trace_connect, 1, char*)); 
+     connect_kind    = atoi(xbt_dynar_get_as(trace_connect, 2, char*));
+     connector_id    = xbt_dynar_get_as(trace_connect, 3, char*);
+
+     xbt_assert1((trace = xbt_dict_get_or_null(traces_set_list, trace_id)), "Trace %s undefined", trace_id);
+
+     if (connect_element == A_surfxml_trace_c_connect_element_LINK) {
+        xbt_assert1((link = xbt_dict_get_or_null(link_set, connector_id)), "Link %s undefined", connector_id);
+        switch (connect_kind) {
+           case A_surfxml_trace_c_connect_kind_AVAILABILITY: link->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); break;
+           case A_surfxml_trace_c_connect_kind_BANDWIDTH: link->bw_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); break;
+           case A_surfxml_trace_c_connect_kind_LATENCY: link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); break;
+        }
+     }
+   }
+
+   xbt_dynar_free(&trace_connect);
+   xbt_dynar_free(&traces_connect_list);
+   xbt_dict_free(&traces_set_list); 
+}
+
+static void define_callbacks(const char *file)
+{
+  /* Figuring out the network links */
+  surfxml_add_callback(STag_surfxml_host_cb_list, &count_hosts);
+  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_route);
+  surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback);
+  surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces);
+  surfxml_add_callback(STag_surfxml_set_cb_list, &parse_sets);
+  surfxml_add_callback(STag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_endpoints);
+  surfxml_add_callback(ETag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_route);
+  surfxml_add_callback(STag_surfxml_foreach_cb_list, &parse_foreach);
+  surfxml_add_callback(STag_surfxml_cluster_cb_list, &parse_cluster);
+  surfxml_add_callback(STag_surfxml_trace_cb_list, &parse_trace_init);
+  surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_trace_finalize);
+  surfxml_add_callback(STag_surfxml_trace_c_connect_cb_list, &parse_trace_c_connect);
+}
+
 static void *name_service(const char *name)
 {
   network_card_CM02_t card = xbt_dict_get_or_null(network_card_set, name);
@@ -547,7 +608,7 @@ static double get_link_latency(const void *link)
   return ((link_CM02_t) link)->lat_current;
 }
 
-static xbt_dict_t get_link_property_list(void *link)
+static xbt_dict_t get_properties(void *link)
 {
  return ((link_CM02_t) link)->properties;
 }
@@ -677,8 +738,8 @@ static void surf_network_model_init_internal(void)
       get_link_bandwidth;
   surf_network_model->extension_public->get_link_latency =
       get_link_latency;
-  /*for the props of the link*/
-  surf_network_model->common_public->get_link_properties =  get_link_property_list;
+
+  surf_network_model->common_public->get_properties =  get_properties;
 
   link_set = xbt_dict_new();
   network_card_set = xbt_dict_new();
@@ -704,7 +765,7 @@ void surf_network_model_init_CM02(const char *filename)
   if (surf_network_model)
     return;
   surf_network_model_init_internal();
-  parse_file(filename);
+  define_callbacks(filename);
   xbt_dynar_push(model_list, &surf_network_model);
   network_solve = lmm_solve;
 
@@ -719,7 +780,7 @@ void surf_network_model_init_Reno(const char *filename)
   if (surf_network_model)
     return;
   surf_network_model_init_internal();
-  parse_file(filename);
+  define_callbacks(filename);
 
   xbt_dynar_push(model_list, &surf_network_model);
   lmm_set_default_protocol_function(func_reno_f, func_reno_fp,
@@ -737,7 +798,7 @@ void surf_network_model_init_Vegas(const char *filename)
   if (surf_network_model)
     return;
   surf_network_model_init_internal();
-  parse_file(filename);
+  define_callbacks(filename);
 
   xbt_dynar_push(model_list, &surf_network_model);
   lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp,
@@ -756,7 +817,7 @@ void surf_network_model_init_SDP(const char *filename)
   if (surf_network_model)
     return;
   surf_network_model_init_internal();
-  parse_file(filename);
+  define_callbacks(filename);
 
   xbt_dynar_push(model_list, &surf_network_model);
   network_solve = sdp_solve;